~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')
105
            self._convert_to_weaves()
106
            self._open_branch()
107
        if self.old_format == 5:
108
            note('starting upgrade from format 5 to 6')
109
            self._convert_to_prefixed()
110
            self._open_branch()
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
111
        cache = hashcache.HashCache(abspath(self.base))
1185.17.1 by Martin Pool
[pick] clear hashcache in format upgrade to avoid worrisome warning
112
        cache.clear()
113
        cache.write()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
114
        note("finished")
115
116
117
    def _convert_to_prefixed(self):
118
        from bzrlib.store import hash_prefix
119
        for store_name in ["weaves", "revision-store"]:
120
            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 \
121
            store_dir = pathjoin(self.base, ".bzr", store_name)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
122
            for filename in os.listdir(store_dir):
123
                if filename.endswith(".weave") or filename.endswith(".gz"):
124
                    file_id = os.path.splitext(filename)[0]
125
                else:
126
                    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 \
127
                prefix_dir = pathjoin(store_dir, hash_prefix(file_id))
1429 by Robert Collins
merge in niemeyers prefixed-store patch
128
                if not os.path.isdir(prefix_dir):
129
                    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 \
130
                os.rename(pathjoin(store_dir, filename),
131
                          pathjoin(prefix_dir, filename))
1429 by Robert Collins
merge in niemeyers prefixed-store patch
132
        self._set_new_format(BZR_BRANCH_FORMAT_6)
133
134
135
    def _convert_to_weaves(self):
1381 by Martin Pool
- remove tab characters (only)
136
        note('note: upgrade may be faster if all store files are ungzipped first')
137
        if not os.path.isdir(self.base + '/.bzr/weaves'):
138
            os.mkdir(self.base + '/.bzr/weaves')
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
139
        self.inv_weave = Weave('inventory')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
140
        # holds in-memory weaves for all files
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
141
        self.text_weaves = {}
1381 by Martin Pool
- remove tab characters (only)
142
        os.remove(self.branch.controlfilename('branch-format'))
143
        self._convert_working_inv()
1358 by Martin Pool
- actually upgrade all of history
144
        rev_history = self.branch.revision_history()
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
145
        # to_read is a stack holding the revisions we still need to process;
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
146
        # appending to it adds new highest-priority revisions
1319 by Martin Pool
- calculate and use file parents for importing texts
147
        self.known_revisions = set(rev_history)
1185.20.1 by Andres Salomon
Handle the case where revision_history() returns an empty list during
148
        self.to_read = rev_history[-1:]
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
149
        while self.to_read:
150
            rev_id = self.to_read.pop()
151
            if (rev_id not in self.revisions
152
                and rev_id not in self.absent_revisions):
153
                self._load_one_rev(rev_id)
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
154
        self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
155
        to_import = self._make_order()
1315 by Martin Pool
- import file inventories in correct order
156
        for i, rev_id in enumerate(to_import):
157
            self.pb.update('converting revision', i, len(to_import))
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
158
            self._convert_one_rev(rev_id)
1331 by Martin Pool
- write out new revisions after conversion
159
        self.pb.clear()
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
160
        note('upgraded to weaves:')
161
        note('  %6d revisions and inventories' % len(self.revisions))
1393.1.44 by Martin Pool
- upgrade carries across ghost references
162
        note('  %6d revisions not present' % len(self.absent_revisions))
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
163
        note('  %6d texts' % self.text_count)
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
164
        self._write_all_weaves()
1331 by Martin Pool
- write out new revisions after conversion
165
        self._write_all_revs()
1381 by Martin Pool
- remove tab characters (only)
166
        self._cleanup_spare_files()
1429 by Robert Collins
merge in niemeyers prefixed-store patch
167
        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
168
169
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
170
    def _open_branch(self):
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
171
        self.branch = Branch.open_downlevel(self.base)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
172
        self.old_format = self.branch._branch_format
173
        if self.old_format == 6:
174
            note('this branch is in the most current format')
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
175
            return False
1429 by Robert Collins
merge in niemeyers prefixed-store patch
176
        if self.old_format not in (4, 5):
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
177
            raise BzrError("cannot upgrade from branch format %r" %
178
                           self.branch._branch_format)
179
        return True
180
181
1429 by Robert Collins
merge in niemeyers prefixed-store patch
182
    def _set_new_format(self, format):
183
        self.branch.put_controlfile('branch-format', format)
1355 by Martin Pool
- write working inventory into final location
184
185
186
    def _cleanup_spare_files(self):
1381 by Martin Pool
- remove tab characters (only)
187
        for n in 'merged-patches', 'pending-merged-patches':
188
            p = self.branch.controlfilename(n)
189
            if not os.path.exists(p):
190
                continue
191
            ## assert os.path.getsize(p) == 0
192
            os.remove(p)
193
        shutil.rmtree(self.base + '/.bzr/inventory-store')
194
        shutil.rmtree(self.base + '/.bzr/text-store')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
