/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
# 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
1326 by Martin Pool
- check inventory sha when loading old revisions
84
from bzrlib.osutils import sha_strings, sha_string
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.17.1 by Martin Pool
[pick] clear hashcache in format upgrade to avoid worrisome warning
111
        cache = hashcache.HashCache(os.path.abspath(self.base))
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) 
121
            store_dir = os.path.join(self.base, ".bzr", store_name)
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
127
                prefix_dir = os.path.join(store_dir, hash_prefix(file_id))
128
                if not os.path.isdir(prefix_dir):
129
                    os.mkdir(prefix_dir)
130
                os.rename(os.path.join(store_dir, filename),
131
                          os.path.join(prefix_dir, filename))
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 = {}
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
142
        os.remove(self.branch.control_files.controlfilename('branch-format'))
1381 by Martin Pool
- remove tab characters (only)
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
1429 by Robert Collins
merge in niemeyers prefixed-store patch
181
    def _set_new_format(self, format):
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
182
        self.branch.control_files.put_utf8('branch-format', format)
1355 by Martin Pool
- write working inventory into final location
183
184
    def _cleanup_spare_files(self):
1381 by Martin Pool
- remove tab characters (only)
185
        for n in 'merged-patches', 'pending-merged-patches':
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
186
            p = self.branch.control_files.controlfilename(n)
1381 by Martin Pool
- remove tab characters (only)
187
            if not os.path.exists(p):
188
                continue
189
            ## assert os.path.getsize(p) == 0
190
            os.remove(p)
191
        shutil.rmtree(self.base + '/.bzr/inventory-store')
192
        shutil.rmtree(self.base + '/.bzr/text-store')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
