217
201
return self._parents == other._parents \
218
202
and self._weave == other._weave \
219
203
and self._sha1s == other._sha1s
221
206
def __ne__(self, other):
222
207
return not self.__eq__(other)
224
@deprecated_method(zero_eight)
225
def idx_to_name(self, index):
226
"""Old public interface, the public interface is all names now."""
229
def _idx_to_name(self, version):
230
return self._names[version]
232
@deprecated_method(zero_eight)
209
def __contains__(self, name):
210
return self._name_map.has_key(name)
212
def maybe_lookup(self, name_or_index):
213
"""Convert possible symbolic name to index, or pass through indexes."""
214
if isinstance(name_or_index, (int, long)):
217
return self.lookup(name_or_index)
233
220
def lookup(self, name):
234
"""Backwards compatibility thunk:
236
Return name, as name is valid in the api now, and spew deprecation
241
def _lookup(self, name):
242
221
"""Convert symbolic version name to index."""
244
223
return self._name_map[name]
246
raise RevisionNotPresent(name, self._weave_name)
248
@deprecated_method(zero_eight)
249
def iter_names(self):
250
"""Deprecated convenience function, please see VersionedFile.names()."""
251
return iter(self.names())
253
@deprecated_method(zero_eight)
225
raise WeaveRevisionNotPresent(name, self)
255
"""See Weave.versions for the current api."""
256
return self.versions()
259
"""See VersionedFile.versions."""
260
228
return self._names[:]
262
def has_version(self, version_id):
263
"""See VersionedFile.has_version."""
264
return self._name_map.has_key(version_id)
266
__contains__ = has_version
268
def get_delta(self, version_id):
269
"""See VersionedFile.get_delta."""
270
return self.get_deltas([version_id])[version_id]
272
def get_deltas(self, version_ids):
273
"""See VersionedFile.get_deltas."""
274
version_ids = self.get_ancestry(version_ids)
275
for version_id in version_ids:
276
if not self.has_version(version_id):
277
raise RevisionNotPresent(version_id, self)
278
# try extracting all versions; parallel extraction is used
279
nv = self.num_versions()
285
last_parent_lines = {}
287
parent_inclusions = {}
292
# its simplest to generate a full set of prepared variables.
294
name = self._names[i]
295
sha1s[name] = self.get_sha1(name)
296
parents_list = self.get_parents(name)
298
parent = parents_list[0]
299
parents[name] = parent
300
parent_inclusions[name] = inclusions[parent]
303
parent_inclusions[name] = set()
304
# we want to emit start, finish, replacement_length, replacement_lines tuples.
305
diff_hunks[name] = []
306
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
307
parent_linenums[name] = 0
309
parent_noeols[name] = False
310
last_parent_lines[name] = None
311
new_inc = set([name])
312
for p in self._parents[i]:
313
new_inc.update(inclusions[self._idx_to_name(p)])
314
# debug only, known good so far.
315
#assert set(new_inc) == set(self.get_ancestry(name)), \
316
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
317
inclusions[name] = new_inc
319
nlines = len(self._weave)
321
for lineno, inserted, deletes, line in self._walk_internal():
322
# a line is active in a version if:
323
# insert is in the versions inclusions
325
# deleteset & the versions inclusions is an empty set.
326
# so - if we have a included by mapping - version is included by
327
# children, we get a list of children to examine for deletes affect
328
# ing them, which is less than the entire set of children.
329
for version_id in version_ids:
330
# The active inclusion must be an ancestor,
331
# and no ancestors must have deleted this line,
332
# because we don't support resurrection.
333
parent_inclusion = parent_inclusions[version_id]
334
inclusion = inclusions[version_id]
335
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
336
version_active = inserted in inclusion and not (deletes & inclusion)
337
if not parent_active and not version_active:
338
# unrelated line of ancestry
340
elif parent_active and version_active:
342
parent_linenum = parent_linenums[version_id]
343
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
344
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
346
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
347
parent_linenums[version_id] = parent_linenum
350
noeols[version_id] = True
353
elif parent_active and not version_active:
355
current_hunks[version_id][1] += 1
356
parent_linenums[version_id] += 1
357
last_parent_lines[version_id] = line
358
elif not parent_active and version_active:
360
# noeol only occurs at the end of a file because we
361
# diff linewise. We want to show noeol changes as a
362
# empty diff unless the actual eol-less content changed.
365
if last_parent_lines[version_id][-1] != '\n':
366
parent_noeols[version_id] = True
367
except (TypeError, IndexError):
370
if theline[-1] != '\n':
371
noeols[version_id] = True
375
parent_should_go = False
377
if parent_noeols[version_id] == noeols[version_id]:
378
# no noeol toggle, so trust the weaves statement
379
# that this line is changed.
381
if parent_noeols[version_id]:
382
theline = theline + '\n'
383
elif parent_noeols[version_id]:
384
# parent has no eol, we do:
385
# our line is new, report as such..
387
elif noeols[version_id]:
388
# append a eol so that it looks like
390
theline = theline + '\n'
391
if parents[version_id] is not None:
392
#if last_parent_lines[version_id] is not None:
393
parent_should_go = True
394
if last_parent_lines[version_id] != theline:
397
#parent_should_go = False
399
current_hunks[version_id][2] += 1
400
current_hunks[version_id][3].append((inserted, theline))
402
# last hunk last parent line is not eaten
403
current_hunks[version_id][1] -= 1
404
if current_hunks[version_id][1] < 0:
405
current_hunks[version_id][1] = 0
406
# import pdb;pdb.set_trace()
407
# assert current_hunks[version_id][1] >= 0
411
version = self._idx_to_name(i)
412
if current_hunks[version] != [0, 0, 0, []]:
413
diff_hunks[version].append(tuple(current_hunks[version]))
415
for version_id in version_ids:
416
result[version_id] = (
420
diff_hunks[version_id],
424
def get_parents(self, version_id):
425
"""See VersionedFile.get_parent."""
426
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
230
def iter_names(self):
231
"""Yield a list of all names in this weave."""
232
return iter(self._names)
234
def idx_to_name(self, version):
235
return self._names[version]
428
237
def _check_repeated_add(self, name, parents, text, sha1):
429
238
"""Check that a duplicated add is OK.
431
240
If it is, return the (old) index; otherwise raise an exception.
433
idx = self._lookup(name)
242
idx = self.lookup(name)
434
243
if sorted(self._parents[idx]) != sorted(parents) \
435
244
or sha1 != self._sha1s[idx]:
436
raise RevisionAlreadyPresent(name, self._weave_name)
245
raise WeaveRevisionAlreadyPresent(name, self)
439
@deprecated_method(zero_eight)
440
def add_identical(self, old_rev_id, new_rev_id, parents):
441
"""Please use Weave.clone_text now."""
442
return self.clone_text(new_rev_id, old_rev_id, parents)
444
def _add_lines(self, version_id, parents, lines, parent_texts):
445
"""See VersionedFile.add_lines."""
446
return self._add(version_id, lines, map(self._lookup, parents))
448
@deprecated_method(zero_eight)
449
248
def add(self, name, parents, text, sha1=None):
450
"""See VersionedFile.add_lines for the non deprecated api."""
451
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
453
def _add(self, version_id, lines, parents, sha1=None):
454
249
"""Add a single text on top of the weave.
456
251
Returns the index number of the newly added version.
459
254
Symbolic name for this version.
460
255
(Typically the revision-id of the revision that added it.)
463
258
List or set of direct parent version numbers.
466
261
Sequence of lines to be added in the new version.
263
sha -- SHA-1 of the file, if known. This is trusted to be
469
assert isinstance(version_id, basestring)
470
self._check_lines_not_unicode(lines)
471
self._check_lines_are_lines(lines)
473
sha1 = sha_strings(lines)
474
if version_id in self._name_map:
475
return self._check_repeated_add(version_id, parents, lines, sha1)
266
from bzrlib.osutils import sha_strings
268
assert isinstance(name, basestring)
270
sha1 = sha_strings(text)
271
if name in self._name_map:
272
return self._check_repeated_add(name, parents, text, sha1)
274
parents = map(self.maybe_lookup, parents)
477
275
self._check_versions(parents)
478
## self._check_lines(lines)
276
## self._check_lines(text)
479
277
new_version = len(self._parents)
481
280
# if we abort after here the (in-memory) weave will be corrupt because only
482
281
# some fields are updated
483
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
484
# - Robert Collins 20060226
485
282
self._parents.append(parents[:])
486
283
self._sha1s.append(sha1)
487
self._names.append(version_id)
488
self._name_map[version_id] = new_version
284
self._names.append(name)
285
self._name_map[name] = new_version
625
438
except IndexError:
626
439
raise IndexError("invalid version number %r" % i)
628
def _compatible_parents(self, my_parents, other_parents):
629
"""During join check that other_parents are joinable with my_parents.
631
Joinable is defined as 'is a subset of' - supersets may require
632
regeneration of diffs, but subsets do not.
634
return len(other_parents.difference(my_parents)) == 0
636
def annotate(self, version_id):
637
if isinstance(version_id, int):
638
warn('Weave.annotate(int) is deprecated. Please use version names'
639
' in all circumstances as of 0.8',
644
for origin, lineno, text in self._extract([version_id]):
645
result.append((origin, text))
648
return super(Weave, self).annotate(version_id)
650
def annotate_iter(self, version_id):
651
"""Yield list of (version-id, line) pairs for the specified version.
442
def annotate(self, name_or_index):
443
return list(self.annotate_iter(name_or_index))
446
def annotate_iter(self, name_or_index):
447
"""Yield list of (index-id, line) pairs for the specified version.
653
449
The index indicates when the line originated in the weave."""
654
incls = [self._lookup(version_id)]
450
incls = [self.maybe_lookup(name_or_index)]
655
451
for origin, lineno, text in self._extract(incls):
656
yield self._idx_to_name(origin), text
658
@deprecated_method(zero_eight)
660
"""_walk has become visit, a supported api."""
661
return self._walk_internal()
663
def iter_lines_added_or_present_in_versions(self, version_ids=None):
664
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
665
if version_ids is None:
666
version_ids = self.versions()
667
version_ids = set(version_ids)
668
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
669
# if inserted not in version_ids then it was inserted before the
670
# versions we care about, but because weaves cannot represent ghosts
671
# properly, we do not filter down to that
672
# if inserted not in version_ids: continue
678
#@deprecated_method(zero_eight)
679
def walk(self, version_ids=None):
680
"""See VersionedFile.walk."""
681
return self._walk_internal(version_ids)
683
def _walk_internal(self, version_ids=None):
684
"""Helper method for weave actions."""
458
(lineno, insert, deletes, text)
459
for each literal line.
854
@deprecated_method(zero_eight)
855
555
def get_iter(self, name_or_index):
856
"""Deprecated, please do not use. Lookups are not not needed.
858
Please use get_lines now.
860
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
862
@deprecated_method(zero_eight)
863
def maybe_lookup(self, name_or_index):
864
"""Deprecated, please do not use. Lookups are not not needed."""
865
return self._maybe_lookup(name_or_index)
867
def _maybe_lookup(self, name_or_index):
868
"""Convert possible symbolic name to index, or pass through indexes.
872
if isinstance(name_or_index, (int, long)):
556
"""Yield lines for the specified version."""
557
incls = [self.maybe_lookup(name_or_index)]
875
return self._lookup(name_or_index)
877
@deprecated_method(zero_eight)
878
def get(self, version_id):
879
"""Please use either Weave.get_text or Weave.get_lines as desired."""
880
return self.get_lines(version_id)
882
def get_lines(self, version_id):
883
"""See VersionedFile.get_lines()."""
884
int_index = self._maybe_lookup(version_id)
885
result = [line for (origin, lineno, line) in self._extract([int_index])]
886
expected_sha1 = self._sha1s[int_index]
887
measured_sha1 = sha_strings(result)
888
if measured_sha1 != expected_sha1:
889
raise errors.WeaveInvalidChecksum(
890
'file %s, revision %s, expected: %s, measured %s'
891
% (self._weave_name, version_id,
892
expected_sha1, measured_sha1))
895
def get_sha1(self, version_id):
896
"""See VersionedFile.get_sha1()."""
897
return self._sha1s[self._lookup(version_id)]
899
@deprecated_method(zero_eight)
562
# We don't have sha1 sums for multiple entries
564
for origin, lineno, line in self._extract(incls):
569
expected_sha1 = self._sha1s[index]
570
measured_sha1 = cur_sha.hexdigest()
571
if measured_sha1 != expected_sha1:
572
raise errors.WeaveInvalidChecksum(
573
'file %s, revision %s, expected: %s, measured %s'
574
% (self._weave_name, self._names[index],
575
expected_sha1, measured_sha1))
578
def get_text(self, name_or_index):
579
return ''.join(self.get_iter(name_or_index))
580
assert isinstance(version, int)
583
def get_lines(self, name_or_index):
584
return list(self.get_iter(name_or_index))
590
def get_sha1(self, name):
591
"""Get the stored sha1 sum for the given revision.
593
:param name: The name of the version to lookup
595
return self._sha1s[self.lookup(name)]
597
def mash_iter(self, included):
598
"""Return composed version of multiple included versions."""
599
included = map(self.maybe_lookup, included)
600
for origin, lineno, text in self._extract(included):
604
def dump(self, to_file):
605
from pprint import pprint
606
print >>to_file, "Weave._weave = ",
607
pprint(self._weave, to_file)
608
print >>to_file, "Weave._parents = ",
609
pprint(self._parents, to_file)
900
613
def numversions(self):
901
"""How many versions are in this weave?
903
Deprecated in favour of num_versions.
905
return self.num_versions()
907
def num_versions(self):
908
"""How many versions are in this weave?"""
909
614
l = len(self._parents)
910
615
assert l == len(self._sha1s)
913
__len__ = num_versions
620
return self.numversions()
915
622
def check(self, progress_bar=None):
916
# TODO evaluate performance hit of using string sets in this routine.
917
# TODO: check no circular inclusions
918
# TODO: create a nested progress bar
919
for version in range(self.num_versions()):
623
# check no circular inclusions
624
for version in range(self.numversions()):
920
625
inclusions = list(self._parents[version])
922
627
inclusions.sort()
951
652
update_text = 'checking %s' % (short_name,)
952
653
update_text = update_text[:25]
954
for lineno, insert, deleteset, line in self._walk_internal():
655
for lineno, insert, deleteset, line in self._walk():
956
657
progress_bar.update(update_text, lineno, nlines)
958
for name, name_inclusions in inclusions.items():
659
for j, j_inc in enumerate(inclusions):
959
660
# The active inclusion must be an ancestor,
960
661
# and no ancestors must have deleted this line,
961
662
# because we don't support resurrection.
962
if (insert in name_inclusions) and not (deleteset & name_inclusions):
963
sha1s[name].update(line)
663
if (insert in j_inc) and not (deleteset & j_inc):
664
sha1s[j].update(line)
966
version = self._idx_to_name(i)
666
for version in range(nv):
967
667
hd = sha1s[version].hexdigest()
968
expected = self._sha1s[i]
668
expected = self._sha1s[version]
969
669
if hd != expected:
970
670
raise errors.WeaveInvalidChecksum(
971
671
"mismatched sha1 for version %s: "
972
672
"got %s, expected %s"
973
% (version, hd, expected))
673
% (self._names[version], hd, expected))
975
675
# TODO: check insertions are properly nested, that there are
976
676
# no lines outside of insertion blocks, that deletions are
977
677
# properly paired, etc.
979
def _join(self, other, pb, msg, version_ids, ignore_missing):
980
"""Worker routine for join()."""
981
if not other.versions():
679
def _delta(self, included, lines):
680
"""Return changes from basis to new revision.
682
The old text for comparison is the union of included revisions.
684
This is used in inserting a new text.
686
Delta is returned as a sequence of
687
(weave1, weave2, newlines).
689
This indicates that weave1:weave2 of the old weave should be
690
replaced by the sequence of lines in newlines. Note that
691
these line numbers are positions in the total weave and don't
692
correspond to the lines in any extracted version, or even the
693
extracted union of included versions.
695
If line1=line2, this is a pure insert; if newlines=[] this is a
696
pure delete. (Similar to difflib.)
698
raise NotImplementedError()
701
def plan_merge(self, ver_a, ver_b):
702
"""Return pseudo-annotation indicating how the two versions merge.
704
This is computed between versions a and b and their common
707
Weave lines present in none of them are skipped entirely.
709
inc_a = self.inclusions([ver_a])
710
inc_b = self.inclusions([ver_b])
711
inc_c = inc_a & inc_b
713
for lineno, insert, deleteset, line in self._walk():
714
if deleteset & inc_c:
715
# killed in parent; can't be in either a or b
716
# not relevant to our work
717
yield 'killed-base', line
718
elif insert in inc_c:
719
# was inserted in base
720
killed_a = bool(deleteset & inc_a)
721
killed_b = bool(deleteset & inc_b)
722
if killed_a and killed_b:
723
yield 'killed-both', line
725
yield 'killed-a', line
727
yield 'killed-b', line
729
yield 'unchanged', line
730
elif insert in inc_a:
731
if deleteset & inc_a:
732
yield 'ghost-a', line
736
elif insert in inc_b:
737
if deleteset & inc_b:
738
yield 'ghost-b', line
742
# not in either revision
743
yield 'irrelevant', line
745
yield 'unchanged', '' # terminator
749
def weave_merge(self, plan):
753
# TODO: Return a structured form of the conflicts (e.g. 2-tuples for
754
# conflicted regions), rather than just inserting the markers.
756
# TODO: Show some version information (e.g. author, date) on
757
# conflicted regions.
758
for state, line in plan:
759
if state == 'unchanged' or state == 'killed-both':
760
# resync and flush queued conflicts changes if any
761
if not lines_a and not lines_b:
763
elif ch_a and not ch_b:
765
for l in lines_a: yield l
766
elif ch_b and not ch_a:
767
for l in lines_b: yield l
768
elif lines_a == lines_b:
769
for l in lines_a: yield l
772
for l in lines_a: yield l
774
for l in lines_b: yield l
781
if state == 'unchanged':
784
elif state == 'killed-a':
787
elif state == 'killed-b':
790
elif state == 'new-a':
793
elif state == 'new-b':
797
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
802
def join(self, other):
804
"""Integrate versions from other into this weave.
806
The resulting weave contains all the history of both weaves;
807
any version you could retrieve from either self or other can be
808
retrieved from self after this call.
810
It is illegal for the two weaves to contain different values
811
or different parents for any version. See also reweave().
813
if other.numversions() == 0:
982
814
return # nothing to update, easy
985
# versions is never none, InterWeave checks this.
988
815
# two loops so that we do not change ourselves before verifying it
990
817
# work through in index order to make sure we get all dependencies
818
for other_idx, name in enumerate(other._names):
819
self._check_version_consistent(other, other_idx, name)
993
# get the selected versions only that are in other.versions.
994
version_ids = set(other.versions()).intersection(set(version_ids))
995
# pull in the referenced graph.
996
version_ids = other.get_ancestry(version_ids)
997
pending_graph = [(version, other.get_parents(version)) for
998
version in version_ids]
999
for name in topo_sort(pending_graph):
1000
other_idx = other._name_map[name]
1001
# returns True if we have it, False if we need it.
1002
if not self._check_version_consistent(other, other_idx, name):
1003
names_to_join.append((other_idx, name))
1012
for other_idx, name in names_to_join:
824
for other_idx, name in enumerate(other._names):
1013
825
# TODO: If all the parents of the other version are already
1014
826
# present then we can avoid some work by just taking the delta
1015
827
# and adjusting the offsets.
1016
828
new_parents = self._imported_parents(other, other_idx)
1017
829
sha1 = other._sha1s[other_idx]
833
if name in self._names:
834
idx = self.lookup(name)
835
n1 = map(other.idx_to_name, other._parents[other_idx] )
836
n2 = map(self.idx_to_name, self._parents[other_idx] )
837
if sha1 == self._sha1s[idx] and n1 == n2:
1022
pb.update(msg, merged, len(names_to_join))
1024
841
lines = other.get_lines(other_idx)
1025
self._add(name, lines, new_parents, sha1)
842
self.add(name, new_parents, lines, sha1)
1027
844
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1028
merged, processed, self._weave_name, time.time()-time0))
845
merged,processed,self._weave_name, time.time( )-time0))
1030
850
def _imported_parents(self, other, other_idx):
1031
851
"""Return list of parents in self corresponding to indexes in other."""
1032
852
new_parents = []
1033
853
for parent_idx in other._parents[other_idx]:
1034
854
parent_name = other._names[parent_idx]
1035
if parent_name not in self._name_map:
855
if parent_name not in self._names:
1036
856
# should not be possible
1037
857
raise WeaveError("missing parent {%s} of {%s} in %r"
1038
858
% (parent_name, other._name_map[other_idx], self))
1070
@deprecated_method(zero_eight)
1071
def reweave(self, other, pb=None, msg=None):
1072
"""reweave has been superseded by plain use of join."""
1073
return self.join(other, pb, msg)
1075
def _reweave(self, other, pb, msg):
1076
"""Reweave self with other - internal helper for join().
1078
:param other: The other weave to merge
1079
:param pb: An optional progress bar, indicating how far done we are
1080
:param msg: An optional message for the progress
1082
new_weave = _reweave(self, other, pb=pb, msg=msg)
1083
self._copy_weave_content(new_weave)
1085
def _copy_weave_content(self, otherweave):
1086
"""adsorb the content from otherweave."""
894
def reweave(self, other):
895
"""Reweave self with other."""
896
new_weave = reweave(self, other)
1087
897
for attr in self.__slots__:
1088
if attr != '_weave_name':
1089
setattr(self, attr, copy(getattr(otherweave, attr)))
1092
class WeaveFile(Weave):
1093
"""A WeaveFile represents a Weave on disk and writes on change."""
1095
WEAVE_SUFFIX = '.weave'
1097
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1098
"""Create a WeaveFile.
1100
:param create: If not True, only open an existing knit.
1102
super(WeaveFile, self).__init__(name, access_mode)
1103
self._transport = transport
1104
self._filemode = filemode
1106
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1107
except errors.NoSuchFile:
1113
def _add_lines(self, version_id, parents, lines, parent_texts):
1114
"""Add a version and save the weave."""
1115
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1120
def _clone_text(self, new_version_id, old_version_id, parents):
1121
"""See VersionedFile.clone_text."""
1122
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1125
def copy_to(self, name, transport):
1126
"""See VersionedFile.copy_to()."""
1127
# as we are all in memory always, just serialise to the new place.
1129
write_weave_v5(self, sio)
1131
transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1133
def create_empty(self, name, transport, filemode=None):
1134
return WeaveFile(name, transport, filemode, create=True)
1137
"""Save the weave."""
1138
self._check_write_ok()
1140
write_weave_v5(self, sio)
1142
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1148
"""See VersionedFile.get_suffixes()."""
1149
return [WeaveFile.WEAVE_SUFFIX]
1151
def join(self, other, pb=None, msg=None, version_ids=None,
1152
ignore_missing=False):
1153
"""Join other into self and save."""
1154
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1158
@deprecated_function(zero_eight)
1159
def reweave(wa, wb, pb=None, msg=None):
1160
"""reweaving is deprecation, please just use weave.join()."""
1161
_reweave(wa, wb, pb, msg)
1163
def _reweave(wa, wb, pb=None, msg=None):
898
setattr(self, attr, getattr(new_weave, attr))
1164
902
"""Combine two weaves and return the result.
1166
904
This works even if a revision R has different parents in
1171
909
might be possible but it should only be necessary to do
1172
910
this operation rarely, when a new previously ghost version is
1175
:param pb: An optional progress bar, indicating how far done we are
1176
:param msg: An optional message for the progress
1180
queue_a = range(wa.num_versions())
1181
queue_b = range(wb.num_versions())
915
queue_a = range(wa.numversions())
916
queue_b = range(wb.numversions())
1182
917
# first determine combined parents of all versions
1183
918
# map from version name -> all parent names
1184
919
combined_parents = _reweave_parent_graphs(wa, wb)
1185
920
mutter("combined parents: %r", combined_parents)
1186
921
order = topo_sort(combined_parents.iteritems())
1187
922
mutter("order to reweave: %r", order)
1192
for idx, name in enumerate(order):
1194
pb.update(msg, idx, len(order))
1195
924
if name in wa._name_map:
1196
925
lines = wa.get_lines(name)
1197
926
if name in wb._name_map:
1198
lines_b = wb.get_lines(name)
1199
if lines != lines_b:
1200
mutter('Weaves differ on content. rev_id {%s}', name)
1201
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1203
lines = list(difflib.unified_diff(lines, lines_b,
1204
wa._weave_name, wb._weave_name))
1205
mutter('lines:\n%s', ''.join(lines))
1206
raise errors.WeaveTextDiffers(name, wa, wb)
927
assert lines == wb.get_lines(name)
1208
929
lines = wb.get_lines(name)
1209
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
930
wr.add(name, combined_parents[name], lines)
1212
934
def _reweave_parent_graphs(wa, wb):
1213
935
"""Return combined parent ancestry for two weaves.
added
removed
bzrlib/weave.py