195
196
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
197
    def _backup_control_dir(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
198
        orig = self.base + '/.bzr'
199
        backup = orig + '.backup'
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
200
        note('making backup of tree history')
1381 by Martin Pool
- remove tab characters (only)
201
        shutil.copytree(orig, backup)
202
        note('%s has been backed up to %s', orig, backup)
203
        note('if conversion fails, you can move this directory back to .bzr')
204
        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
205
206
207
    def _convert_working_inv(self):
1381 by Martin Pool
- remove tab characters (only)
208
        branch = self.branch
209
        inv = serializer_v4.read_inventory(branch.controlfile('inventory', 'rb'))
1393.1.18 by Martin Pool
- fix upgrade for transport changes
210
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
211
        branch.put_controlfile('inventory', new_inv_xml)
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
212
213
214
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
215
    def _write_all_weaves(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
216
        write_a_weave(self.inv_weave, self.base + '/.bzr/inventory.weave')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
217
        i = 0
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
218
        try:
219
            for file_id, file_weave in self.text_weaves.items():
220
                self.pb.update('writing weave', i, len(self.text_weaves))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
221
                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
222
                i += 1
223
        finally:
224
            self.pb.clear()
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
225
1331 by Martin Pool
- write out new revisions after conversion
226
227
    def _write_all_revs(self):
228
        """Write all revisions out in new form."""
1381 by Martin Pool
- remove tab characters (only)
229
        shutil.rmtree(self.base + '/.bzr/revision-store')
230
        os.mkdir(self.base + '/.bzr/revision-store')
1331 by Martin Pool
- write out new revisions after conversion
231
        try:
232
            for i, rev_id in enumerate(self.converted_revs):
233
                self.pb.update('write revision', i, len(self.converted_revs))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
234
                f = file(self.base + '/.bzr/revision-store/%s' % rev_id, 'wb')
1331 by Martin Pool
- write out new revisions after conversion
235
                try:
236
                    serializer_v5.write_revision(self.revisions[rev_id], f)
237
                finally:
238
                    f.close()
239
        finally:
240
            self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
241
1331 by Martin Pool
- write out new revisions after conversion
242
            
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
243
    def _load_one_rev(self, rev_id):
244
        """Load a revision object into memory.
245
246
        Any parents not either loaded or abandoned get queued to be
247
        loaded."""
248
        self.pb.update('loading revision',
1315 by Martin Pool
- import file inventories in correct order
249
                       len(self.revisions),
1319 by Martin Pool
- calculate and use file parents for importing texts
250
                       len(self.known_revisions))
1442.1.45 by Robert Collins
replace __contains__ calls in stores with has_id
251
        if not self.branch.revision_store.has_id(rev_id):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
252
            self.pb.clear()
253
            note('revision {%s} not present in branch; '
1393.1.44 by Martin Pool
- upgrade carries across ghost references
254
                 'will be converted as a ghost',
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
255
                 rev_id)
256
            self.absent_revisions.add(rev_id)
257
        else:
1442.1.35 by Robert Collins
convert all users of __getitem__ into TransportStores to use .get instead
258
            rev_xml = self.branch.revision_store.get(rev_id).read()
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
259
            rev = serializer_v4.read_revision_from_string(rev_xml)
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
260
            for parent_id in rev.parent_ids:
1319 by Martin Pool
- calculate and use file parents for importing texts
261
                self.known_revisions.add(parent_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
262
                self.to_read.append(parent_id)
263
            self.revisions[rev_id] = rev
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
264
265
266
    def _load_old_inventory(self, rev_id):
267
        assert rev_id not in self.converted_revs
1442.1.35 by Robert Collins
convert all users of __getitem__ into TransportStores to use .get instead
268
        old_inv_xml = self.branch.inventory_store.get(rev_id).read()
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
269
        inv = serializer_v4.read_inventory_from_string(old_inv_xml)
270
        rev = self.revisions[rev_id]
271
        if rev.inventory_sha1:
272
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
273
                'inventory sha mismatch for {%s}' % rev_id
274
        return inv
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
275
        
276
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
277
    def _load_updated_inventory(self, rev_id):
278
        assert rev_id in self.converted_revs
279
        inv_xml = self.inv_weave.get_text(rev_id)
280
        inv = serializer_v5.read_inventory_from_string(inv_xml)
281
        return inv
282
283
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
284
    def _convert_one_rev(self, rev_id):
285
        """Convert revision and all referenced objects to new format."""
286
        rev = self.revisions[rev_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
287
        inv = self._load_old_inventory(rev_id)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
288
        present_parents = [p for p in rev.parent_ids
289
                           if p not in self.absent_revisions]
290
        self._convert_revision_contents(rev, inv, present_parents)
291
        self._store_new_weave(rev, inv, present_parents)
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
292
        self.converted_revs.add(rev_id)
293
294
1393.1.44 by Martin Pool
- upgrade carries across ghost references
295
    def _store_new_weave(self, rev, inv, present_parents):
1320 by Martin Pool
- write updated inventory into weave
296
        # the XML is now updated with text versions
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
297
        if __debug__:
298
            for file_id in inv:
299
                ie = inv[file_id]
300
                if ie.kind == 'root_directory':
301
                    continue
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
302
                assert hasattr(ie, 'revision'), \
303
                    'no revision on {%s} in {%s}' % \
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
304
                    (file_id, rev.revision_id)
1316 by Martin Pool
- upgrade format of inventories as they're converted
305
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
306
        new_inv_sha1 = sha_string(new_inv_xml)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
307
        self.inv_weave.add(rev.revision_id, 
308
                           present_parents,
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
309
                           new_inv_xml.splitlines(True),
310
                           new_inv_sha1)
311
        rev.inventory_sha1 = new_inv_sha1
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
312
1393.1.44 by Martin Pool
- upgrade carries across ghost references
313
    def _convert_revision_contents(self, rev, inv, present_parents):
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
314
        """Convert all the files within a revision.
315
316
        Also upgrade the inventory to refer to the text revision ids."""
317
        rev_id = rev.revision_id
1319 by Martin Pool
- calculate and use file parents for importing texts
318
        mutter('converting texts of revision {%s}',
319
               rev_id)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
320
        parent_invs = map(self._load_updated_inventory, present_parents)
1332 by Martin Pool
- clean up code that writes out weave results
321
        for file_id in inv:
322
            ie = inv[file_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
323
            self._convert_file_version(rev, ie, parent_invs)
324
325
    def _convert_file_version(self, rev, ie, parent_invs):
1319 by Martin Pool
- calculate and use file parents for importing texts
326
        """Convert one version of one file.
327
328
        The file needs to be added into the weave if it is a merge
329
        of >=2 parents or if it's changed from its parent.
330
        """
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
331
        if ie.kind == 'root_directory':
332
            return
1319 by Martin Pool
- calculate and use file parents for importing texts
333
        file_id = ie.file_id
334
        rev_id = rev.revision_id
335
        w = self.text_weaves.get(file_id)
336
        if w is None:
337
            w = Weave(file_id)
338
            self.text_weaves[file_id] = w
339
        text_changed = False
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
340
        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
341
        for old_revision in previous_entries:
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
342
                # if this fails, its a ghost ?
343
                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
344
        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
345
        del ie.text_id
346
        assert getattr(ie, 'revision', None) is not None
347
348
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
349
        # TODO: convert this logic, which is ~= snapshot to
350
        # 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
351
        # a v4 revision_tree can be given, or something that looks enough like
352
        # 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
353
        # and we need something that looks like a weave store for snapshot to 
354
        # save against.
355
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
356
        if len(previous_revisions) == 1:
357
            previous_ie = previous_revisions.values()[0]
358
            if ie._unchanged(previous_ie):
359
                ie.revision = previous_ie.revision
360
                return
361
        parent_indexes = map(w.lookup, previous_revisions)
362
        if ie.has_text():
1442.1.35 by Robert Collins
convert all users of __getitem__ into TransportStores to use .get instead
363
            file_lines = self.branch.text_store.get(ie.text_id).readlines()
1378 by Martin Pool
- in upgrade, avoiding loading file texts unless necessary
364
            assert sha_strings(file_lines) == ie.text_sha1
365
            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
366
            w.add(rev_id, parent_indexes, file_lines, ie.text_sha1)
1332 by Martin Pool
- clean up code that writes out weave results
367
            self.text_count += 1
1319 by Martin Pool
- calculate and use file parents for importing texts
368
        else:
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, [], None)
370
        ie.revision = rev_id
371
        ##mutter('import text {%s} of {%s}',
372
        ##       ie.text_id, file_id)
1310 by Martin Pool
- compute order to import revisions
373
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
374
    def _make_order(self):
1310 by Martin Pool
- compute order to import revisions
375
        """Return a suitable order for importing revisions.
376
377
        The order must be such that an revision is imported after all
378
        its (present) parents.
379
        """
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
380
        todo = set(self.revisions.keys())
381
        done = self.absent_revisions.copy()
1310 by Martin Pool
- compute order to import revisions
382
        o = []
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
383
        while todo:
384
            # scan through looking for a revision whose parents
385
            # are all done
1310 by Martin Pool
- compute order to import revisions
386
            for rev_id in sorted(list(todo)):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
387
                rev = self.revisions[rev_id]
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
388
                parent_ids = set(rev.parent_ids)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
389
                if parent_ids.issubset(done):
390
                    # can take this one now
1310 by Martin Pool
- compute order to import revisions
391
                    o.append(rev_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
392
                    todo.remove(rev_id)
393
                    done.add(rev_id)
1315 by Martin Pool
- import file inventories in correct order
394
        return o
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
395
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
396
1332 by Martin Pool
- clean up code that writes out weave results
397
def write_a_weave(weave, filename):
398
    inv_wf = file(filename, 'wb')
1080 by Martin Pool
- test tool for converting history to weave files
399
    try:
1087 by Martin Pool
- add a tool script to convert past history into weaves
400
        write_weave(weave, inv_wf)
1080 by Martin Pool
- test tool for converting history to weave files
401
    finally:
402
        inv_wf.close()
403
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
404
405
def upgrade(base_dir):
406
    Convert(base_dir)