199
213
return self._parents == other._parents \
200
214
and self._weave == other._weave \
201
215
and self._sha1s == other._sha1s
204
217
def __ne__(self, other):
205
218
return not self.__eq__(other)
207
def __contains__(self, name):
208
return self._name_map.has_key(name)
210
def maybe_lookup(self, name_or_index):
211
"""Convert possible symbolic name to index, or pass through indexes."""
212
if isinstance(name_or_index, (int, long)):
215
return self.lookup(name_or_index)
220
@deprecated_method(zero_eight)
221
def idx_to_name(self, index):
222
"""Old public interface, the public interface is all names now."""
225
def _idx_to_name(self, version):
226
return self._names[version]
228
@deprecated_method(zero_eight)
218
229
def lookup(self, name):
230
"""Backwards compatability thunk:
232
Return name, as name is valid in the api now, and spew deprecation
237
def _lookup(self, name):
219
238
"""Convert symbolic version name to index."""
221
240
return self._name_map[name]
223
raise WeaveRevisionNotPresent(name, self)
242
raise RevisionNotPresent(name, self._weave_name)
244
@deprecated_method(zero_eight)
245
def iter_names(self):
246
"""Deprecated convenience function, please see VersionedFile.names()."""
247
return iter(self.names())
249
@deprecated_method(zero_eight)
251
"""See Weave.versions for the current api."""
252
return self.versions()
255
"""See VersionedFile.versions."""
226
256
return self._names[:]
228
def iter_names(self):
229
"""Yield a list of all names in this weave."""
230
return iter(self._names)
232
def idx_to_name(self, version):
233
return self._names[version]
258
def has_version(self, version_id):
259
"""See VersionedFile.has_version."""
260
return self._name_map.has_key(version_id)
262
__contains__ = has_version
264
def get_delta(self, version_id):
265
"""See VersionedFile.get_delta."""
266
return self.get_deltas([version_id])[version_id]
268
def get_deltas(self, version_ids):
269
"""See VersionedFile.get_deltas."""
270
version_ids = self.get_ancestry(version_ids)
271
for version_id in version_ids:
272
if not self.has_version(version_id):
273
raise RevisionNotPresent(version_id, self)
274
# try extracting all versions; parallel extraction is used
275
nv = self.num_versions()
281
last_parent_lines = {}
283
parent_inclusions = {}
288
# its simplest to generate a full set of prepared variables.
290
name = self._names[i]
291
sha1s[name] = self.get_sha1(name)
292
parents_list = self.get_parents(name)
294
parent = parents_list[0]
295
parents[name] = parent
296
parent_inclusions[name] = inclusions[parent]
299
parent_inclusions[name] = set()
300
# we want to emit start, finish, replacement_length, replacement_lines tuples.
301
diff_hunks[name] = []
302
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
303
parent_linenums[name] = 0
305
parent_noeols[name] = False
306
last_parent_lines[name] = None
307
new_inc = set([name])
308
for p in self._parents[i]:
309
new_inc.update(inclusions[self._idx_to_name(p)])
310
# debug only, known good so far.
311
#assert set(new_inc) == set(self.get_ancestry(name)), \
312
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
313
inclusions[name] = new_inc
315
nlines = len(self._weave)
317
for lineno, inserted, deletes, line in self._walk_internal():
318
# a line is active in a version if:
319
# insert is in the versions inclusions
321
# deleteset & the versions inclusions is an empty set.
322
# so - if we have a included by mapping - version is included by
323
# children, we get a list of children to examine for deletes affect
324
# ing them, which is less than the entire set of children.
325
for version_id in version_ids:
326
# The active inclusion must be an ancestor,
327
# and no ancestors must have deleted this line,
328
# because we don't support resurrection.
329
parent_inclusion = parent_inclusions[version_id]
330
inclusion = inclusions[version_id]
331
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
332
version_active = inserted in inclusion and not (deletes & inclusion)
333
if not parent_active and not version_active:
334
# unrelated line of ancestry
336
elif parent_active and version_active:
338
parent_linenum = parent_linenums[version_id]
339
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
340
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
342
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
343
parent_linenums[version_id] = parent_linenum
346
noeols[version_id] = True
349
elif parent_active and not version_active:
351
current_hunks[version_id][1] += 1
352
parent_linenums[version_id] += 1
353
last_parent_lines[version_id] = line
354
elif not parent_active and version_active:
356
# noeol only occurs at the end of a file because we
357
# diff linewise. We want to show noeol changes as a
358
# empty diff unless the actual eol-less content changed.
361
if last_parent_lines[version_id][-1] != '\n':
362
parent_noeols[version_id] = True
363
except (TypeError, IndexError):
366
if theline[-1] != '\n':
367
noeols[version_id] = True
371
parent_should_go = False
373
if parent_noeols[version_id] == noeols[version_id]:
374
# no noeol toggle, so trust the weaves statement
375
# that this line is changed.
377
if parent_noeols[version_id]:
378
theline = theline + '\n'
379
elif parent_noeols[version_id]:
380
# parent has no eol, we do:
381
# our line is new, report as such..
383
elif noeols[version_id]:
384
# append a eol so that it looks like
386
theline = theline + '\n'
387
if parents[version_id] is not None:
388
#if last_parent_lines[version_id] is not None:
389
parent_should_go = True
390
if last_parent_lines[version_id] != theline:
393
#parent_should_go = False
395
current_hunks[version_id][2] += 1
396
current_hunks[version_id][3].append((inserted, theline))
398
# last hunk last parent line is not eaten
399
current_hunks[version_id][1] -= 1
400
if current_hunks[version_id][1] < 0:
401
current_hunks[version_id][1] = 0
402
# import pdb;pdb.set_trace()
403
# assert current_hunks[version_id][1] >= 0
407
version = self._idx_to_name(i)
408
if current_hunks[version] != [0, 0, 0, []]:
409
diff_hunks[version].append(tuple(current_hunks[version]))
411
for version_id in version_ids:
412
result[version_id] = (
416
diff_hunks[version_id],
420
def get_parents(self, version_id):
421
"""See VersionedFile.get_parent."""
422
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
235
424
def _check_repeated_add(self, name, parents, text, sha1):
236
425
"""Check that a duplicated add is OK.
238
427
If it is, return the (old) index; otherwise raise an exception.
240
idx = self.lookup(name)
429
idx = self._lookup(name)
241
430
if sorted(self._parents[idx]) != sorted(parents) \
242
431
or sha1 != self._sha1s[idx]:
243
raise WeaveRevisionAlreadyPresent(name, self)
432
raise RevisionAlreadyPresent(name, self._weave_name)
435
@deprecated_method(zero_eight)
436
def add_identical(self, old_rev_id, new_rev_id, parents):
437
"""Please use Weave.clone_text now."""
438
return self.clone_text(new_rev_id, old_rev_id, parents)
440
def _add_lines(self, version_id, parents, lines, parent_texts):
441
"""See VersionedFile.add_lines."""
442
return self._add(version_id, lines, map(self._lookup, parents))
444
@deprecated_method(zero_eight)
246
445
def add(self, name, parents, text, sha1=None):
446
"""See VersionedFile.add_lines for the non deprecated api."""
447
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
449
def _add(self, version_id, lines, parents, sha1=None):
247
450
"""Add a single text on top of the weave.
249
452
Returns the index number of the newly added version.
252
455
Symbolic name for this version.
253
456
(Typically the revision-id of the revision that added it.)
256
459
List or set of direct parent version numbers.
259
462
Sequence of lines to be added in the new version.
261
sha -- SHA-1 of the file, if known. This is trusted to be
264
from bzrlib.osutils import sha_strings
266
assert isinstance(name, basestring)
268
sha1 = sha_strings(text)
269
if name in self._name_map:
270
return self._check_repeated_add(name, parents, text, sha1)
272
parents = map(self.maybe_lookup, parents)
465
assert isinstance(version_id, basestring)
466
self._check_lines_not_unicode(lines)
467
self._check_lines_are_lines(lines)
469
sha1 = sha_strings(lines)
470
if version_id in self._name_map:
471
return self._check_repeated_add(version_id, parents, lines, sha1)
273
473
self._check_versions(parents)
274
## self._check_lines(text)
474
## self._check_lines(lines)
275
475
new_version = len(self._parents)
278
477
# if we abort after here the (in-memory) weave will be corrupt because only
279
478
# some fields are updated
479
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
480
# - Robert Collins 20060226
280
481
self._parents.append(parents[:])
281
482
self._sha1s.append(sha1)
282
self._names.append(name)
283
self._name_map[name] = new_version
483
self._names.append(version_id)
484
self._name_map[version_id] = new_version
436
621
except IndexError:
437
622
raise IndexError("invalid version number %r" % i)
624
def _compatible_parents(self, my_parents, other_parents):
625
"""During join check that other_parents are joinable with my_parents.
627
Joinable is defined as 'is a subset of' - supersets may require
628
regeneration of diffs, but subsets do not.
630
return len(other_parents.difference(my_parents)) == 0
632
def annotate(self, version_id):
633
if isinstance(version_id, int):
634
warn('Weave.annotate(int) is deprecated. Please use version names'
635
' in all circumstances as of 0.8',
640
for origin, lineno, text in self._extract([version_id]):
641
result.append((origin, text))
644
return super(Weave, self).annotate(version_id)
440
def annotate(self, name_or_index):
441
return list(self.annotate_iter(name_or_index))
444
def annotate_iter(self, name_or_index):
445
"""Yield list of (index-id, line) pairs for the specified version.
646
def annotate_iter(self, version_id):
647
"""Yield list of (version-id, line) pairs for the specified version.
447
649
The index indicates when the line originated in the weave."""
448
incls = [self.maybe_lookup(name_or_index)]
650
incls = [self._lookup(version_id)]
449
651
for origin, lineno, text in self._extract(incls):
652
yield self._idx_to_name(origin), text
654
@deprecated_method(zero_eight)
456
(lineno, insert, deletes, text)
457
for each literal line.
656
"""_walk has become visit, a supported api."""
657
return self._walk_internal()
659
def iter_lines_added_or_present_in_versions(self, version_ids=None):
660
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
661
if version_ids is None:
662
version_ids = self.versions()
663
version_ids = set(version_ids)
664
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
665
# if inserted not in version_ids then it was inserted before the
666
# versions we care about, but because weaves cannot represent ghosts
667
# properly, we do not filter down to that
668
# if inserted not in version_ids: continue
674
#@deprecated_method(zero_eight)
675
def walk(self, version_ids=None):
676
"""See VersionedFile.walk."""
677
return self._walk_internal(version_ids)
679
def _walk_internal(self, version_ids=None):
680
"""Helper method for weave actions."""
850
@deprecated_method(zero_eight)
548
851
def get_iter(self, name_or_index):
549
"""Yield lines for the specified version."""
550
incls = [self.maybe_lookup(name_or_index)]
551
for origin, lineno, line in self._extract(incls):
555
def get_text(self, name_or_index):
556
return ''.join(self.get_iter(name_or_index))
557
assert isinstance(version, int)
560
def get_lines(self, name_or_index):
561
return list(self.get_iter(name_or_index))
567
def mash_iter(self, included):
568
"""Return composed version of multiple included versions."""
569
included = map(self.maybe_lookup, included)
570
for origin, lineno, text in self._extract(included):
574
def dump(self, to_file):
575
from pprint import pprint
576
print >>to_file, "Weave._weave = ",
577
pprint(self._weave, to_file)
578
print >>to_file, "Weave._parents = ",
579
pprint(self._parents, to_file)
852
"""Deprecated, please do not use. Lookups are not not needed.
854
Please use get_lines now.
856
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
858
@deprecated_method(zero_eight)
859
def maybe_lookup(self, name_or_index):
860
"""Deprecated, please do not use. Lookups are not not needed."""
861
return self._maybe_lookup(name_or_index)
863
def _maybe_lookup(self, name_or_index):
864
"""Convert possible symbolic name to index, or pass through indexes.
868
if isinstance(name_or_index, (int, long)):
871
return self._lookup(name_or_index)
873
@deprecated_method(zero_eight)
874
def get(self, version_id):
875
"""Please use either Weave.get_text or Weave.get_lines as desired."""
876
return self.get_lines(version_id)
878
def get_lines(self, version_id):
879
"""See VersionedFile.get_lines()."""
880
int_index = self._maybe_lookup(version_id)
881
result = [line for (origin, lineno, line) in self._extract([int_index])]
882
expected_sha1 = self._sha1s[int_index]
883
measured_sha1 = sha_strings(result)
884
if measured_sha1 != expected_sha1:
885
raise errors.WeaveInvalidChecksum(
886
'file %s, revision %s, expected: %s, measured %s'
887
% (self._weave_name, version_id,
888
expected_sha1, measured_sha1))
891
def get_sha1(self, version_id):
892
"""See VersionedFile.get_sha1()."""
893
return self._sha1s[self._lookup(version_id)]
895
@deprecated_method(zero_eight)
583
896
def numversions(self):
897
"""How many versions are in this weave?
899
Deprecated in favour of num_versions.
901
return self.num_versions()
903
def num_versions(self):
904
"""How many versions are in this weave?"""
584
905
l = len(self._parents)
585
906
assert l == len(self._sha1s)
590
return self.numversions()
909
__len__ = num_versions
593
911
def check(self, progress_bar=None):
594
# check no circular inclusions
595
for version in range(self.numversions()):
912
# TODO evaluate performance hit of using string sets in this routine.
913
# TODO: check no circular inclusions
914
# TODO: create a nested progress bar
915
for version in range(self.num_versions()):
596
916
inclusions = list(self._parents[version])
598
918
inclusions.sort()
600
920
raise WeaveFormatError("invalid included version %d for index %d"
601
921
% (inclusions[-1], version))
603
# try extracting all versions; this is a bit slow and parallel
604
# extraction could be used
605
nv = self.numversions()
606
for version in range(nv):
923
# try extracting all versions; parallel extraction is used
924
nv = self.num_versions()
929
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
930
# The problem is that set membership is much more expensive
931
name = self._idx_to_name(i)
932
sha1s[name] = sha.new()
934
new_inc = set([name])
935
for p in self._parents[i]:
936
new_inc.update(inclusions[self._idx_to_name(p)])
938
assert set(new_inc) == set(self.get_ancestry(name)), \
939
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
940
inclusions[name] = new_inc
942
nlines = len(self._weave)
944
update_text = 'checking weave'
946
short_name = os.path.basename(self._weave_name)
947
update_text = 'checking %s' % (short_name,)
948
update_text = update_text[:25]
950
for lineno, insert, deleteset, line in self._walk_internal():
608
progress_bar.update('checking text', version, nv)
610
for l in self.get_iter(version):
613
expected = self._sha1s[version]
952
progress_bar.update(update_text, lineno, nlines)
954
for name, name_inclusions in inclusions.items():
955
# The active inclusion must be an ancestor,
956
# and no ancestors must have deleted this line,
957
# because we don't support resurrection.
958
if (insert in name_inclusions) and not (deleteset & name_inclusions):
959
sha1s[name].update(line)
962
version = self._idx_to_name(i)
963
hd = sha1s[version].hexdigest()
964
expected = self._sha1s[i]
614
965
if hd != expected:
615
raise WeaveError("mismatched sha1 for version %d; "
616
"got %s, expected %s"
617
% (version, hd, expected))
966
raise errors.WeaveInvalidChecksum(
967
"mismatched sha1 for version %s: "
968
"got %s, expected %s"
969
% (version, hd, expected))
619
971
# TODO: check insertions are properly nested, that there are
620
972
# no lines outside of insertion blocks, that deletions are
621
973
# properly paired, etc.
624
def _delta(self, included, lines):
625
"""Return changes from basis to new revision.
627
The old text for comparison is the union of included revisions.
629
This is used in inserting a new text.
631
Delta is returned as a sequence of
632
(weave1, weave2, newlines).
634
This indicates that weave1:weave2 of the old weave should be
635
replaced by the sequence of lines in newlines. Note that
636
these line numbers are positions in the total weave and don't
637
correspond to the lines in any extracted version, or even the
638
extracted union of included versions.
640
If line1=line2, this is a pure insert; if newlines=[] this is a
641
pure delete. (Similar to difflib.)
643
raise NotImplementedError()
646
def plan_merge(self, ver_a, ver_b):
647
"""Return pseudo-annotation indicating how the two versions merge.
649
This is computed between versions a and b and their common
652
Weave lines present in none of them are skipped entirely.
654
inc_a = self.inclusions([ver_a])
655
inc_b = self.inclusions([ver_b])
656
inc_c = inc_a & inc_b
658
for lineno, insert, deleteset, line in self._walk():
659
if deleteset & inc_c:
660
# killed in parent; can't be in either a or b
661
# not relevant to our work
662
yield 'killed-base', line
663
elif insert in inc_c:
664
# was inserted in base
665
killed_a = bool(deleteset & inc_a)
666
killed_b = bool(deleteset & inc_b)
667
if killed_a and killed_b:
668
yield 'killed-both', line
670
yield 'killed-a', line
672
yield 'killed-b', line
674
yield 'unchanged', line
675
elif insert in inc_a:
676
if deleteset & inc_a:
677
yield 'ghost-a', line
681
elif insert in inc_b:
682
if deleteset & inc_b:
683
yield 'ghost-b', line
687
# not in either revision
688
yield 'irrelevant', line
690
yield 'unchanged', '' # terminator
694
def weave_merge(self, plan):
699
for state, line in plan:
700
if state == 'unchanged' or state == 'killed-both':
701
# resync and flush queued conflicts changes if any
702
if not lines_a and not lines_b:
704
elif ch_a and not ch_b:
706
for l in lines_a: yield l
707
elif ch_b and not ch_a:
708
for l in lines_b: yield l
709
elif lines_a == lines_b:
710
for l in lines_a: yield l
713
for l in lines_a: yield l
715
for l in lines_b: yield l
722
if state == 'unchanged':
725
elif state == 'killed-a':
728
elif state == 'killed-b':
731
elif state == 'new-a':
734
elif state == 'new-b':
738
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
743
def join(self, other):
744
"""Integrate versions from other into this weave.
746
The resulting weave contains all the history of both weaves;
747
any version you could retrieve from either self or other can be
748
retrieved from self after this call.
750
It is illegal for the two weaves to contain different values
751
or different parents for any version. See also reweave().
753
if other.numversions() == 0:
975
def _join(self, other, pb, msg, version_ids, ignore_missing):
976
"""Worker routine for join()."""
977
if not other.versions():
754
978
return # nothing to update, easy
981
# versions is never none, InterWeave checks this.
755
984
# two loops so that we do not change ourselves before verifying it
757
986
# work through in index order to make sure we get all dependencies
758
for other_idx, name in enumerate(other._names):
759
if self._check_version_consistent(other, other_idx, name):
761
for other_idx, name in enumerate(other._names):
762
# TODO: If all the parents of the other version are already
989
# get the selected versions only that are in other.versions.
990
version_ids = set(other.versions()).intersection(set(version_ids))
991
# pull in the referenced graph.
992
version_ids = other.get_ancestry(version_ids)
993
pending_graph = [(version, other.get_parents(version)) for
994
version in version_ids]
995
for name in topo_sort(pending_graph):
996
other_idx = other._name_map[name]
997
# returns True if we have it, False if we need it.
998
if not self._check_version_consistent(other, other_idx, name):
999
names_to_join.append((other_idx, name))
1008
for other_idx, name in names_to_join:
1009
# TODO: If all the parents of the other version are already
763
1010
# present then we can avoid some work by just taking the delta
764
1011
# and adjusting the offsets.
765
1012
new_parents = self._imported_parents(other, other_idx)
1013
sha1 = other._sha1s[other_idx]
1018
pb.update(msg, merged, len(names_to_join))
766
1020
lines = other.get_lines(other_idx)
767
sha1 = other._sha1s[other_idx]
768
self.add(name, new_parents, lines, sha1)
1021
self._add(name, lines, new_parents, sha1)
1023
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1024
merged, processed, self._weave_name, time.time()-time0))
771
1026
def _imported_parents(self, other, other_idx):
772
1027
"""Return list of parents in self corresponding to indexes in other."""
773
1028
new_parents = []
774
1029
for parent_idx in other._parents[other_idx]:
775
1030
parent_name = other._names[parent_idx]
776
if parent_name not in self._names:
1031
if parent_name not in self._name_map:
777
1032
# should not be possible
778
1033
raise WeaveError("missing parent {%s} of {%s} in %r"
779
1034
% (parent_name, other._name_map[other_idx], self))
815
def reweave(self, other):
816
"""Reweave self with other."""
817
new_weave = reweave(self, other)
1066
@deprecated_method(zero_eight)
1067
def reweave(self, other, pb=None, msg=None):
1068
"""reweave has been superceded by plain use of join."""
1069
return self.join(other, pb, msg)
1071
def _reweave(self, other, pb, msg):
1072
"""Reweave self with other - internal helper for join().
1074
:param other: The other weave to merge
1075
:param pb: An optional progress bar, indicating how far done we are
1076
:param msg: An optional message for the progress
1078
new_weave = _reweave(self, other, pb=pb, msg=msg)
1079
self._copy_weave_content(new_weave)
1081
def _copy_weave_content(self, otherweave):
1082
"""adsorb the content from otherweave."""
818
1083
for attr in self.__slots__:
819
setattr(self, attr, getattr(new_weave, attr))
1084
if attr != '_weave_name':
1085
setattr(self, attr, copy(getattr(otherweave, attr)))
1088
class WeaveFile(Weave):
1089
"""A WeaveFile represents a Weave on disk and writes on change."""
1091
WEAVE_SUFFIX = '.weave'
1093
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1094
"""Create a WeaveFile.
1096
:param create: If not True, only open an existing knit.
1098
super(WeaveFile, self).__init__(name, access_mode)
1099
self._transport = transport
1100
self._filemode = filemode
1102
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1103
except errors.NoSuchFile:
1109
def _add_lines(self, version_id, parents, lines, parent_texts):
1110
"""Add a version and save the weave."""
1111
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1116
def _clone_text(self, new_version_id, old_version_id, parents):
1117
"""See VersionedFile.clone_text."""
1118
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1121
def copy_to(self, name, transport):
1122
"""See VersionedFile.copy_to()."""
1123
# as we are all in memory always, just serialise to the new place.
1125
write_weave_v5(self, sio)
1127
transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1129
def create_empty(self, name, transport, filemode=None):
1130
return WeaveFile(name, transport, filemode, create=True)
1133
"""Save the weave."""
1134
self._check_write_ok()
1136
write_weave_v5(self, sio)
1138
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1144
"""See VersionedFile.get_suffixes()."""
1145
return [WeaveFile.WEAVE_SUFFIX]
1147
def join(self, other, pb=None, msg=None, version_ids=None,
1148
ignore_missing=False):
1149
"""Join other into self and save."""
1150
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1154
@deprecated_function(zero_eight)
1155
def reweave(wa, wb, pb=None, msg=None):
1156
"""reweaving is deprecation, please just use weave.join()."""
1157
_reweave(wa, wb, pb, msg)
1159
def _reweave(wa, wb, pb=None, msg=None):
823
1160
"""Combine two weaves and return the result.
825
1162
This works even if a revision R has different parents in
830
1167
might be possible but it should only be necessary to do
831
1168
this operation rarely, when a new previously ghost version is
1171
:param pb: An optional progress bar, indicating how far done we are
1172
:param msg: An optional message for the progress
836
queue_a = range(wa.numversions())
837
queue_b = range(wb.numversions())
1176
queue_a = range(wa.num_versions())
1177
queue_b = range(wb.num_versions())
838
1178
# first determine combined parents of all versions
839
1179
# map from version name -> all parent names
840
1180
combined_parents = _reweave_parent_graphs(wa, wb)
841
1181
mutter("combined parents: %r", combined_parents)
842
1182
order = topo_sort(combined_parents.iteritems())
843
1183
mutter("order to reweave: %r", order)
1188
for idx, name in enumerate(order):
1190
pb.update(msg, idx, len(order))
845
1191
if name in wa._name_map:
846
1192
lines = wa.get_lines(name)
847
1193
if name in wb._name_map:
848
assert lines == wb.get_lines(name)
1194
lines_b = wb.get_lines(name)
1195
if lines != lines_b:
1196
mutter('Weaves differ on content. rev_id {%s}', name)
1197
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1199
lines = list(difflib.unified_diff(lines, lines_b,
1200
wa._weave_name, wb._weave_name))
1201
mutter('lines:\n%s', ''.join(lines))
1202
raise errors.WeaveTextDiffers(name, wa, wb)
850
1204
lines = wb.get_lines(name)
851
wr.add(name, combined_parents[name], lines)
1205
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
855
1208
def _reweave_parent_graphs(wa, wb):
856
1209
"""Return combined parent ancestry for two weaves.
added
removed
bzrlib/weave.py
