~bzr-pqm/bzr/bzr.dev

1080 by Martin Pool
- test tool for converting history to weave files
1
# Copyright (C) 2005 Canonical Ltd
1267 by Martin Pool
- notes on conversion of existing history to weaves
2
#
1080 by Martin Pool
- test tool for converting history to weave files
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1267 by Martin Pool
- notes on conversion of existing history to weaves
7
#
1080 by Martin Pool
- test tool for converting history to weave files
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1267 by Martin Pool
- notes on conversion of existing history to weaves
12
#
1080 by Martin Pool
- test tool for converting history to weave files
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Experiment in converting existing bzr branches to weaves."""
18
1267 by Martin Pool
- notes on conversion of existing history to weaves
19
# To make this properly useful
20
#
21
# 1. assign text version ids, and put those text versions into
22
#    the inventory as they're converted.
23
#
24
# 2. keep track of the previous version of each file, rather than
25
#    just using the last one imported
26
#
27
# 3. assign entry versions when files are added, renamed or moved.
28
#
29
# 4. when merged-in versions are observed, walk down through them
30
#    to discover everything, then commit bottom-up
31
#
32
# 5. track ancestry as things are merged in, and commit that in each
33
#    revision
34
#
35
# Perhaps it's best to first walk the whole graph and make a plan for
36
# what should be imported in what order?  Need a kind of topological
37
# sort of all revisions.  (Or do we, can we just before doing a revision
38
# see that all its parents have either been converted or abandoned?)
39
1315 by Martin Pool
- import file inventories in correct order
40
41
# Cannot import a revision until all its parents have been
42
# imported.  in other words, we can only import revisions whose
43
# parents have all been imported.  the first step must be to
44
# import a revision with no parents, of which there must be at
45
# least one.  (So perhaps it's useful to store forward pointers
46
# from a list of parents to their children?)
47
#
48
# Another (equivalent?) approach is to build up the ordered
49
# ancestry list for the last revision, and walk through that.  We
50
# are going to need that.
51
#
52
# We don't want to have to recurse all the way back down the list.
53
#
54
# Suppose we keep a queue of the revisions able to be processed at
55
# any point.  This starts out with all the revisions having no
56
# parents.
57
#
58
# This seems like a generally useful algorithm...
59
#
60
# The current algorithm is dumb (O(n**2)?) but will do the job, and
61
# takes less than a second on the bzr.dev branch.
62
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
63
# This currently does a kind of lazy conversion of file texts, where a
64
# new text is written in every version.  That's unnecessary but for
65
# the moment saves us having to worry about when files need new
66
# versions.
67
68
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
69
import os
1267 by Martin Pool
- notes on conversion of existing history to weaves
70
import tempfile
71
import sys
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
72
import shutil
1132 by Martin Pool
- fix up logging for history2weaves tool
73
1429 by Robert Collins
merge in niemeyers prefixed-store patch
74
from bzrlib.branch import Branch, find_branch
75
from bzrlib.branch import BZR_BRANCH_FORMAT_5, BZR_BRANCH_FORMAT_6
1185.17.1 by Martin Pool
[pick] clear hashcache in format upgrade to avoid worrisome warning
76
import bzrlib.hashcache as hashcache
1080 by Martin Pool
- test tool for converting history to weave files
77
from bzrlib.weave import Weave
78
from bzrlib.weavefile import read_weave, write_weave
1393.1.43 by Martin Pool
- upgrade should use ui_factory, not make a progress bar directly
79
from bzrlib.ui import ui_factory
1080 by Martin Pool
- test tool for converting history to weave files
80
from bzrlib.atomicfile import AtomicFile
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
81
from bzrlib.xml4 import serializer_v4
82
from bzrlib.xml5 import serializer_v5
1185.33.12 by Martin Pool
Remove some direct calls to logging, and some dead code
83
from bzrlib.trace import mutter, note, warning
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
84
from bzrlib.osutils import sha_strings, sha_string, pathjoin, abspath
1267 by Martin Pool
- notes on conversion of existing history to weaves
85
1080 by Martin Pool
- test tool for converting history to weave files
86
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
87
class Convert(object):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
88
    def __init__(self, base_dir):
89
        self.base = base_dir
1307 by Martin Pool
- start walking through ancestors in conversion to weaves
90
        self.converted_revs = set()
91
        self.absent_revisions = set()
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
92
        self.text_count = 0
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
93
        self.revisions = {}
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
94
        self.convert()
95
96
97
    def convert(self):
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
98
        if not self._open_branch():
99
            return
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
100
        note('starting upgrade of %s', os.path.abspath(self.base))
1381 by Martin Pool
- remove tab characters (only)
101
        self._backup_control_dir()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
102
        self.pb = ui_factory.progress_bar()
103
        if self.old_format == 4:
104
            note('starting upgrade from format 4 to 5')
1185.67.5 by Aaron Bentley
Added write locks as appropriate
105
            self.branch.lock_write()
106
            try:
107
                self._convert_to_weaves()
108
            finally:
109
                self.branch.unlock()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
110
            self._open_branch()
111
        if self.old_format == 5:
112
            note('starting upgrade from format 5 to 6')
1185.67.5 by Aaron Bentley
Added write locks as appropriate
113
            self.branch.lock_write()
114
            try:
115
                self._convert_to_prefixed()
116
            finally:
117
                self.branch.unlock()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
118
            self._open_branch()
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
119
        cache = hashcache.HashCache(abspath(self.base))
1185.17.1 by Martin Pool
[pick] clear hashcache in format upgrade to avoid worrisome warning
120
        cache.clear()
121
        cache.write()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
122
        note("finished")
123
124
125
    def _convert_to_prefixed(self):
126
        from bzrlib.store import hash_prefix
127
        for store_name in ["weaves", "revision-store"]:
128
            note("adding prefixes to %s" % store_name) 
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
129
            store_dir = pathjoin(self.base, ".bzr", store_name)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
130
            for filename in os.listdir(store_dir):
131
                if filename.endswith(".weave") or filename.endswith(".gz"):
132
                    file_id = os.path.splitext(filename)[0]
133
                else:
134
                    file_id = filename
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
135
                prefix_dir = pathjoin(store_dir, hash_prefix(file_id))
1429 by Robert Collins
merge in niemeyers prefixed-store patch
136
                if not os.path.isdir(prefix_dir):
137
                    os.mkdir(prefix_dir)
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
138
                os.rename(pathjoin(store_dir, filename),
139
                          pathjoin(prefix_dir, filename))
1429 by Robert Collins
merge in niemeyers prefixed-store patch
140
        self._set_new_format(BZR_BRANCH_FORMAT_6)
141
142
143
    def _convert_to_weaves(self):
1381 by Martin Pool
- remove tab characters (only)
144
        note('note: upgrade may be faster if all store files are ungzipped first')
145
        if not os.path.isdir(self.base + '/.bzr/weaves'):
146
            os.mkdir(self.base + '/.bzr/weaves')
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
147
        self.inv_weave = Weave('inventory')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
148
        # holds in-memory weaves for all files
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
149
        self.text_weaves = {}
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
150
        os.remove(self.branch.control_files.controlfilename('branch-format'))
1381 by Martin Pool
- remove tab characters (only)
151
        self._convert_working_inv()
1358 by Martin Pool
- actually upgrade all of history
152
        rev_history = self.branch.revision_history()
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
153
        # to_read is a stack holding the revisions we still need to process;
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
154
        # appending to it adds new highest-priority revisions
1319 by Martin Pool
- calculate and use file parents for importing texts
155
        self.known_revisions = set(rev_history)
1185.20.1 by Andres Salomon
Handle the case where revision_history() returns an empty list during
156
        self.to_read = rev_history[-1:]
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
157
        while self.to_read:
158
            rev_id = self.to_read.pop()
159
            if (rev_id not in self.revisions
160
                and rev_id not in self.absent_revisions):
161
                self._load_one_rev(rev_id)
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
162
        self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
163
        to_import = self._make_order()
1315 by Martin Pool
- import file inventories in correct order
164
        for i, rev_id in enumerate(to_import):
165
            self.pb.update('converting revision', i, len(to_import))
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
166
            self._convert_one_rev(rev_id)
1331 by Martin Pool
- write out new revisions after conversion
167
        self.pb.clear()
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
168
        note('upgraded to weaves:')
169
        note('  %6d revisions and inventories' % len(self.revisions))
1393.1.44 by Martin Pool
- upgrade carries across ghost references
170
        note('  %6d revisions not present' % len(self.absent_revisions))
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
171
        note('  %6d texts' % self.text_count)
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
172
        self._write_all_weaves()
1331 by Martin Pool
- write out new revisions after conversion
173
        self._write_all_revs()
1381 by Martin Pool
- remove tab characters (only)
174
        self._cleanup_spare_files()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
175
        self._set_new_format(BZR_BRANCH_FORMAT_5)
1357 by Martin Pool
- require marker file to do upgrade so as not to clobber something important
176
177
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
178
    def _open_branch(self):
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
179
        self.branch = Branch.open_downlevel(self.base)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
180
        self.old_format = self.branch._branch_format
181
        if self.old_format == 6:
182
            note('this branch is in the most current format')
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
183
            return False
1429 by Robert Collins
merge in niemeyers prefixed-store patch
184
        if self.old_format not in (4, 5):
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
185
            raise BzrError("cannot upgrade from branch format %r" %
186
                           self.branch._branch_format)
187
        return True
188
1429 by Robert Collins
merge in niemeyers prefixed-store patch
189
    def _set_new_format(self, format):
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
190
        self.branch.control_files.put_utf8('branch-format', format)
1355 by Martin Pool
- write working inventory into final location
191
192
    def _cleanup_spare_files(self):
1381 by Martin Pool
- remove tab characters (only)
193
        for n in 'merged-patches', 'pending-merged-patches':
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
194
            p = self.branch.control_files.controlfilename(n)
1381 by Martin Pool
- remove tab characters (only)
195
            if not os.path.exists(p):
196
                continue
197
            ## assert os.path.getsize(p) == 0
198
            os.remove(p)
199
        shutil.rmtree(self.base + '/.bzr/inventory-store')
200
        shutil.rmtree(self.base + '/.bzr/text-store')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
201
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
202
    def _backup_control_dir(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
203
        orig = self.base + '/.bzr'
204
        backup = orig + '.backup'
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
205
        note('making backup of tree history')
1381 by Martin Pool
- remove tab characters (only)
206
        shutil.copytree(orig, backup)
207
        note('%s has been backed up to %s', orig, backup)
208
        note('if conversion fails, you can move this directory back to .bzr')
209
        note('if it succeeds, you can remove this directory if you wish')
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
210
211
    def _convert_working_inv(self):
1381 by Martin Pool
- remove tab characters (only)
212
        branch = self.branch
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
213
        inv = serializer_v4.read_inventory(branch.control_files.controlfile('inventory', 'rb'))
1393.1.18 by Martin Pool
- fix upgrade for transport changes
214
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
215
        branch.control_files.put_utf8('inventory', new_inv_xml)
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
216
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
217
    def _write_all_weaves(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
218
        write_a_weave(self.inv_weave, self.base + '/.bzr/inventory.weave')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
219
        i = 0
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
220
        try:
221
            for file_id, file_weave in self.text_weaves.items():
222
                self.pb.update('writing weave', i, len(self.text_weaves))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
223
                write_a_weave(file_weave, self.base + '/.bzr/weaves/%s.weave' % file_id)
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
224
                i += 1
225
        finally:
226
            self.pb.clear()
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
227
1331 by Martin Pool
- write out new revisions after conversion
228
229
    def _write_all_revs(self):
230
        """Write all revisions out in new form."""
1381 by Martin Pool
- remove tab characters (only)
231
        shutil.rmtree(self.base + '/.bzr/revision-store')
232
        os.mkdir(self.base + '/.bzr/revision-store')
1331 by Martin Pool
- write out new revisions after conversion
233
        try:
234
            for i, rev_id in enumerate(self.converted_revs):
235
                self.pb.update('write revision', i, len(self.converted_revs))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
236
                f = file(self.base + '/.bzr/revision-store/%s' % rev_id, 'wb')
1331 by Martin Pool
- write out new revisions after conversion
237
                try:
238
                    serializer_v5.write_revision(self.revisions[rev_id], f)
239
                finally:
240
                    f.close()
241
        finally:
242
            self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
243
1331 by Martin Pool
- write out new revisions after conversion
244
            
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
245
    def _load_one_rev(self, rev_id):
246
        """Load a revision object into memory.
