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