/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
1350 by Martin Pool
- set reasonable name_versions
71
if False:
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
72
    try:
73
        import psyco
74
        psyco.full()
75
    except ImportError:
76
        pass
1083 by Martin Pool
- add space to store revision-id in weave files
77
1080 by Martin Pool
- test tool for converting history to weave files
78
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
79
import os
1267 by Martin Pool
- notes on conversion of existing history to weaves
80
import tempfile
81
import sys
1132 by Martin Pool
- fix up logging for history2weaves tool
82
import logging
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
83
import shutil
1132 by Martin Pool
- fix up logging for history2weaves tool
84
1355 by Martin Pool
- write working inventory into final location
85
from bzrlib.branch import Branch, find_branch, BZR_BRANCH_FORMAT_5
1080 by Martin Pool
- test tool for converting history to weave files
86
from bzrlib.revfile import Revfile
87
from bzrlib.weave import Weave
88
from bzrlib.weavefile import read_weave, write_weave
89
from bzrlib.progress import ProgressBar
90
from bzrlib.atomicfile import AtomicFile
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
91
from bzrlib.xml4 import serializer_v4
92
from bzrlib.xml5 import serializer_v5
1307 by Martin Pool
- start walking through ancestors in conversion to weaves
93
from bzrlib.trace import mutter, note, warning, enable_default_logging
1326 by Martin Pool
- check inventory sha when loading old revisions
94
from bzrlib.osutils import sha_strings, sha_string
1337 by Martin Pool
- produce ancestry when converting versions
95
from bzrlib.commit import merge_ancestry_lines
1267 by Martin Pool
- notes on conversion of existing history to weaves
96
1080 by Martin Pool
- test tool for converting history to weave files
97
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
98
class Convert(object):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
99
    def __init__(self, base_dir):
100
        self.base = base_dir
1307 by Martin Pool
- start walking through ancestors in conversion to weaves
101
        self.converted_revs = set()
102
        self.absent_revisions = set()
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
103
        self.text_count = 0
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
104
        self.revisions = {}
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
105
        self.convert()
106
107
108
    def convert(self):
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
109
        if not self._open_branch():
110
            return
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
111
        note('starting upgrade of %s', os.path.abspath(self.base))
1381 by Martin Pool
- remove tab characters (only)
112
        self._backup_control_dir()
113
        note('starting upgrade')
114
        note('note: upgrade may be faster if all store files are ungzipped first')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
115
        self.pb = ProgressBar()
1381 by Martin Pool
- remove tab characters (only)
116
        if not os.path.isdir(self.base + '/.bzr/weaves'):
117
            os.mkdir(self.base + '/.bzr/weaves')
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
118
        self.inv_weave = Weave('inventory')
119
        self.anc_weave = Weave('ancestry')
1337 by Martin Pool
- produce ancestry when converting versions
120
        self.ancestries = {}
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
121
        # holds in-memory weaves for all files
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
122
        self.text_weaves = {}
1381 by Martin Pool
- remove tab characters (only)
123
        os.remove(self.branch.controlfilename('branch-format'))
124
        self._convert_working_inv()
1358 by Martin Pool
- actually upgrade all of history
125
        rev_history = self.branch.revision_history()
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
126
        # to_read is a stack holding the revisions we still need to process;
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
127
        # appending to it adds new highest-priority revisions
1319 by Martin Pool
- calculate and use file parents for importing texts
128
        self.known_revisions = set(rev_history)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
129
        self.to_read = [rev_history[-1]]
130
        while self.to_read:
131
            rev_id = self.to_read.pop()
132
            if (rev_id not in self.revisions
133
                and rev_id not in self.absent_revisions):
134
                self._load_one_rev(rev_id)
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
135
        self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
136
        to_import = self._make_order()
1315 by Martin Pool
- import file inventories in correct order
137
        for i, rev_id in enumerate(to_import):
138
            self.pb.update('converting revision', i, len(to_import))
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
139
            self._convert_one_rev(rev_id)
1331 by Martin Pool
- write out new revisions after conversion
140
        self.pb.clear()
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
141
        note('upgraded to weaves:')
142
        note('  %6d revisions and inventories' % len(self.revisions))
143
        note('  %6d absent revisions removed' % len(self.absent_revisions))
144
        note('  %6d texts' % self.text_count)
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
145
        self._write_all_weaves()
1331 by Martin Pool
- write out new revisions after conversion
146
        self._write_all_revs()