247
248
        Any parents not either loaded or abandoned get queued to be
249
        loaded."""
250
        self.pb.update('loading revision',
1315 by Martin Pool
- import file inventories in correct order
251
                       len(self.revisions),
1319 by Martin Pool
- calculate and use file parents for importing texts
252
                       len(self.known_revisions))
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
253
        if not self.branch.repository.revision_store.has_id(rev_id):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
254
            self.pb.clear()
255
            note('revision {%s} not present in branch; '
1393.1.44 by Martin Pool
- upgrade carries across ghost references
256
                 'will be converted as a ghost',
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
257
                 rev_id)
258
            self.absent_revisions.add(rev_id)
259
        else:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
260
            rev_xml = self.branch.repository.revision_store.get(rev_id).read()
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
261
            rev = serializer_v4.read_revision_from_string(rev_xml)
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
262
            for parent_id in rev.parent_ids:
1319 by Martin Pool
- calculate and use file parents for importing texts
263
                self.known_revisions.add(parent_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
264
                self.to_read.append(parent_id)
265
            self.revisions[rev_id] = rev
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
266
267
268
    def _load_old_inventory(self, rev_id):
269
        assert rev_id not in self.converted_revs
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
270
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
271
        inv = serializer_v4.read_inventory_from_string(old_inv_xml)
272
        rev = self.revisions[rev_id]
273
        if rev.inventory_sha1:
274
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
275
                'inventory sha mismatch for {%s}' % rev_id
276
        return inv
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
277
        
278
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
279
    def _load_updated_inventory(self, rev_id):
280
        assert rev_id in self.converted_revs
281
        inv_xml = self.inv_weave.get_text(rev_id)
282
        inv = serializer_v5.read_inventory_from_string(inv_xml)
283
        return inv
284
285
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
286
    def _convert_one_rev(self, rev_id):
287
        """Convert revision and all referenced objects to new format."""
288
        rev = self.revisions[rev_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
289
        inv = self._load_old_inventory(rev_id)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
290
        present_parents = [p for p in rev.parent_ids
291
                           if p not in self.absent_revisions]
292
        self._convert_revision_contents(rev, inv, present_parents)
293
        self._store_new_weave(rev, inv, present_parents)
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
294
        self.converted_revs.add(rev_id)
295
296
1393.1.44 by Martin Pool
- upgrade carries across ghost references
297
    def _store_new_weave(self, rev, inv, present_parents):
1320 by Martin Pool
- write updated inventory into weave
298
        # the XML is now updated with text versions
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
299
        if __debug__:
300
            for file_id in inv:
301
                ie = inv[file_id]
302
                if ie.kind == 'root_directory':
303
                    continue
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
304
                assert hasattr(ie, 'revision'), \
305
                    'no revision on {%s} in {%s}' % \
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
306
                    (file_id, rev.revision_id)
1316 by Martin Pool
- upgrade format of inventories as they're converted
307
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
308
        new_inv_sha1 = sha_string(new_inv_xml)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
309
        self.inv_weave.add(rev.revision_id, 
310
                           present_parents,
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
311
                           new_inv_xml.splitlines(True),
312
                           new_inv_sha1)
313
        rev.inventory_sha1 = new_inv_sha1
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
314
1393.1.44 by Martin Pool
- upgrade carries across ghost references
315
    def _convert_revision_contents(self, rev, inv, present_parents):
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
316
        """Convert all the files within a revision.
