160
165
each version; the parent's parents are implied.
163
List of hex SHA-1 of each version, or None if not recorded.
168
List of hex SHA-1 of each version.
171
List of symbolic names for each version. Each should be unique.
174
For each name, the version number.
177
Descriptive name of this weave; typically the filename if known.
166
__slots__ = ['_weave', '_parents', '_sha1s']
181
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
184
def __init__(self, weave_name=None, access_mode='w'):
185
super(Weave, self).__init__(access_mode)
170
187
self._parents = []
191
self._weave_name = weave_name
194
return "Weave(%r)" % self._weave_name
197
"""Return a deep copy of self.
199
The copy can be modified without affecting the original weave."""
201
other._weave = self._weave[:]
202
other._parents = self._parents[:]
203
other._sha1s = self._sha1s[:]
204
other._names = self._names[:]
205
other._name_map = self._name_map.copy()
206
other._weave_name = self._weave_name
174
209
def __eq__(self, other):
175
210
if not isinstance(other, Weave):
177
212
return self._parents == other._parents \
178
and self._weave == other._weave
213
and self._weave == other._weave \
214
and self._sha1s == other._sha1s
181
216
def __ne__(self, other):
182
217
return not self.__eq__(other)
185
def add(self, parents, text):
219
@deprecated_method(zero_eight)
220
def idx_to_name(self, index):
221
"""Old public interface, the public interface is all names now."""
224
def _idx_to_name(self, version):
225
return self._names[version]
227
@deprecated_method(zero_eight)
228
def lookup(self, name):
229
"""Backwards compatability thunk:
231
Return name, as name is valid in the api now, and spew deprecation
236
def _lookup(self, name):
237
"""Convert symbolic version name to index."""
239
return self._name_map[name]
241
raise RevisionNotPresent(name, self._weave_name)
243
@deprecated_method(zero_eight)
244
def iter_names(self):
245
"""Deprecated convenience function, please see VersionedFile.names()."""
246
return iter(self.names())
248
@deprecated_method(zero_eight)
250
"""See Weave.versions for the current api."""
251
return self.versions()
254
"""See VersionedFile.versions."""
255
return self._names[:]
257
def has_version(self, version_id):
258
"""See VersionedFile.has_version."""
259
return self._name_map.has_key(version_id)
261
__contains__ = has_version
263
def get_delta(self, version_id):
264
"""See VersionedFile.get_delta."""
265
return self.get_deltas([version_id])[version_id]
267
def get_deltas(self, version_ids):
268
"""See VersionedFile.get_deltas."""
269
version_ids = self.get_ancestry(version_ids)
270
for version_id in version_ids:
271
if not self.has_version(version_id):
272
raise RevisionNotPresent(version_id, self)
273
# try extracting all versions; parallel extraction is used
274
nv = self.num_versions()
280
last_parent_lines = {}
282
parent_inclusions = {}
287
# its simplest to generate a full set of prepared variables.
289
name = self._names[i]
290
sha1s[name] = self.get_sha1(name)
291
parents_list = self.get_parents(name)
293
parent = parents_list[0]
294
parents[name] = parent
295
parent_inclusions[name] = inclusions[parent]
298
parent_inclusions[name] = set()
299
# we want to emit start, finish, replacement_length, replacement_lines tuples.
300
diff_hunks[name] = []
301
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
302
parent_linenums[name] = 0
304
parent_noeols[name] = False
305
last_parent_lines[name] = None
306
new_inc = set([name])
307
for p in self._parents[i]:
308
new_inc.update(inclusions[self._idx_to_name(p)])
309
# debug only, known good so far.
310
#assert set(new_inc) == set(self.get_ancestry(name)), \
311
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
312
inclusions[name] = new_inc
314
nlines = len(self._weave)
316
for lineno, inserted, deletes, line in self._walk_internal():
317
# a line is active in a version if:
318
# insert is in the versions inclusions
320
# deleteset & the versions inclusions is an empty set.
321
# so - if we have a included by mapping - version is included by
322
# children, we get a list of children to examine for deletes affect
323
# ing them, which is less than the entire set of children.
324
for version_id in version_ids:
325
# The active inclusion must be an ancestor,
326
# and no ancestors must have deleted this line,
327
# because we don't support resurrection.
328
parent_inclusion = parent_inclusions[version_id]
329
inclusion = inclusions[version_id]
330
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
331
version_active = inserted in inclusion and not (deletes & inclusion)
332
if not parent_active and not version_active:
333
# unrelated line of ancestry
335
elif parent_active and version_active:
337
parent_linenum = parent_linenums[version_id]
338
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
339
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
341
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
342
parent_linenums[version_id] = parent_linenum
345
noeols[version_id] = True
348
elif parent_active and not version_active:
350
current_hunks[version_id][1] += 1
351
parent_linenums[version_id] += 1
352
last_parent_lines[version_id] = line
353
elif not parent_active and version_active:
355
# noeol only occurs at the end of a file because we
356
# diff linewise. We want to show noeol changes as a
357
# empty diff unless the actual eol-less content changed.
360
if last_parent_lines[version_id][-1] != '\n':
361
parent_noeols[version_id] = True
362
except (TypeError, IndexError):
365
if theline[-1] != '\n':
366
noeols[version_id] = True
370
parent_should_go = False
372
if parent_noeols[version_id] == noeols[version_id]:
373
# no noeol toggle, so trust the weaves statement
374
# that this line is changed.
376
if parent_noeols[version_id]:
377
theline = theline + '\n'
378
elif parent_noeols[version_id]:
379
# parent has no eol, we do:
380
# our line is new, report as such..
382
elif noeols[version_id]:
383
# append a eol so that it looks like
385
theline = theline + '\n'
386
if parents[version_id] is not None:
387
#if last_parent_lines[version_id] is not None:
388
parent_should_go = True
389
if last_parent_lines[version_id] != theline:
392
#parent_should_go = False
394
current_hunks[version_id][2] += 1
395
current_hunks[version_id][3].append((inserted, theline))
397
# last hunk last parent line is not eaten
398
current_hunks[version_id][1] -= 1
399
if current_hunks[version_id][1] < 0:
400
current_hunks[version_id][1] = 0
401
# import pdb;pdb.set_trace()
402
# assert current_hunks[version_id][1] >= 0
406
version = self._idx_to_name(i)
407
if current_hunks[version] != [0, 0, 0, []]:
408
diff_hunks[version].append(tuple(current_hunks[version]))
410
for version_id in version_ids:
411
result[version_id] = (
415
diff_hunks[version_id],
419
def get_parents(self, version_id):
420
"""See VersionedFile.get_parent."""
421
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
423
def _check_repeated_add(self, name, parents, text, sha1):
424
"""Check that a duplicated add is OK.
426
If it is, return the (old) index; otherwise raise an exception.
428
idx = self._lookup(name)
429
if sorted(self._parents[idx]) != sorted(parents) \
430
or sha1 != self._sha1s[idx]:
431
raise RevisionAlreadyPresent(name, self._weave_name)
434
@deprecated_method(zero_eight)
435
def add_identical(self, old_rev_id, new_rev_id, parents):
436
"""Please use Weave.clone_text now."""
437
return self.clone_text(new_rev_id, old_rev_id, parents)
439
def _add_lines(self, version_id, parents, lines, parent_texts):
440
"""See VersionedFile.add_lines."""
441
return self._add(version_id, lines, map(self._lookup, parents))
443
@deprecated_method(zero_eight)
444
def add(self, name, parents, text, sha1=None):
445
"""See VersionedFile.add_lines for the non deprecated api."""
446
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
448
def _add(self, version_id, lines, parents, sha1=None):
186
449
"""Add a single text on top of the weave.
188
451
Returns the index number of the newly added version.
454
Symbolic name for this version.
455
(Typically the revision-id of the revision that added it.)
191
458
List or set of direct parent version numbers.
194
Sequence of lines to be added in the new version."""
461
Sequence of lines to be added in the new version.
464
assert isinstance(version_id, basestring)
466
sha1 = sha_strings(lines)
467
if version_id in self._name_map:
468
return self._check_repeated_add(version_id, parents, lines, sha1)
196
470
self._check_versions(parents)
197
## self._check_lines(text)
471
## self._check_lines(lines)
198
472
new_version = len(self._parents)
206
# if we abort after here the weave will be corrupt
207
self._parents.append(frozenset(parents))
474
# if we abort after here the (in-memory) weave will be corrupt because only
475
# some fields are updated
476
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
477
# - Robert Collins 20060226
478
self._parents.append(parents[:])
208
479
self._sha1s.append(sha1)
480
self._names.append(version_id)
481
self._name_map[version_id] = new_version
446
assert isinstance(l, basestring)
786
assert l.__class__ in (str, unicode)
447
787
if isactive is None:
448
788
isactive = (not dset) and istack and (istack[-1] in included)
450
790
result.append((istack[-1], lineno, l))
454
raise WFE("unclosed insertion blocks at end of weave",
793
raise WeaveFormatError("unclosed insertion blocks "
794
"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)
796
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
800
@deprecated_method(zero_eight)
801
def get_iter(self, name_or_index):
802
"""Deprecated, please do not use. Lookups are not not needed.
804
Please use get_lines now.
806
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
808
@deprecated_method(zero_eight)
809
def maybe_lookup(self, name_or_index):
810
"""Deprecated, please do not use. Lookups are not not needed."""
811
return self._maybe_lookup(name_or_index)
813
def _maybe_lookup(self, name_or_index):
814
"""Convert possible symbolic name to index, or pass through indexes.
818
if isinstance(name_or_index, (int, long)):
821
return self._lookup(name_or_index)
823
@deprecated_method(zero_eight)
824
def get(self, version_id):
825
"""Please use either Weave.get_text or Weave.get_lines as desired."""
826
return self.get_lines(version_id)
828
def get_lines(self, version_id):
829
"""See VersionedFile.get_lines()."""
830
int_index = self._maybe_lookup(version_id)
831
result = [line for (origin, lineno, line) in self._extract([int_index])]
832
expected_sha1 = self._sha1s[int_index]
833
measured_sha1 = sha_strings(result)
834
if measured_sha1 != expected_sha1:
835
raise errors.WeaveInvalidChecksum(
836
'file %s, revision %s, expected: %s, measured %s'
837
% (self._weave_name, version_id,
838
expected_sha1, measured_sha1))
841
def get_sha1(self, name):
842
"""Get the stored sha1 sum for the given revision.
844
:param name: The name of the version to lookup
846
return self._sha1s[self._lookup(name)]
848
@deprecated_method(zero_eight)
489
849
def numversions(self):
850
"""How many versions are in this weave?
852
Deprecated in favour of num_versions.
854
return self.num_versions()
856
def num_versions(self):
857
"""How many versions are in this weave?"""
490
858
l = len(self._parents)
491
859
assert l == len(self._sha1s)
496
return self.numversions()
862
__len__ = num_versions
499
864
def check(self, progress_bar=None):
500
# check no circular inclusions
501
for version in range(self.numversions()):
865
# TODO evaluate performance hit of using string sets in this routine.
866
# TODO: check no circular inclusions
867
# TODO: create a nested progress bar
868
for version in range(self.num_versions()):
502
869
inclusions = list(self._parents[version])
504
871
inclusions.sort()
506
873
raise WeaveFormatError("invalid included version %d for index %d"
507
874
% (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):
876
# try extracting all versions; parallel extraction is used
877
nv = self.num_versions()
882
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
883
# The problem is that set membership is much more expensive
884
name = self._idx_to_name(i)
885
sha1s[name] = sha.new()
887
new_inc = set([name])
888
for p in self._parents[i]:
889
new_inc.update(inclusions[self._idx_to_name(p)])
891
assert set(new_inc) == set(self.get_ancestry(name)), \
892
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
893
inclusions[name] = new_inc
895
nlines = len(self._weave)
897
update_text = 'checking weave'
899
short_name = os.path.basename(self._weave_name)
900
update_text = 'checking %s' % (short_name,)
901
update_text = update_text[:25]
903
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]
905
progress_bar.update(update_text, lineno, nlines)
907
for name, name_inclusions in inclusions.items():
908
# The active inclusion must be an ancestor,
909
# and no ancestors must have deleted this line,
910
# because we don't support resurrection.
911
if (insert in name_inclusions) and not (deleteset & name_inclusions):
912
sha1s[name].update(line)
915
version = self._idx_to_name(i)
916
hd = sha1s[version].hexdigest()
917
expected = self._sha1s[i]
521
918
if hd != expected:
522
raise WeaveError("mismatched sha1 for version %d; "
523
"got %s, expected %s"
524
% (version, hd, expected))
919
raise errors.WeaveInvalidChecksum(
920
"mismatched sha1 for version %s: "
921
"got %s, expected %s"
922
% (version, hd, expected))
526
924
# TODO: check insertions are properly nested, that there are
527
925
# no lines outside of insertion blocks, that deletions are
528
926
# 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):
928
def _join(self, other, pb, msg, version_ids, ignore_missing):
929
"""Worker routine for join()."""
930
if not other.versions():
931
return # nothing to update, easy
934
for version_id in version_ids:
935
if not other.has_version(version_id) and not ignore_missing:
936
raise RevisionNotPresent(version_id, self._weave_name)
938
version_ids = other.versions()
940
# two loops so that we do not change ourselves before verifying it
942
# work through in index order to make sure we get all dependencies
945
# get the selected versions only that are in other.versions.
946
version_ids = set(other.versions()).intersection(set(version_ids))
947
# pull in the referenced graph.
948
version_ids = other.get_ancestry(version_ids)
949
pending_graph = [(version, other.get_parents(version)) for
950
version in version_ids]
951
for name in topo_sort(pending_graph):
952
other_idx = other._name_map[name]
953
# returns True if we have it, False if we need it.
954
if not self._check_version_consistent(other, other_idx, name):
955
names_to_join.append((other_idx, name))
964
for other_idx, name in names_to_join:
965
# TODO: If all the parents of the other version are already
966
# present then we can avoid some work by just taking the delta
967
# and adjusting the offsets.
968
new_parents = self._imported_parents(other, other_idx)
969
sha1 = other._sha1s[other_idx]
974
pb.update(msg, merged, len(names_to_join))
976
lines = other.get_lines(other_idx)
977
self._add(name, lines, new_parents, sha1)
979
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
980
merged, processed, self._weave_name, time.time()-time0))
982
def _imported_parents(self, other, other_idx):
983
"""Return list of parents in self corresponding to indexes in other."""
985
for parent_idx in other._parents[other_idx]:
986
parent_name = other._names[parent_idx]
987
if parent_name not in self._name_map:
988
# should not be possible
989
raise WeaveError("missing parent {%s} of {%s} in %r"
990
% (parent_name, other._name_map[other_idx], self))
991
new_parents.append(self._name_map[parent_name])
994
def _check_version_consistent(self, other, other_idx, name):
995
"""Check if a version in consistent in this and other.
997
To be consistent it must have:
1000
* the same direct parents (by name, not index, and disregarding
1003
If present & correct return True;
1004
if not present in self return False;
1005
if inconsistent raise error."""
1006
this_idx = self._name_map.get(name, -1)
1008
if self._sha1s[this_idx] != other._sha1s[other_idx]:
1009
raise errors.WeaveTextDiffers(name, self, other)
1010
self_parents = self._parents[this_idx]
1011
other_parents = other._parents[other_idx]
1012
n1 = set([self._names[i] for i in self_parents])
1013
n2 = set([other._names[i] for i in other_parents])
1014
if not self._compatible_parents(n1, n2):
1015
raise WeaveParentMismatch("inconsistent parents "
1016
"for version {%s}: %s vs %s" % (name, n1, n2))
1022
@deprecated_method(zero_eight)
1023
def reweave(self, other, pb=None, msg=None):
1024
"""reweave has been superceded by plain use of join."""
1025
return self.join(other, pb, msg)
1027
def _reweave(self, other, pb, msg):
1028
"""Reweave self with other - internal helper for join().
1030
:param other: The other weave to merge
1031
:param pb: An optional progress bar, indicating how far done we are
1032
:param msg: An optional message for the progress
1034
new_weave = _reweave(self, other, pb=pb, msg=msg)
1035
self._copy_weave_content(new_weave)
1037
def _copy_weave_content(self, otherweave):
1038
"""adsorb the content from otherweave."""
1039
for attr in self.__slots__:
1040
if attr != '_weave_name':
1041
setattr(self, attr, copy(getattr(otherweave, attr)))
1044
class WeaveFile(Weave):
1045
"""A WeaveFile represents a Weave on disk and writes on change."""
1047
WEAVE_SUFFIX = '.weave'
1049
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1050
"""Create a WeaveFile.
1052
:param create: If not True, only open an existing knit.
1054
super(WeaveFile, self).__init__(name, access_mode)
1055
self._transport = transport
1056
self._filemode = filemode
1058
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1059
except errors.NoSuchFile:
1065
def _add_lines(self, version_id, parents, lines, parent_texts):
1066
"""Add a version and save the weave."""
1067
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1072
def _clone_text(self, new_version_id, old_version_id, parents):
1073
"""See VersionedFile.clone_text."""
1074
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1077
def copy_to(self, name, transport):
1078
"""See VersionedFile.copy_to()."""
1079
# as we are all in memory always, just serialise to the new place.
1081
write_weave_v5(self, sio)
1083
transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1085
def create_empty(self, name, transport, filemode=None):
1086
return WeaveFile(name, transport, filemode, create=True)
1089
"""Save the weave."""
1090
self._check_write_ok()
1092
write_weave_v5(self, sio)
1094
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1100
"""See VersionedFile.get_suffixes()."""
1101
return [WeaveFile.WEAVE_SUFFIX]
1103
def join(self, other, pb=None, msg=None, version_ids=None,
1104
ignore_missing=False):
1105
"""Join other into self and save."""
1106
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1110
@deprecated_function(zero_eight)
1111
def reweave(wa, wb, pb=None, msg=None):
1112
"""reweaving is deprecation, please just use weave.join()."""
1113
_reweave(wa, wb, pb, msg)
1115
def _reweave(wa, wb, pb=None, msg=None):
1116
"""Combine two weaves and return the result.
1118
This works even if a revision R has different parents in
1119
wa and wb. In the resulting weave all the parents are given.
1121
This is done by just building up a new weave, maintaining ordering
1122
of the versions in the two inputs. More efficient approaches
1123
might be possible but it should only be necessary to do
1124
this operation rarely, when a new previously ghost version is
1127
:param pb: An optional progress bar, indicating how far done we are
1128
:param msg: An optional message for the progress
1132
queue_a = range(wa.num_versions())
1133
queue_b = range(wb.num_versions())
1134
# first determine combined parents of all versions
1135
# map from version name -> all parent names
1136
combined_parents = _reweave_parent_graphs(wa, wb)
1137
mutter("combined parents: %r", combined_parents)
1138
order = topo_sort(combined_parents.iteritems())
1139
mutter("order to reweave: %r", order)
1144
for idx, name in enumerate(order):
1146
pb.update(msg, idx, len(order))
1147
if name in wa._name_map:
1148
lines = wa.get_lines(name)
1149
if name in wb._name_map:
1150
lines_b = wb.get_lines(name)
1151
if lines != lines_b:
1152
mutter('Weaves differ on content. rev_id {%s}', name)
1153
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1155
lines = list(difflib.unified_diff(lines, lines_b,
1156
wa._weave_name, wb._weave_name))
1157
mutter('lines:\n%s', ''.join(lines))
1158
raise errors.WeaveTextDiffers(name, wa, wb)
1160
lines = wb.get_lines(name)
1161
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1164
def _reweave_parent_graphs(wa, wb):
1165
"""Return combined parent ancestry for two weaves.
1167
Returned as a list of (version_name, set(parent_names))"""
1169
for weave in [wa, wb]:
1170
for idx, name in enumerate(weave._names):
1171
p = combined.setdefault(name, set())
1172
p.update(map(weave._idx_to_name, weave._parents[idx]))
1177
"""Show the weave's table-of-contents"""
1178
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1179
for i in (6, 50, 10, 10):
679
for i in range(w.numversions()):
1182
for i in range(w.num_versions()):
680
1183
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
1185
parent_str = ' '.join(map(str, w._parents[i]))
1186
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1190
def weave_stats(weave_file, pb):
687
1191
from bzrlib.weavefile import read_weave
691
1193
wf = file(weave_file, 'rb')
1194
w = read_weave(wf, WeaveVersionedFile)
693
1195
# FIXME: doesn't work on pipes
694
1196
weave_size = wf.tell()
added
removed
bzrlib/weave.py
