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 |
1267
by Martin Pool
- notes on conversion of existing history to weaves |
98 |
|
1080
by Martin Pool
- test tool for converting history to weave files |
99 |
|
1300
by Martin Pool
- refactor weave upgrade into a MethodObject |
100 |
class Convert(object): |
1377
by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command |
101 |
def __init__(self, base_dir): |
102 |
self.base = base_dir |
|
1307
by Martin Pool
- start walking through ancestors in conversion to weaves |
103 |
self.converted_revs = set() |
104 |
self.absent_revisions = set() |
|
1300
by Martin Pool
- refactor weave upgrade into a MethodObject |
105 |
self.text_count = 0 |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
106 |
self.revisions = {} |
1300
by Martin Pool
- refactor weave upgrade into a MethodObject |
107 |
self.convert() |
108 |
||
109 |
||
110 |
def convert(self): |
|
1382
by Martin Pool
- upgrade checks if branch is uptodate before anything else |
111 |
if not self._open_branch(): |
112 |
return
|
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
113 |
note('starting upgrade of %s', os.path.abspath(self.base)) |
1381
by Martin Pool
- remove tab characters (only) |
114 |
self._backup_control_dir() |
115 |
note('starting upgrade') |
|
116 |
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 |
117 |
self.pb = ui_factory.progress_bar() |
1381
by Martin Pool
- remove tab characters (only) |
118 |
if not os.path.isdir(self.base + '/.bzr/weaves'): |
119 |
os.mkdir(self.base + '/.bzr/weaves') |
|
1382
by Martin Pool
- upgrade checks if branch is uptodate before anything else |
120 |
self.inv_weave = Weave('inventory') |
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)) |
|
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
143 |
note(' %6d revisions not present' % len(self.absent_revisions)) |
1352
by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves |
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') |
1300
by Martin Pool
- refactor weave upgrade into a MethodObject |
197 |
i = 0 |
1318
by Martin Pool
- pull texts into weaves in a fairly lazy way |
198 |
try: |
199 |
for file_id, file_weave in self.text_weaves.items(): |
|
200 |
self.pb.update('writing weave', i, len(self.text_weaves)) |
|
1377
by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command |
201 |
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 |
202 |
i += 1 |
203 |
finally: |
|
204 |
self.pb.clear() |
|
1300
by Martin Pool
- refactor weave upgrade into a MethodObject |
205 |
|
1331
by Martin Pool
- write out new revisions after conversion |
206 |
|
207 |
def _write_all_revs(self): |
|
208 |
"""Write all revisions out in new form."""
|
|
1381
by Martin Pool
- remove tab characters (only) |
209 |
shutil.rmtree(self.base + '/.bzr/revision-store') |
210 |
os.mkdir(self.base + '/.bzr/revision-store') |
|
1331
by Martin Pool
- write out new revisions after conversion |
211 |
try: |
212 |
for i, rev_id in enumerate(self.converted_revs): |
|
213 |
self.pb.update('write revision', i, len(self.converted_revs)) |
|
1377
by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command |
214 |
f = file(self.base + '/.bzr/revision-store/%s' % rev_id, 'wb') |
1331
by Martin Pool
- write out new revisions after conversion |
215 |
try: |
216 |
serializer_v5.write_revision(self.revisions[rev_id], f) |
|
217 |
finally: |
|
218 |
f.close() |
|
219 |
finally: |
|
220 |
self.pb.clear() |
|
1332
by Martin Pool
- clean up code that writes out weave results |
221 |
|
1331
by Martin Pool
- write out new revisions after conversion |
222 |
|
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
223 |
def _load_one_rev(self, rev_id): |
224 |
"""Load a revision object into memory.
|
|
225 |
||
226 |
Any parents not either loaded or abandoned get queued to be
|
|
227 |
loaded."""
|
|
228 |
self.pb.update('loading revision', |
|
1315
by Martin Pool
- import file inventories in correct order |
229 |
len(self.revisions), |
1319
by Martin Pool
- calculate and use file parents for importing texts |
230 |
len(self.known_revisions)) |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
231 |
if rev_id not in self.branch.revision_store: |
232 |
self.pb.clear() |
|
233 |
note('revision {%s} not present in branch; ' |
|
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
234 |
'will be converted as a ghost', |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
235 |
rev_id) |
236 |
self.absent_revisions.add(rev_id) |
|
237 |
else: |
|
238 |
rev_xml = self.branch.revision_store[rev_id].read() |
|
239 |
rev = serializer_v4.read_revision_from_string(rev_xml) |
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
240 |
for parent_id in rev.parent_ids: |
1319
by Martin Pool
- calculate and use file parents for importing texts |
241 |
self.known_revisions.add(parent_id) |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
242 |
self.to_read.append(parent_id) |
243 |
self.revisions[rev_id] = rev |
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
244 |
|
245 |
||
246 |
def _load_old_inventory(self, rev_id): |
|
247 |
assert rev_id not in self.converted_revs |
|
248 |
old_inv_xml = self.branch.inventory_store[rev_id].read() |
|
249 |
inv = serializer_v4.read_inventory_from_string(old_inv_xml) |
|
250 |
rev = self.revisions[rev_id] |
|
251 |
if rev.inventory_sha1: |
|
252 |
assert rev.inventory_sha1 == sha_string(old_inv_xml), \ |
|
253 |
'inventory sha mismatch for {%s}' % rev_id |
|
254 |
return inv |
|
1318
by Martin Pool
- pull texts into weaves in a fairly lazy way |
255 |
|
256 |
||
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
257 |
def _load_updated_inventory(self, rev_id): |
258 |
assert rev_id in self.converted_revs |
|
259 |
inv_xml = self.inv_weave.get_text(rev_id) |
|
260 |
inv = serializer_v5.read_inventory_from_string(inv_xml) |
|
261 |
return inv |
|
262 |
||
263 |
||
1318
by Martin Pool
- pull texts into weaves in a fairly lazy way |
264 |
def _convert_one_rev(self, rev_id): |
265 |
"""Convert revision and all referenced objects to new format."""
|
|
266 |
rev = self.revisions[rev_id] |
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
267 |
inv = self._load_old_inventory(rev_id) |
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
268 |
present_parents = [p for p in rev.parent_ids |
269 |
if p not in self.absent_revisions] |
|
270 |
self._convert_revision_contents(rev, inv, present_parents) |
|
271 |
self._store_new_weave(rev, inv, present_parents) |
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
272 |
self.converted_revs.add(rev_id) |
273 |
||
274 |
||
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
275 |
def _store_new_weave(self, rev, inv, present_parents): |
1320
by Martin Pool
- write updated inventory into weave |
276 |
# the XML is now updated with text versions
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
277 |
if __debug__: |
278 |
for file_id in inv: |
|
279 |
ie = inv[file_id] |
|
280 |
if ie.kind == 'root_directory': |
|
281 |
continue
|
|
1092.2.21
by Robert Collins
convert name_version to revision in inventory entries |
282 |
assert hasattr(ie, 'revision'), \ |
283 |
'no revision on {%s} in {%s}' % \ |
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
284 |
(file_id, rev.revision_id) |
1316
by Martin Pool
- upgrade format of inventories as they're converted |
285 |
new_inv_xml = serializer_v5.write_inventory_to_string(inv) |
1325
by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation |
286 |
new_inv_sha1 = sha_string(new_inv_xml) |
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
287 |
self.inv_weave.add(rev.revision_id, |
288 |
present_parents, |
|
1325
by Martin Pool
- conversion to weave tries to avoid repeated SHA calculation |
289 |
new_inv_xml.splitlines(True), |
290 |
new_inv_sha1) |
|
291 |
rev.inventory_sha1 = new_inv_sha1 |
|
1318
by Martin Pool
- pull texts into weaves in a fairly lazy way |
292 |
|
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
293 |
def _convert_revision_contents(self, rev, inv, present_parents): |
1318
by Martin Pool
- pull texts into weaves in a fairly lazy way |
294 |
"""Convert all the files within a revision.
|
295 |
||
296 |
Also upgrade the inventory to refer to the text revision ids."""
|
|
297 |
rev_id = rev.revision_id |
|
1319
by Martin Pool
- calculate and use file parents for importing texts |
298 |
mutter('converting texts of revision {%s}', |
299 |
rev_id) |
|
1393.1.44
by Martin Pool
- upgrade carries across ghost references |
300 |
parent_invs = map(self._load_updated_inventory, present_parents) |
1332
by Martin Pool
- clean up code that writes out weave results |
301 |
for file_id in inv: |
302 |
ie = inv[file_id] |
|
1386
by Martin Pool
- avoiding loading all inventories upfront for conversion |
303 |
self._convert_file_version(rev, ie, parent_invs) |
304 |
||
305 |
def _convert_file_version(self, rev, ie, parent_invs): |
|
1319
by Martin Pool
- calculate and use file parents for importing texts |
306 |
"""Convert one version of one file.
|
307 |
||
308 |
The file needs to be added into the weave if it is a merge
|
|
309 |
of >=2 parents or if it's changed from its parent.
|
|
310 |
"""
|
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
311 |
if ie.kind == 'root_directory': |
312 |
return
|
|
1319
by Martin Pool
- calculate and use file parents for importing texts |
313 |
file_id = ie.file_id |
314 |
rev_id = rev.revision_id |
|
315 |
w = self.text_weaves.get(file_id) |
|
316 |
if w is None: |
|
317 |
w = Weave(file_id) |
|
318 |
self.text_weaves[file_id] = w |
|
319 |
text_changed = False |
|
1411
by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges. |
320 |
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 |
321 |
for old_revision in previous_entries: |
1092.2.22
by Robert Collins
text_version and name_version unification looking reasonable |
322 |
# if this fails, its a ghost ?
|
323 |
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 |
324 |
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 |
325 |
del ie.text_id |
326 |
assert getattr(ie, 'revision', None) is not None |
|
327 |
||
328 |
def snapshot_ie(self, previous_revisions, ie, w, rev_id): |
|
329 |
# TODO: convert this logic, which is ~= snapshot to
|
|
330 |
# 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 |
331 |
# a v4 revision_tree can be given, or something that looks enough like
|
332 |
# 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 |
333 |
# and we need something that looks like a weave store for snapshot to
|
334 |
# save against.
|
|
335 |
#ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
|
|
336 |
if len(previous_revisions) == 1: |
|
337 |
previous_ie = previous_revisions.values()[0] |
|
338 |
if ie._unchanged(previous_ie): |
|
339 |
ie.revision = previous_ie.revision |
|
340 |
return
|
|
341 |
parent_indexes = map(w.lookup, previous_revisions) |
|
342 |
if ie.has_text(): |
|
1378
by Martin Pool
- in upgrade, avoiding loading file texts unless necessary |
343 |
file_lines = self.branch.text_store[ie.text_id].readlines() |
344 |
assert sha_strings(file_lines) == ie.text_sha1 |
|
345 |
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 |
346 |
w.add(rev_id, parent_indexes, file_lines, ie.text_sha1) |
1332
by Martin Pool
- clean up code that writes out weave results |
347 |
self.text_count += 1 |
1319
by Martin Pool
- calculate and use file parents for importing texts |
348 |
else: |
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
349 |
w.add(rev_id, parent_indexes, [], None) |
350 |
ie.revision = rev_id |
|
351 |
##mutter('import text {%s} of {%s}',
|
|
352 |
## ie.text_id, file_id)
|
|
1310
by Martin Pool
- compute order to import revisions |
353 |
|
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
354 |
def _make_order(self): |
1310
by Martin Pool
- compute order to import revisions |
355 |
"""Return a suitable order for importing revisions.
|
356 |
||
357 |
The order must be such that an revision is imported after all
|
|
358 |
its (present) parents.
|
|
359 |
"""
|
|
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
360 |
todo = set(self.revisions.keys()) |
361 |
done = self.absent_revisions.copy() |
|
1310
by Martin Pool
- compute order to import revisions |
362 |
o = [] |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
363 |
while todo: |
364 |
# scan through looking for a revision whose parents
|
|
365 |
# are all done
|
|
1310
by Martin Pool
- compute order to import revisions |
366 |
for rev_id in sorted(list(todo)): |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
367 |
rev = self.revisions[rev_id] |
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
368 |
parent_ids = set(rev.parent_ids) |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
369 |
if parent_ids.issubset(done): |
370 |
# can take this one now
|
|
1310
by Martin Pool
- compute order to import revisions |
371 |
o.append(rev_id) |
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
372 |
todo.remove(rev_id) |
373 |
done.add(rev_id) |
|
1315
by Martin Pool
- import file inventories in correct order |
374 |
return o |
1377
by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command |
375 |
|
1309
by Martin Pool
- first cut at tsort to make order to bring in revisions |
376 |
|
1332
by Martin Pool
- clean up code that writes out weave results |
377 |
def write_a_weave(weave, filename): |
378 |
inv_wf = file(filename, 'wb') |
|
1080
by Martin Pool
- test tool for converting history to weave files |
379 |
try: |
1087
by Martin Pool
- add a tool script to convert past history into weaves |
380 |
write_weave(weave, inv_wf) |
1080
by Martin Pool
- test tool for converting history to weave files |
381 |
finally: |
382 |
inv_wf.close() |
|
383 |
||
1377
by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command |
384 |
|
385 |
def upgrade(base_dir): |
|
386 |
Convert(base_dir) |