317
318
        Also upgrade the inventory to refer to the text revision ids."""
319
        rev_id = rev.revision_id
1319 by Martin Pool
- calculate and use file parents for importing texts
320
        mutter('converting texts of revision {%s}',
321
               rev_id)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
322
        parent_invs = map(self._load_updated_inventory, present_parents)
1332 by Martin Pool
- clean up code that writes out weave results
323
        for file_id in inv:
324
            ie = inv[file_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
325
            self._convert_file_version(rev, ie, parent_invs)
326
327
    def _convert_file_version(self, rev, ie, parent_invs):
1319 by Martin Pool
- calculate and use file parents for importing texts
328
        """Convert one version of one file.
329
330
        The file needs to be added into the weave if it is a merge
331
        of >=2 parents or if it's changed from its parent.
332
        """
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
333
        if ie.kind == 'root_directory':
334
            return
1319 by Martin Pool
- calculate and use file parents for importing texts
335
        file_id = ie.file_id
336
        rev_id = rev.revision_id
337
        w = self.text_weaves.get(file_id)
338
        if w is None:
339
            w = Weave(file_id)
340
            self.text_weaves[file_id] = w
341
        text_changed = False
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
342
        previous_entries = ie.find_previous_heads(parent_invs, w)
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
343
        for old_revision in previous_entries:
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
344
                # if this fails, its a ghost ?
345
                assert old_revision in self.converted_revs 
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
346
        self.snapshot_ie(previous_entries, ie, w, rev_id)
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
347
        del ie.text_id
348
        assert getattr(ie, 'revision', None) is not None
349
350
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
351
        # TODO: convert this logic, which is ~= snapshot to
352
        # a call to:. This needs the path figured out. rather than a work_tree
1409 by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug
353
        # a v4 revision_tree can be given, or something that looks enough like
354
        # one to give the file content to the entry if it needs it.
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
355
        # and we need something that looks like a weave store for snapshot to 
356
        # save against.
357
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
358
        if len(previous_revisions) == 1:
359
            previous_ie = previous_revisions.values()[0]
360
            if ie._unchanged(previous_ie):
361
                ie.revision = previous_ie.revision
362
                return
363
        parent_indexes = map(w.lookup, previous_revisions)
364
        if ie.has_text():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
365
            text = self.branch.repository.text_store.get(ie.text_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
366
            file_lines = text.readlines()
1378 by Martin Pool
- in upgrade, avoiding loading file texts unless necessary
367
            assert sha_strings(file_lines) == ie.text_sha1
368
            assert sum(map(len, file_lines)) == ie.text_size
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
369
            w.add(rev_id, parent_indexes, file_lines, ie.text_sha1)
1332 by Martin Pool
- clean up code that writes out weave results
370
            self.text_count += 1
1319 by Martin Pool
- calculate and use file parents for importing texts
371
        else:
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
372
            w.add(rev_id, parent_indexes, [], None)
373
        ie.revision = rev_id
374
        ##mutter('import text {%s} of {%s}',
375
        ##       ie.text_id, file_id)
1310 by Martin Pool
- compute order to import revisions
376
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
377
    def _make_order(self):
1310 by Martin Pool
- compute order to import revisions
378
        """Return a suitable order for importing revisions.