1381 by Martin Pool
- remove tab characters (only)
147
        self._set_new_format()
148
        self._cleanup_spare_files()
1357 by Martin Pool
- require marker file to do upgrade so as not to clobber something important
149
150
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
151
    def _open_branch(self):
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
152
        self.branch = Branch.open_downlevel(self.base)
1382 by Martin Pool
- upgrade checks if branch is uptodate before anything else
153
        if self.branch._branch_format == 5:
154
            note('this branch is already in the most current format')
155
            return False
156
        if self.branch._branch_format != 4:
157
            raise BzrError("cannot upgrade from branch format %r" %
158
                           self.branch._branch_format)
159
        return True
160
161
1357 by Martin Pool
- require marker file to do upgrade so as not to clobber something important
162
    def _set_new_format(self):
1393.1.18 by Martin Pool
- fix upgrade for transport changes
163
        self.branch.put_controlfile('branch-format', BZR_BRANCH_FORMAT_5)
1355 by Martin Pool
- write working inventory into final location
164
165
166
    def _cleanup_spare_files(self):
1381 by Martin Pool
- remove tab characters (only)
167
        for n in 'merged-patches', 'pending-merged-patches':
168
            p = self.branch.controlfilename(n)
169
            if not os.path.exists(p):
170
                continue
171
            ## assert os.path.getsize(p) == 0
172
            os.remove(p)
173
        shutil.rmtree(self.base + '/.bzr/inventory-store')
174
        shutil.rmtree(self.base + '/.bzr/text-store')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
