160
173
each version; the parent's parents are implied.
163
List of hex SHA-1 of each version, or None if not recorded.
176
List of hex SHA-1 of each version.
179
List of symbolic names for each version. Each should be unique.
182
For each name, the version number.
185
Descriptive name of this weave; typically the filename if known.
166
__slots__ = ['_weave', '_parents', '_sha1s']
189
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
190
'_weave_name', '_matcher']
192
def __init__(self, weave_name=None, access_mode='w', matcher=None):
193
super(Weave, self).__init__(access_mode)
170
195
self._parents = []
199
self._weave_name = weave_name
201
self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
203
self._matcher = matcher
206
return "Weave(%r)" % self._weave_name
209
"""Return a deep copy of self.
211
The copy can be modified without affecting the original weave."""
213
other._weave = self._weave[:]
214
other._parents = self._parents[:]
215
other._sha1s = self._sha1s[:]
216
other._names = self._names[:]
217
other._name_map = self._name_map.copy()
218
other._weave_name = self._weave_name
174
221
def __eq__(self, other):
175
222
if not isinstance(other, Weave):
177
224
return self._parents == other._parents \
178
and self._weave == other._weave
225
and self._weave == other._weave \
226
and self._sha1s == other._sha1s
181
228
def __ne__(self, other):
182
229
return not self.__eq__(other)
185
def add(self, parents, text):
231
@deprecated_method(zero_eight)
232
def idx_to_name(self, index):
233
"""Old public interface, the public interface is all names now."""
236
def _idx_to_name(self, version):
237
return self._names[version]
239
@deprecated_method(zero_eight)
240
def lookup(self, name):
241
"""Backwards compatibility thunk:
243
Return name, as name is valid in the api now, and spew deprecation
248
def _lookup(self, name):
249
"""Convert symbolic version name to index."""
250
self.check_not_reserved_id(name)
252
return self._name_map[name]
254
raise RevisionNotPresent(name, self._weave_name)
256
@deprecated_method(zero_eight)
257
def iter_names(self):
258
"""Deprecated convenience function, please see VersionedFile.names()."""
259
return iter(self.names())
261
@deprecated_method(zero_eight)
263
"""See Weave.versions for the current api."""
264
return self.versions()
267
"""See VersionedFile.versions."""
268
return self._names[:]
270
def has_version(self, version_id):
271
"""See VersionedFile.has_version."""
272
return (version_id in self._name_map)
274
__contains__ = has_version
276
def get_delta(self, version_id):
277
"""See VersionedFile.get_delta."""
278
return self.get_deltas([version_id])[version_id]
280
def get_deltas(self, version_ids):
281
"""See VersionedFile.get_deltas."""
282
version_ids = self.get_ancestry(version_ids)
283
for version_id in version_ids:
284
if not self.has_version(version_id):
285
raise RevisionNotPresent(version_id, self)
286
# try extracting all versions; parallel extraction is used
287
nv = self.num_versions()
293
last_parent_lines = {}
295
parent_inclusions = {}
300
# its simplest to generate a full set of prepared variables.
302
name = self._names[i]
303
sha1s[name] = self.get_sha1(name)
304
parents_list = self.get_parents(name)
306
parent = parents_list[0]
307
parents[name] = parent
308
parent_inclusions[name] = inclusions[parent]
311
parent_inclusions[name] = set()
312
# we want to emit start, finish, replacement_length, replacement_lines tuples.
313
diff_hunks[name] = []
314
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
315
parent_linenums[name] = 0
317
parent_noeols[name] = False
318
last_parent_lines[name] = None
319
new_inc = set([name])
320
for p in self._parents[i]:
321
new_inc.update(inclusions[self._idx_to_name(p)])
322
# debug only, known good so far.
323
#assert set(new_inc) == set(self.get_ancestry(name)), \
324
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
325
inclusions[name] = new_inc
327
nlines = len(self._weave)
329
for lineno, inserted, deletes, line in self._walk_internal():
330
# a line is active in a version if:
331
# insert is in the versions inclusions
333
# deleteset & the versions inclusions is an empty set.
334
# so - if we have a included by mapping - version is included by
335
# children, we get a list of children to examine for deletes affect
336
# ing them, which is less than the entire set of children.
337
for version_id in version_ids:
338
# The active inclusion must be an ancestor,
339
# and no ancestors must have deleted this line,
340
# because we don't support resurrection.
341
parent_inclusion = parent_inclusions[version_id]
342
inclusion = inclusions[version_id]
343
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
344
version_active = inserted in inclusion and not (deletes & inclusion)
345
if not parent_active and not version_active:
346
# unrelated line of ancestry
348
elif parent_active and version_active:
350
parent_linenum = parent_linenums[version_id]
351
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
352
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
354
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
355
parent_linenums[version_id] = parent_linenum
358
noeols[version_id] = True
361
elif parent_active and not version_active:
363
current_hunks[version_id][1] += 1
364
parent_linenums[version_id] += 1
365
last_parent_lines[version_id] = line
366
elif not parent_active and version_active:
368
# noeol only occurs at the end of a file because we
369
# diff linewise. We want to show noeol changes as a
370
# empty diff unless the actual eol-less content changed.
373
if last_parent_lines[version_id][-1] != '\n':
374
parent_noeols[version_id] = True
375
except (TypeError, IndexError):
378
if theline[-1] != '\n':
379
noeols[version_id] = True
383
parent_should_go = False
385
if parent_noeols[version_id] == noeols[version_id]:
386
# no noeol toggle, so trust the weaves statement
387
# that this line is changed.
389
if parent_noeols[version_id]:
390
theline = theline + '\n'
391
elif parent_noeols[version_id]:
392
# parent has no eol, we do:
393
# our line is new, report as such..
395
elif noeols[version_id]:
396
# append a eol so that it looks like
398
theline = theline + '\n'
399
if parents[version_id] is not None:
400
#if last_parent_lines[version_id] is not None:
401
parent_should_go = True
402
if last_parent_lines[version_id] != theline:
405
#parent_should_go = False
407
current_hunks[version_id][2] += 1
408
current_hunks[version_id][3].append((inserted, theline))
410
# last hunk last parent line is not eaten
411
current_hunks[version_id][1] -= 1
412
if current_hunks[version_id][1] < 0:
413
current_hunks[version_id][1] = 0
414
# import pdb;pdb.set_trace()
415
# assert current_hunks[version_id][1] >= 0
419
version = self._idx_to_name(i)
420
if current_hunks[version] != [0, 0, 0, []]:
421
diff_hunks[version].append(tuple(current_hunks[version]))
423
for version_id in version_ids:
424
result[version_id] = (
428
diff_hunks[version_id],
432
def get_parents(self, version_id):
433
"""See VersionedFile.get_parent."""
434
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
436
def _check_repeated_add(self, name, parents, text, sha1):
437
"""Check that a duplicated add is OK.
439
If it is, return the (old) index; otherwise raise an exception.
441
idx = self._lookup(name)
442
if sorted(self._parents[idx]) != sorted(parents) \
443
or sha1 != self._sha1s[idx]:
444
raise RevisionAlreadyPresent(name, self._weave_name)
447
@deprecated_method(zero_eight)
448
def add_identical(self, old_rev_id, new_rev_id, parents):
449
"""Please use Weave.clone_text now."""
450
return self.clone_text(new_rev_id, old_rev_id, parents)
452
def _add_lines(self, version_id, parents, lines, parent_texts):
453
"""See VersionedFile.add_lines."""
454
return self._add(version_id, lines, map(self._lookup, parents))
456
@deprecated_method(zero_eight)
457
def add(self, name, parents, text, sha1=None):
458
"""See VersionedFile.add_lines for the non deprecated api."""
459
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
461
def _add(self, version_id, lines, parents, sha1=None):
186
462
"""Add a single text on top of the weave.
188
464
Returns the index number of the newly added version.
467
Symbolic name for this version.
468
(Typically the revision-id of the revision that added it.)
191
471
List or set of direct parent version numbers.
194
Sequence of lines to be added in the new version."""
474
Sequence of lines to be added in the new version.
477
assert isinstance(version_id, basestring)
478
self._check_lines_not_unicode(lines)
479
self._check_lines_are_lines(lines)
481
sha1 = sha_strings(lines)
482
if version_id in self._name_map:
483
return self._check_repeated_add(version_id, parents, lines, sha1)
196
485
self._check_versions(parents)
197
## self._check_lines(text)
486
## self._check_lines(lines)
198
487
new_version = len(self._parents)
206
# if we abort after here the weave will be corrupt
207
self._parents.append(frozenset(parents))
489
# if we abort after here the (in-memory) weave will be corrupt because only
490
# some fields are updated
491
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
492
# - Robert Collins 20060226
493
self._parents.append(parents[:])
208
494
self._sha1s.append(sha1)
495
self._names.append(version_id)
496
self._name_map[version_id] = new_version
446
assert isinstance(l, basestring)
835
assert l.__class__ in (str, unicode)
447
836
if isactive is None:
448
837
isactive = (not dset) and istack and (istack[-1] in included)
450
839
result.append((istack[-1], lineno, l))
454
raise WFE("unclosed insertion blocks at end of weave",
842
raise WeaveFormatError("unclosed insertion blocks "
843
"at end of weave: %s" % istack)
457
raise WFE("unclosed deletion blocks at end of weave",
464
def get_iter(self, version):
465
"""Yield lines for the specified version."""
466
for origin, lineno, line in self._extract([version]):
470
def get(self, index):
471
return list(self.get_iter(index))
474
def mash_iter(self, included):
475
"""Return composed version of multiple included versions."""
476
for origin, lineno, text in self._extract(included):
480
def dump(self, to_file):
481
from pprint import pprint
482
print >>to_file, "Weave._weave = ",
483
pprint(self._weave, to_file)
484
print >>to_file, "Weave._parents = ",
485
pprint(self._parents, to_file)
845
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
849
@deprecated_method(zero_eight)
850
def get_iter(self, name_or_index):
851
"""Deprecated, please do not use. Lookups are not not needed.
853
Please use get_lines now.
855
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
857
@deprecated_method(zero_eight)
858
def maybe_lookup(self, name_or_index):
859
"""Deprecated, please do not use. Lookups are not not needed."""
860
return self._maybe_lookup(name_or_index)
862
def _maybe_lookup(self, name_or_index):
863
"""Convert possible symbolic name to index, or pass through indexes.
867
if isinstance(name_or_index, (int, long)):
870
return self._lookup(name_or_index)
872
@deprecated_method(zero_eight)
873
def get(self, version_id):
874
"""Please use either Weave.get_text or Weave.get_lines as desired."""
875
return self.get_lines(version_id)
877
def get_lines(self, version_id):
878
"""See VersionedFile.get_lines()."""
879
int_index = self._maybe_lookup(version_id)
880
result = [line for (origin, lineno, line) in self._extract([int_index])]
881
expected_sha1 = self._sha1s[int_index]
882
measured_sha1 = sha_strings(result)
883
if measured_sha1 != expected_sha1:
884
raise errors.WeaveInvalidChecksum(
885
'file %s, revision %s, expected: %s, measured %s'
886
% (self._weave_name, version_id,
887
expected_sha1, measured_sha1))
890
def get_sha1(self, version_id):
891
"""See VersionedFile.get_sha1()."""
892
return self._sha1s[self._lookup(version_id)]
894
@deprecated_method(zero_eight)
489
895
def numversions(self):
896
"""How many versions are in this weave?
898
Deprecated in favour of num_versions.
900
return self.num_versions()
902
def num_versions(self):
903
"""How many versions are in this weave?"""
490
904
l = len(self._parents)
491
905
assert l == len(self._sha1s)
496
return self.numversions()
908
__len__ = num_versions
499
910
def check(self, progress_bar=None):
500
# check no circular inclusions
501
for version in range(self.numversions()):
911
# TODO evaluate performance hit of using string sets in this routine.
912
# TODO: check no circular inclusions
913
# TODO: create a nested progress bar
914
for version in range(self.num_versions()):
502
915
inclusions = list(self._parents[version])
504
917
inclusions.sort()
506
919
raise WeaveFormatError("invalid included version %d for index %d"
507
920
% (inclusions[-1], version))
509
# try extracting all versions; this is a bit slow and parallel
510
# extraction could be used
512
nv = self.numversions()
513
for version in range(nv):
922
# try extracting all versions; parallel extraction is used
923
nv = self.num_versions()
928
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
929
# The problem is that set membership is much more expensive
930
name = self._idx_to_name(i)
931
sha1s[name] = sha.new()
933
new_inc = set([name])
934
for p in self._parents[i]:
935
new_inc.update(inclusions[self._idx_to_name(p)])
937
assert set(new_inc) == set(self.get_ancestry(name)), \
938
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
939
inclusions[name] = new_inc
941
nlines = len(self._weave)
943
update_text = 'checking weave'
945
short_name = os.path.basename(self._weave_name)
946
update_text = 'checking %s' % (short_name,)
947
update_text = update_text[:25]
949
for lineno, insert, deleteset, line in self._walk_internal():
515
progress_bar.update('checking text', version, nv)
517
for l in self.get_iter(version):
520
expected = self._sha1s[version]
951
progress_bar.update(update_text, lineno, nlines)
953
for name, name_inclusions in inclusions.items():
954
# The active inclusion must be an ancestor,
955
# and no ancestors must have deleted this line,
956
# because we don't support resurrection.
957
if (insert in name_inclusions) and not (deleteset & name_inclusions):
958
sha1s[name].update(line)
961
version = self._idx_to_name(i)
962
hd = sha1s[version].hexdigest()
963
expected = self._sha1s[i]
521
964
if hd != expected:
522
raise WeaveError("mismatched sha1 for version %d; "
523
"got %s, expected %s"
524
% (version, hd, expected))
965
raise errors.WeaveInvalidChecksum(
966
"mismatched sha1 for version %s: "
967
"got %s, expected %s"
968
% (version, hd, expected))
526
970
# TODO: check insertions are properly nested, that there are
527
971
# no lines outside of insertion blocks, that deletions are
528
972
# properly paired, etc.
532
def merge(self, merge_versions):
533
"""Automerge and mark conflicts between versions.
535
This returns a sequence, each entry describing alternatives
536
for a chunk of the file. Each of the alternatives is given as
539
If there is a chunk of the file where there's no diagreement,
540
only one alternative is given.
543
# approach: find the included versions common to all the
545
raise NotImplementedError()
549
def _delta(self, included, lines):
550
"""Return changes from basis to new revision.
552
The old text for comparison is the union of included revisions.
554
This is used in inserting a new text.
556
Delta is returned as a sequence of
557
(weave1, weave2, newlines).
559
This indicates that weave1:weave2 of the old weave should be
560
replaced by the sequence of lines in newlines. Note that
561
these line numbers are positions in the total weave and don't
562
correspond to the lines in any extracted version, or even the
563
extracted union of included versions.
565
If line1=line2, this is a pure insert; if newlines=[] this is a
566
pure delete. (Similar to difflib.)
571
def plan_merge(self, ver_a, ver_b):
572
"""Return pseudo-annotation indicating how the two versions merge.
574
This is computed between versions a and b and their common
577
Weave lines present in none of them are skipped entirely.
579
inc_a = self.inclusions([ver_a])
580
inc_b = self.inclusions([ver_b])
581
inc_c = inc_a & inc_b
583
for lineno, insert, deleteset, line in self._walk():
584
if deleteset & inc_c:
585
# killed in parent; can't be in either a or b
586
# not relevant to our work
587
yield 'killed-base', line
588
elif insert in inc_c:
589
# was inserted in base
590
killed_a = bool(deleteset & inc_a)
591
killed_b = bool(deleteset & inc_b)
592
if killed_a and killed_b:
593
yield 'killed-both', line
595
yield 'killed-a', line
597
yield 'killed-b', line
599
yield 'unchanged', line
600
elif insert in inc_a:
601
if deleteset & inc_a:
602
yield 'ghost-a', line
606
elif insert in inc_b:
607
if deleteset & inc_b:
608
yield 'ghost-b', line
612
# not in either revision
613
yield 'irrelevant', line
615
yield 'unchanged', '' # terminator
619
def weave_merge(self, plan):
624
for state, line in plan:
625
if state == 'unchanged' or state == 'killed-both':
626
# resync and flush queued conflicts changes if any
627
if not lines_a and not lines_b:
629
elif ch_a and not ch_b:
631
for l in lines_a: yield l
632
elif ch_b and not ch_a:
633
for l in lines_b: yield l
634
elif lines_a == lines_b:
635
for l in lines_a: yield l
638
for l in lines_a: yield l
640
for l in lines_b: yield l
647
if state == 'unchanged':
650
elif state == 'killed-a':
653
elif state == 'killed-b':
656
elif state == 'new-a':
659
elif state == 'new-b':
663
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
674
"""Show some text information about the weave."""
675
print '%6s %40s %20s' % ('ver', 'sha1', 'parents')
676
for i in (6, 40, 20):
974
def _join(self, other, pb, msg, version_ids, ignore_missing):
975
"""Worker routine for join()."""
976
if not other.versions():
977
return # nothing to update, easy
980
# versions is never none, InterWeave checks this.
983
# two loops so that we do not change ourselves before verifying it
985
# work through in index order to make sure we get all dependencies
988
# get the selected versions only that are in other.versions.
989
version_ids = set(other.versions()).intersection(set(version_ids))
990
# pull in the referenced graph.
991
version_ids = other.get_ancestry(version_ids)
992
pending_graph = [(version, other.get_parents(version)) for
993
version in version_ids]
994
for name in topo_sort(pending_graph):
995
other_idx = other._name_map[name]
996
# returns True if we have it, False if we need it.
997
if not self._check_version_consistent(other, other_idx, name):
998
names_to_join.append((other_idx, name))
1007
for other_idx, name in names_to_join:
1008
# TODO: If all the parents of the other version are already
1009
# present then we can avoid some work by just taking the delta
1010
# and adjusting the offsets.
1011
new_parents = self._imported_parents(other, other_idx)
1012
sha1 = other._sha1s[other_idx]
1017
pb.update(msg, merged, len(names_to_join))
1019
lines = other.get_lines(other_idx)
1020
self._add(name, lines, new_parents, sha1)
1022
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1023
merged, processed, self._weave_name, time.time()-time0))
1025
def _imported_parents(self, other, other_idx):
1026
"""Return list of parents in self corresponding to indexes in other."""
1028
for parent_idx in other._parents[other_idx]:
1029
parent_name = other._names[parent_idx]
1030
if parent_name not in self._name_map:
1031
# should not be possible
1032
raise WeaveError("missing parent {%s} of {%s} in %r"
1033
% (parent_name, other._name_map[other_idx], self))
1034
new_parents.append(self._name_map[parent_name])
1037
def _check_version_consistent(self, other, other_idx, name):
1038
"""Check if a version in consistent in this and other.
1040
To be consistent it must have:
1043
* the same direct parents (by name, not index, and disregarding
1046
If present & correct return True;
1047
if not present in self return False;
1048
if inconsistent raise error."""
1049
this_idx = self._name_map.get(name, -1)
1051
if self._sha1s[this_idx] != other._sha1s[other_idx]:
1052
raise errors.WeaveTextDiffers(name, self, other)
1053
self_parents = self._parents[this_idx]
1054
other_parents = other._parents[other_idx]
1055
n1 = set([self._names[i] for i in self_parents])
1056
n2 = set([other._names[i] for i in other_parents])
1057
if not self._compatible_parents(n1, n2):
1058
raise WeaveParentMismatch("inconsistent parents "
1059
"for version {%s}: %s vs %s" % (name, n1, n2))
1065
@deprecated_method(zero_eight)
1066
def reweave(self, other, pb=None, msg=None):
1067
"""reweave has been superseded by plain use of join."""
1068
return self.join(other, pb, msg)
1070
def _reweave(self, other, pb, msg):
1071
"""Reweave self with other - internal helper for join().
1073
:param other: The other weave to merge
1074
:param pb: An optional progress bar, indicating how far done we are
1075
:param msg: An optional message for the progress
1077
new_weave = _reweave(self, other, pb=pb, msg=msg)
1078
self._copy_weave_content(new_weave)
1080
def _copy_weave_content(self, otherweave):
1081
"""adsorb the content from otherweave."""
1082
for attr in self.__slots__:
1083
if attr != '_weave_name':
1084
setattr(self, attr, copy(getattr(otherweave, attr)))
1087
class WeaveFile(Weave):
1088
"""A WeaveFile represents a Weave on disk and writes on change."""
1090
WEAVE_SUFFIX = '.weave'
1092
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1093
"""Create a WeaveFile.
1095
:param create: If not True, only open an existing knit.
1097
super(WeaveFile, self).__init__(name, access_mode)
1098
self._transport = transport
1099
self._filemode = filemode
1101
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1102
except errors.NoSuchFile:
1108
def _add_lines(self, version_id, parents, lines, parent_texts):
1109
"""Add a version and save the weave."""
1110
self.check_not_reserved_id(version_id)
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_file(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_file(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):
1160
"""Combine two weaves and return the result.
1162
This works even if a revision R has different parents in
1163
wa and wb. In the resulting weave all the parents are given.
1165
This is done by just building up a new weave, maintaining ordering
1166
of the versions in the two inputs. More efficient approaches
1167
might be possible but it should only be necessary to do
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
1176
queue_a = range(wa.num_versions())
1177
queue_b = range(wb.num_versions())
1178
# first determine combined parents of all versions
1179
# map from version name -> all parent names
1180
combined_parents = _reweave_parent_graphs(wa, wb)
1181
mutter("combined parents: %r", combined_parents)
1182
order = topo_sort(combined_parents.iteritems())
1183
mutter("order to reweave: %r", order)
1188
for idx, name in enumerate(order):
1190
pb.update(msg, idx, len(order))
1191
if name in wa._name_map:
1192
lines = wa.get_lines(name)
1193
if name in wb._name_map:
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)
1204
lines = wb.get_lines(name)
1205
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1208
def _reweave_parent_graphs(wa, wb):
1209
"""Return combined parent ancestry for two weaves.
1211
Returned as a list of (version_name, set(parent_names))"""
1213
for weave in [wa, wb]:
1214
for idx, name in enumerate(weave._names):
1215
p = combined.setdefault(name, set())
1216
p.update(map(weave._idx_to_name, weave._parents[idx]))
1221
"""Show the weave's table-of-contents"""
1222
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1223
for i in (6, 50, 10, 10):
679
for i in range(w.numversions()):
1226
for i in range(w.num_versions()):
680
1227
sha1 = w._sha1s[i]
681
print '%6d %40s %s' % (i, sha1, ' '.join(map(str, w._parents[i])))
685
def weave_stats(weave_file):
686
from bzrlib.progress import ProgressBar
1229
parent_str = ' '.join(map(str, w._parents[i]))
1230
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1234
def weave_stats(weave_file, pb):
687
1235
from bzrlib.weavefile import read_weave
691
1237
wf = file(weave_file, 'rb')
692
1238
w = read_weave(wf)
693
1239
# FIXME: doesn't work on pipes
added
removed
bzrlib/weave.py