379
380
        The order must be such that an revision is imported after all
381
        its (present) parents.
382
        """
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
383
        todo = set(self.revisions.keys())
384
        done = self.absent_revisions.copy()
1310 by Martin Pool
- compute order to import revisions
385
        o = []
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
386
        while todo:
387
            # scan through looking for a revision whose parents
388
            # are all done
1310 by Martin Pool
- compute order to import revisions
389
            for rev_id in sorted(list(todo)):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
390
                rev = self.revisions[rev_id]
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
391
                parent_ids = set(rev.parent_ids)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
392
                if parent_ids.issubset(done):
393
                    # can take this one now
1310 by Martin Pool
- compute order to import revisions
394
                    o.append(rev_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
395
                    todo.remove(rev_id)
396
                    done.add(rev_id)
1315 by Martin Pool
- import file inventories in correct order
397
        return o
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
398
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
399
1332 by Martin Pool
- clean up code that writes out weave results
400
def write_a_weave(weave, filename):
401
    inv_wf = file(filename, 'wb')
1080 by Martin Pool
- test tool for converting history to weave files
402
    try:
1087 by Martin Pool
- add a tool script to convert past history into weaves
403
        write_weave(weave, inv_wf)
1080 by Martin Pool
- test tool for converting history to weave files
404
    finally:
405
        inv_wf.close()
406
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
407
408
def upgrade(base_dir):
409
    Convert(base_dir)