193
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
194
    def _backup_control_dir(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
195
        orig = self.base + '/.bzr'
196
        backup = orig + '.backup'
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
197
        note('making backup of tree history')
1381 by Martin Pool
- remove tab characters (only)
198
        shutil.copytree(orig, backup)
199
        note('%s has been backed up to %s', orig, backup)
200
        note('if conversion fails, you can move this directory back to .bzr')
201
        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
202
203
    def _convert_working_inv(self):
1381 by Martin Pool
- remove tab characters (only)
204
        branch = self.branch
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
205
        inv = serializer_v4.read_inventory(branch.control_files.controlfile('inventory', 'rb'))
1393.1.18 by Martin Pool
- fix upgrade for transport changes
206
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
207
        branch.control_files.put_utf8('inventory', new_inv_xml)
1352 by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves
208
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
209
    def _write_all_weaves(self):
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
210
        write_a_weave(self.inv_weave, self.base + '/.bzr/inventory.weave')
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
211
        i = 0
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
212
        try:
213
            for file_id, file_weave in self.text_weaves.items():
214
                self.pb.update('writing weave', i, len(self.text_weaves))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
215
                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
216
                i += 1
217
        finally:
218
            self.pb.clear()
1300 by Martin Pool
- refactor weave upgrade into a MethodObject
219
1331 by Martin Pool
- write out new revisions after conversion
220
221
    def _write_all_revs(self):
222
        """Write all revisions out in new form."""
1381 by Martin Pool
- remove tab characters (only)
223
        shutil.rmtree(self.base + '/.bzr/revision-store')
224
        os.mkdir(self.base + '/.bzr/revision-store')
1331 by Martin Pool
- write out new revisions after conversion
225
        try:
226
            for i, rev_id in enumerate(self.converted_revs):
227
                self.pb.update('write revision', i, len(self.converted_revs))
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
228
                f = file(self.base + '/.bzr/revision-store/%s' % rev_id, 'wb')
1331 by Martin Pool
- write out new revisions after conversion
229
                try:
230
                    serializer_v5.write_revision(self.revisions[rev_id], f)
231
                finally:
232
                    f.close()
233
        finally:
234
            self.pb.clear()
1332 by Martin Pool
- clean up code that writes out weave results
235
1331 by Martin Pool
- write out new revisions after conversion
236
            
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
237
    def _load_one_rev(self, rev_id):
238
        """Load a revision object into memory.
239
240
        Any parents not either loaded or abandoned get queued to be
241
        loaded."""
242
        self.pb.update('loading revision',
1315 by Martin Pool
- import file inventories in correct order
243
                       len(self.revisions),
1319 by Martin Pool
- calculate and use file parents for importing texts
244
                       len(self.known_revisions))
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
245
        if not self.branch.repository.revision_store.has_id(rev_id):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
246
            self.pb.clear()
247
            note('revision {%s} not present in branch; '
1393.1.44 by Martin Pool
- upgrade carries across ghost references
248
                 'will be converted as a ghost',
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
249
                 rev_id)
250
            self.absent_revisions.add(rev_id)
251
        else:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
252
            rev_xml = self.branch.repository.revision_store.get(rev_id).read()
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
253
            rev = serializer_v4.read_revision_from_string(rev_xml)
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
254
            for parent_id in rev.parent_ids:
1319 by Martin Pool
- calculate and use file parents for importing texts
255
                self.known_revisions.add(parent_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
256
                self.to_read.append(parent_id)
257
            self.revisions[rev_id] = rev
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
258
259
260
    def _load_old_inventory(self, rev_id):
261
        assert rev_id not in self.converted_revs
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
262
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
263
        inv = serializer_v4.read_inventory_from_string(old_inv_xml)
264
        rev = self.revisions[rev_id]
265
        if rev.inventory_sha1:
266
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
267
                'inventory sha mismatch for {%s}' % rev_id
268
        return inv
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
269
        
270
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
271
    def _load_updated_inventory(self, rev_id):
272
        assert rev_id in self.converted_revs
273
        inv_xml = self.inv_weave.get_text(rev_id)
274
        inv = serializer_v5.read_inventory_from_string(inv_xml)
275
        return inv
276
277
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
278
    def _convert_one_rev(self, rev_id):
279
        """Convert revision and all referenced objects to new format."""
280
        rev = self.revisions[rev_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
281
        inv = self._load_old_inventory(rev_id)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
282
        present_parents = [p for p in rev.parent_ids
283
                           if p not in self.absent_revisions]
284
        self._convert_revision_contents(rev, inv, present_parents)
285
        self._store_new_weave(rev, inv, present_parents)
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
286
        self.converted_revs.add(rev_id)
287
288
1393.1.44 by Martin Pool
- upgrade carries across ghost references
289
    def _store_new_weave(self, rev, inv, present_parents):
1320 by Martin Pool
- write updated inventory into weave
290
        # the XML is now updated with text versions
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
291
        if __debug__:
292
            for file_id in inv:
293
                ie = inv[file_id]
294
                if ie.kind == 'root_directory':
295
                    continue
1092.2.21 by Robert Collins
convert name_version to revision in inventory entries
296
                assert hasattr(ie, 'revision'), \
297
                    'no revision on {%s} in {%s}' % \
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
298
                    (file_id, rev.revision_id)
1316 by Martin Pool
- upgrade format of inventories as they're converted
299
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
300
        new_inv_sha1 = sha_string(new_inv_xml)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
301
        self.inv_weave.add(rev.revision_id, 
302
                           present_parents,
1325 by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation
303
                           new_inv_xml.splitlines(True),
304
                           new_inv_sha1)
305
        rev.inventory_sha1 = new_inv_sha1
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
306
1393.1.44 by Martin Pool
- upgrade carries across ghost references
307
    def _convert_revision_contents(self, rev, inv, present_parents):
1318 by Martin Pool
- pull texts into weaves in a fairly lazy way
308
        """Convert all the files within a revision.
309
310
        Also upgrade the inventory to refer to the text revision ids."""
311
        rev_id = rev.revision_id
1319 by Martin Pool
- calculate and use file parents for importing texts
312
        mutter('converting texts of revision {%s}',
313
               rev_id)
1393.1.44 by Martin Pool
- upgrade carries across ghost references
314
        parent_invs = map(self._load_updated_inventory, present_parents)
1332 by Martin Pool
- clean up code that writes out weave results
315
        for file_id in inv:
316
            ie = inv[file_id]
1386 by Martin Pool
- avoiding loading all inventories upfront for conversion
317
            self._convert_file_version(rev, ie, parent_invs)
318
319
    def _convert_file_version(self, rev, ie, parent_invs):
1319 by Martin Pool
- calculate and use file parents for importing texts
320
        """Convert one version of one file.
321
322
        The file needs to be added into the weave if it is a merge
323
        of >=2 parents or if it's changed from its parent.
324
        """
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
325
        if ie.kind == 'root_directory':
326
            return
1319 by Martin Pool
- calculate and use file parents for importing texts
327
        file_id = ie.file_id
328
        rev_id = rev.revision_id
329
        w = self.text_weaves.get(file_id)
330
        if w is None:
331
            w = Weave(file_id)
332
            self.text_weaves[file_id] = w
333
        text_changed = False
1411 by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.
334
        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
335
        for old_revision in previous_entries:
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
336
                # if this fails, its a ghost ?
337
                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
338
        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
339
        del ie.text_id
340
        assert getattr(ie, 'revision', None) is not None
341
342
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
343
        # TODO: convert this logic, which is ~= snapshot to
344
        # 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
345
        # a v4 revision_tree can be given, or something that looks enough like
346
        # 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
347
        # and we need something that looks like a weave store for snapshot to 
348
        # save against.
349
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
350
        if len(previous_revisions) == 1:
351
            previous_ie = previous_revisions.values()[0]
352
            if ie._unchanged(previous_ie):
353
                ie.revision = previous_ie.revision
354
                return
355
        parent_indexes = map(w.lookup, previous_revisions)
356
        if ie.has_text():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
357
            text = self.branch.repository.text_store.get(ie.text_id)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
358
            file_lines = text.readlines()
1378 by Martin Pool
- in upgrade, avoiding loading file texts unless necessary
359
            assert sha_strings(file_lines) == ie.text_sha1
360
            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
361
            w.add(rev_id, parent_indexes, file_lines, ie.text_sha1)
1332 by Martin Pool
- clean up code that writes out weave results
362
            self.text_count += 1
1319 by Martin Pool
- calculate and use file parents for importing texts
363
        else:
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
364
            w.add(rev_id, parent_indexes, [], None)
365
        ie.revision = rev_id
366
        ##mutter('import text {%s} of {%s}',
367
        ##       ie.text_id, file_id)
1310 by Martin Pool
- compute order to import revisions
368
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
369
    def _make_order(self):
1310 by Martin Pool
- compute order to import revisions
370
        """Return a suitable order for importing revisions.
371
372
        The order must be such that an revision is imported after all
373
        its (present) parents.
374
        """
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
375
        todo = set(self.revisions.keys())
376
        done = self.absent_revisions.copy()
1310 by Martin Pool
- compute order to import revisions
377
        o = []
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
378
        while todo:
379
            # scan through looking for a revision whose parents
380
            # are all done
1310 by Martin Pool
- compute order to import revisions
381
            for rev_id in sorted(list(todo)):
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
382
                rev = self.revisions[rev_id]
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
383
                parent_ids = set(rev.parent_ids)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
384
                if parent_ids.issubset(done):
385
                    # can take this one now
1310 by Martin Pool
- compute order to import revisions
386
                    o.append(rev_id)
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
387
                    todo.remove(rev_id)
388
                    done.add(rev_id)
1315 by Martin Pool
- import file inventories in correct order
389
        return o
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
390
1309 by Martin Pool
- first cut at tsort to make order to bring in revisions
391
1332 by Martin Pool
- clean up code that writes out weave results
392
def write_a_weave(weave, filename):
393
    inv_wf = file(filename, 'wb')
1080 by Martin Pool
- test tool for converting history to weave files
394
    try:
1087 by Martin Pool
- add a tool script to convert past history into weaves
395
        write_weave(weave, inv_wf)
1080 by Martin Pool
- test tool for converting history to weave files
396
    finally:
397
        inv_wf.close()
398
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
399
400
def upgrade(base_dir):
401
    Convert(base_dir)