175
176
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
177
    def _backup_control_dir(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
178
        orig = self.base + '/.bzr'
179
        backup = orig + '.backup'
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
180
        note('making backup of tree history')
1381 by Martin Pool
- remove tab characters (only)
181
        shutil.copytree(orig, backup)
182
        note('%s has been backed up to %s', orig, backup)
183
        note('if conversion fails, you can move this directory back to .bzr')
184
        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
185
186
187
    def _convert_working_inv(self):
1381 by Martin Pool
- remove tab characters (only)
188
        branch = self.branch
189
        inv = serializer_v4.read_inventory(branch.controlfile('inventory', 'rb'))
1393.1.18 by Martin Pool
- fix upgrade for transport changes
190
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
191
        branch.put_controlfile('inventory', new_inv_xml)
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
192
193
194
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
195
    def _write_all_weaves(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
196
        write_a_weave(self.inv_weave, self.base + '/.bzr/inventory.weave')
197
        write_a_weave(self.anc_weave, self.base + '/.bzr/ancestry.weave')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
198
        i = 0
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
199
        try:
200
            for file_id, file_weave in self.text_weaves.items():
201
                self.pb.update('writing weave', i, len(self.text_weaves))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
202
                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
203
                i += 1
204
        finally:
205
            self.pb.clear()
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
206
1331 by Martin Pool
- write out new revisions after conversion
207
208
    def _write_all_revs(self):
209
        """Write all revisions out in new form."""
1381 by Martin Pool
- remove tab characters (only)
210
        shutil.rmtree(self.base + '/.bzr/revision-store')
211
        os.mkdir(self.base + '/.bzr/revision-store')
1331 by Martin Pool
- write out new revisions after conversion
212
        try:
213
            for i, rev_id in enumerate(self.converted_revs):
214
                self.pb.update('write revision', i, len(self.converted_revs))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
215
                f = file(self.base + '/.bzr/revision-store/%s' % rev_id, 'wb')
1331 by Martin Pool
- write out new revisions after conversion
216
                try:
217
                    serializer_v5.write_revision(self.revisions[rev_id], f)
218
                finally:
219
                    f.close()
220
        finally:
221
            self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
222
1331 by Martin Pool
- write out new revisions after conversion
223
            
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
224
    def _load_one_rev(self, rev_id):
225
        """Load a revision object into memory.
226
227
        Any parents not either loaded or abandoned get queued to be
228
        loaded."""
229
        self.pb.update('loading revision',
1315 by Martin Pool
- import file inventories in correct order
230
                       len(self.revisions),
1319 by Martin Pool
- calculate and use file parents for importing texts
231
                       len(self.known_revisions))
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
232
        if rev_id not in self.branch.revision_store:
233
            self.pb.clear()
234
            note('revision {%s} not present in branch; '
235
                 'will not be converted',
236
                 rev_id)
237
            self.absent_revisions.add(rev_id)
238
        else:
239
            rev_xml = self.branch.revision_store[rev_id].read()
240
            rev = serializer_v4.read_revision_from_string(rev_xml)
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
241
            for parent_id in rev.parent_ids:
1319 by Martin Pool
- calculate and use file parents for importing texts
242
                self.known_revisions.add(parent_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
243
                self.to_read.append(parent_id)
244
            self.revisions[rev_id] = rev
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
245
246
247
    def _load_old_inventory(self, rev_id):
248
        assert rev_id not in self.converted_revs
249
        old_inv_xml = self.branch.inventory_store[rev_id].read()
250
        inv = serializer_v4.read_inventory_from_string(old_inv_xml)
251
        rev = self.revisions[rev_id]
252
        if rev.inventory_sha1:
253
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
254
                'inventory sha mismatch for {%s}' % rev_id
255
        return inv
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
256
        
257
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
258
    def _load_updated_inventory(self, rev_id):
259
        assert rev_id in self.converted_revs
260
        inv_xml = self.inv_weave.get_text(rev_id)
261
        inv = serializer_v5.read_inventory_from_string(inv_xml)
262
        return inv
263
264
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
265
    def _convert_one_rev(self, rev_id):
266
        """Convert revision and all referenced objects to new format."""
267
        rev = self.revisions[rev_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
268
        inv = self._load_old_inventory(rev_id)
1337 by Martin Pool
- produce ancestry when converting versions
269
        for parent_id in rev.parent_ids[:]:
270
            if parent_id in self.absent_revisions:
271
                rev.parent_ids.remove(parent_id)
272
                self.pb.clear()
273
                note('remove {%s} as parent of {%s}', parent_id, rev_id)
1320 by Martin Pool
- write updated inventory into weave
274
        self._convert_revision_contents(rev, inv)
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
275
        self._store_new_weave(rev, inv)
276
        self._make_rev_ancestry(rev)
277
        self.converted_revs.add(rev_id)
278
279
280
    def _store_new_weave(self, rev, inv):
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)
290
1316 by Martin Pool
- upgrade format of inventories as they're converted
291
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
292
        new_inv_sha1 = sha_string(new_inv_xml)
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
293
        self.inv_weave.add(rev.revision_id, rev.parent_ids,
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
1337 by Martin Pool
- produce ancestry when converting versions
299
    def _make_rev_ancestry(self, rev):
300
        rev_id = rev.revision_id
301
        for parent_id in rev.parent_ids:
302
            assert parent_id in self.converted_revs
1340 by Martin Pool
- conversion to weave computes ancestries using weave mash
303
        if rev.parent_ids:
304
            lines = list(self.anc_weave.mash_iter(rev.parent_ids))
305
        else:
306
            lines = []
307
        lines.append(rev_id + '\n')
308
        if __debug__:
309
            parent_ancestries = [self.ancestries[p] for p in rev.parent_ids]
310
            new_lines = merge_ancestry_lines(rev_id, parent_ancestries)
311
            assert set(lines) == set(new_lines)
312
            self.ancestries[rev_id] = new_lines
313
        self.anc_weave.add(rev_id, rev.parent_ids, lines)
1337 by Martin Pool
- produce ancestry when converting versions
314
315
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
316
    def _convert_revision_contents(self, rev, inv):
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)
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
323
        parent_invs = map(self._load_updated_inventory, rev.parent_ids)
1332 by Martin Pool
- clean up code that writes out weave results
324
        for file_id in inv:
325
            ie = inv[file_id]
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
326
            self._set_revision(rev, ie, parent_invs)
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
327
            if not ie.has_text():
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
328
                continue
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
329
            self._convert_file_version(rev, ie, parent_invs)
330
331
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
332
    def _set_revision(self, rev, ie, parent_invs):
1381 by Martin Pool
- remove tab characters (only)
333
        """Set name version for a file.
1350 by Martin Pool
- set reasonable name_versions
334
1381 by Martin Pool
- remove tab characters (only)
335
        Done in a slightly lazy way: if the file is renamed or in a merge revision
336
        it gets a new version, otherwise the same as before.
337
        """
338
        file_id = ie.file_id
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
339
        if ie.kind == 'root_directory':
340
            return
341
        if len(parent_invs) != 1:
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
342
            ie.revision = rev.revision_id
1381 by Martin Pool
- remove tab characters (only)
343
        else:
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
344
            old_inv = parent_invs[0]
1381 by Martin Pool
- remove tab characters (only)
345
            if not old_inv.has_id(file_id):
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
346
                ie.revision = rev.revision_id
1381 by Martin Pool
- remove tab characters (only)
347
            else:
348
                old_ie = old_inv[file_id]
349
                if (old_ie.parent_id != ie.parent_id
350
                    or old_ie.name != ie.name):
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
351
                    ie.revision = rev.revision_id
1381 by Martin Pool
- remove tab characters (only)
352
                else:
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
353
                    ie.revision = old_ie.revision
1350 by Martin Pool
- set reasonable name_versions
354
1319 by Martin Pool
- calculate and use file parents for importing texts
355
356
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
357
    def _convert_file_version(self, rev, ie, parent_invs):
1319 by Martin Pool
- calculate and use file parents for importing texts
358
        """Convert one version of one file.
359
360
        The file needs to be added into the weave if it is a merge
361
        of >=2 parents or if it's changed from its parent.
362
        """
363
        file_id = ie.file_id
364
        rev_id = rev.revision_id
365
        w = self.text_weaves.get(file_id)
366
        if w is None:
367
            w = Weave(file_id)
368
            self.text_weaves[file_id] = w
369
        file_parents = []
370
        text_changed = False
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
371
        for parent_inv in parent_invs:
1319 by Martin Pool
- calculate and use file parents for importing texts
372
            if parent_inv.has_id(file_id):
373
                parent_ie = parent_inv[file_id]
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
374
                old_revision = parent_ie.revision
375
                # if this fails, its a ghost ?
376
                assert old_revision in self.converted_revs 
377
                if old_revision not in file_parents:
378
                    file_parents.append(old_revision)
1319 by Martin Pool
- calculate and use file parents for importing texts
379
                if parent_ie.text_sha1 != ie.text_sha1:
380
                    text_changed = True
381
        if len(file_parents) != 1 or text_changed:
1378 by Martin Pool
- in upgrade, avoiding loading file texts unless necessary
382
            file_lines = self.branch.text_store[ie.text_id].readlines()
383
            assert sha_strings(file_lines) == ie.text_sha1
384
            assert sum(map(len, file_lines)) == ie.text_size
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
385
            w.add(rev_id, file_parents, file_lines, ie.text_sha1)
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
386
            ie.revision = rev_id
1332 by Martin Pool
- clean up code that writes out weave results
387
            self.text_count += 1
1330 by Martin Pool
- fiddle with trace
388
            ##mutter('import text {%s} of {%s}',
389
            ##       ie.text_id, file_id)
1319 by Martin Pool
- calculate and use file parents for importing texts
390
        else:
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
391
            ##mutter('text of {%s} unchanged from parent', file_id)
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
392
            ie.revision = file_parents[0]
1319 by Martin Pool
- calculate and use file parents for importing texts
393
        del ie.text_id
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
394
1310 by Martin Pool
- compute order to import revisions
395
396
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
397
    def _make_order(self):
1310 by Martin Pool
- compute order to import revisions
398
        """Return a suitable order for importing revisions.
399
400
        The order must be such that an revision is imported after all
401
        its (present) parents.
402
        """
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
403
        todo = set(self.revisions.keys())
404
        done = self.absent_revisions.copy()
1310 by Martin Pool
- compute order to import revisions
405
        o = []
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
406
        while todo:
407
            # scan through looking for a revision whose parents
408
            # are all done
1310 by Martin Pool
- compute order to import revisions
409
            for rev_id in sorted(list(todo)):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
410
                rev = self.revisions[rev_id]
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
411
                parent_ids = set(rev.parent_ids)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
412
                if parent_ids.issubset(done):
413
                    # can take this one now
1310 by Martin Pool
- compute order to import revisions
414
                    o.append(rev_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
415
                    todo.remove(rev_id)
416
                    done.add(rev_id)
1315 by Martin Pool
- import file inventories in correct order
417
        return o
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
418
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
419
1332 by Martin Pool
- clean up code that writes out weave results
420
def write_a_weave(weave, filename):
421
    inv_wf = file(filename, 'wb')
1080 by Martin Pool
- test tool for converting history to weave files
422
    try:
1087 by Martin Pool
- add a tool script to convert past history into weaves
423
        write_weave(weave, inv_wf)
1080 by Martin Pool
- test tool for converting history to weave files
424
    finally:
425
        inv_wf.close()
426
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
427
428
def upgrade(base_dir):
429
    Convert(base_dir)