~bzr-pqm/bzr/bzr.dev

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