74
44
# TODO: Parallel-extract that passes back each line along with a
75
45
# description of which revisions include it. Nice for checking all
81
class WeaveError(Exception):
82
"""Exception in processing weave"""
85
class WeaveFormatError(WeaveError):
86
"""Weave invariant violated"""
46
# shas or calculating stats in parallel.
48
# TODO: Using a single _extract routine and then processing the output
49
# is probably inefficient. It's simple enough that we can afford to
50
# have slight specializations for different ways its used: annotate,
51
# basis for add, get, etc.
53
# TODO: Probably the API should work only in names to hide the integer
54
# indexes from the user.
56
# TODO: Is there any potential performance win by having an add()
57
# variant that is passed a pre-cooked version of the single basis
60
# TODO: Reweave can possibly be made faster by remembering diffs
61
# where the basis and destination are unchanged.
63
# FIXME: Sometimes we will be given a parents list for a revision
64
# that includes some redundant parents (i.e. already a parent of
65
# something in the list.) We should eliminate them. This can
66
# be done fairly efficiently because the sequence numbers constrain
67
# the possible relationships.
69
# FIXME: the conflict markers should be *7* characters
72
from cStringIO import StringIO
81
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
RevisionAlreadyPresent,
84
UnavailableRepresentation,
85
WeaveRevisionAlreadyPresent,
86
WeaveRevisionNotPresent,
88
import bzrlib.errors as errors
89
from bzrlib.osutils import dirname, sha_strings, split_lines
90
import bzrlib.patiencediff
91
from bzrlib.revision import NULL_REVISION
92
from bzrlib.symbol_versioning import *
93
from bzrlib.trace import mutter
94
from bzrlib.tsort import topo_sort
95
from bzrlib.versionedfile import (
101
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
104
class WeaveContentFactory(ContentFactory):
105
"""Content factory for streaming from weaves.
107
:seealso ContentFactory:
110
def __init__(self, version, weave):
111
"""Create a WeaveContentFactory for version from weave."""
112
ContentFactory.__init__(self)
113
self.sha1 = weave.get_sha1s([version])[version]
114
self.key = (version,)
115
parents = weave.get_parent_map([version])[version]
116
self.parents = tuple((parent,) for parent in parents)
117
self.storage_kind = 'fulltext'
120
def get_bytes_as(self, storage_kind):
121
if storage_kind == 'fulltext':
122
return self._weave.get_text(self.key[-1])
124
raise UnavailableRepresentation(self.key, storage_kind, 'fulltext')
127
class Weave(VersionedFile):
90
128
"""weave - versioned text file storage.
92
130
A Weave manages versions of line-based text files, keeping track
160
200
each version; the parent's parents are implied.
163
List of hex SHA-1 of each version, or None if not recorded.
203
List of hex SHA-1 of each version.
206
List of symbolic names for each version. Each should be unique.
209
For each name, the version number.
212
Descriptive name of this weave; typically the filename if known.
166
__slots__ = ['_weave', '_parents', '_sha1s']
216
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
217
'_weave_name', '_matcher', '_allow_reserved']
219
def __init__(self, weave_name=None, access_mode='w', matcher=None,
220
get_scope=None, allow_reserved=False):
223
:param get_scope: A callable that returns an opaque object to be used
224
for detecting when this weave goes out of scope (should stop
225
answering requests or allowing mutation).
227
super(Weave, self).__init__(access_mode)
170
229
self._parents = []
233
self._weave_name = weave_name
235
self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
237
self._matcher = matcher
238
if get_scope is None:
239
get_scope = lambda:None
240
self._get_scope = get_scope
241
self._scope = get_scope()
242
self._access_mode = access_mode
243
self._allow_reserved = allow_reserved
246
return "Weave(%r)" % self._weave_name
248
def _check_write_ok(self):
249
"""Is the versioned file marked as 'finished' ? Raise if it is."""
250
if self._get_scope() != self._scope:
251
raise errors.OutSideTransaction()
252
if self._access_mode != 'w':
253
raise errors.ReadOnlyObjectDirtiedError(self)
256
"""Return a deep copy of self.
258
The copy can be modified without affecting the original weave."""
260
other._weave = self._weave[:]
261
other._parents = self._parents[:]
262
other._sha1s = self._sha1s[:]
263
other._names = self._names[:]
264
other._name_map = self._name_map.copy()
265
other._weave_name = self._weave_name
174
268
def __eq__(self, other):
175
269
if not isinstance(other, Weave):
177
271
return self._parents == other._parents \
178
and self._weave == other._weave
272
and self._weave == other._weave \
273
and self._sha1s == other._sha1s
181
275
def __ne__(self, other):
182
276
return not self.__eq__(other)
185
def add(self, parents, text):
278
def _idx_to_name(self, version):
279
return self._names[version]
281
def _lookup(self, name):
282
"""Convert symbolic version name to index."""
283
if not self._allow_reserved:
284
self.check_not_reserved_id(name)
286
return self._name_map[name]
288
raise RevisionNotPresent(name, self._weave_name)
291
"""See VersionedFile.versions."""
292
return self._names[:]
294
def has_version(self, version_id):
295
"""See VersionedFile.has_version."""
296
return (version_id in self._name_map)
298
__contains__ = has_version
300
def get_record_stream(self, versions, ordering, include_delta_closure):
301
"""Get a stream of records for versions.
303
:param versions: The versions to include. Each version is a tuple
305
:param ordering: Either 'unordered' or 'topological'. A topologically
306
sorted stream has compression parents strictly before their
308
:param include_delta_closure: If True then the closure across any
309
compression parents will be included (in the opaque data).
310
:return: An iterator of ContentFactory objects, each of which is only
311
valid until the iterator is advanced.
313
versions = [version[-1] for version in versions]
314
if ordering == 'topological':
315
parents = self.get_parent_map(versions)
316
new_versions = topo_sort(parents)
317
new_versions.extend(set(versions).difference(set(parents)))
318
versions = new_versions
319
for version in versions:
321
yield WeaveContentFactory(version, self)
323
yield AbsentContentFactory((version,))
325
def get_parent_map(self, version_ids):
326
"""See VersionedFile.get_parent_map."""
328
for version_id in version_ids:
329
if version_id == NULL_REVISION:
334
map(self._idx_to_name,
335
self._parents[self._lookup(version_id)]))
336
except RevisionNotPresent:
338
result[version_id] = parents
341
def get_parents_with_ghosts(self, version_id):
342
raise NotImplementedError(self.get_parents_with_ghosts)
344
def insert_record_stream(self, stream):
345
"""Insert a record stream into this versioned file.
347
:param stream: A stream of records to insert.
349
:seealso VersionedFile.get_record_stream:
352
for record in stream:
353
# Raise an error when a record is missing.
354
if record.storage_kind == 'absent':
355
raise RevisionNotPresent([record.key[0]], self)
356
# adapt to non-tuple interface
357
parents = [parent[0] for parent in record.parents]
358
if record.storage_kind == 'fulltext':
359
self.add_lines(record.key[0], parents,
360
split_lines(record.get_bytes_as('fulltext')))
362
adapter_key = record.storage_kind, 'fulltext'
364
adapter = adapters[adapter_key]
366
adapter_factory = adapter_registry.get(adapter_key)
367
adapter = adapter_factory(self)
368
adapters[adapter_key] = adapter
369
lines = split_lines(adapter.get_bytes(
370
record, record.get_bytes_as(record.storage_kind)))
372
self.add_lines(record.key[0], parents, lines)
373
except RevisionAlreadyPresent:
376
def _check_repeated_add(self, name, parents, text, sha1):
377
"""Check that a duplicated add is OK.
379
If it is, return the (old) index; otherwise raise an exception.
381
idx = self._lookup(name)
382
if sorted(self._parents[idx]) != sorted(parents) \
383
or sha1 != self._sha1s[idx]:
384
raise RevisionAlreadyPresent(name, self._weave_name)
387
def _add_lines(self, version_id, parents, lines, parent_texts,
388
left_matching_blocks, nostore_sha, random_id, check_content):
389
"""See VersionedFile.add_lines."""
390
idx = self._add(version_id, lines, map(self._lookup, parents),
391
nostore_sha=nostore_sha)
392
return sha_strings(lines), sum(map(len, lines)), idx
394
def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
186
395
"""Add a single text on top of the weave.
188
397
Returns the index number of the newly added version.
400
Symbolic name for this version.
401
(Typically the revision-id of the revision that added it.)
191
404
List or set of direct parent version numbers.
194
Sequence of lines to be added in the new version."""
407
Sequence of lines to be added in the new version.
409
:param nostore_sha: See VersionedFile.add_lines.
411
self._check_lines_not_unicode(lines)
412
self._check_lines_are_lines(lines)
414
sha1 = sha_strings(lines)
415
if sha1 == nostore_sha:
416
raise errors.ExistingContent
417
if version_id in self._name_map:
418
return self._check_repeated_add(version_id, parents, lines, sha1)
196
420
self._check_versions(parents)
197
## self._check_lines(text)
421
## self._check_lines(lines)
198
422
new_version = len(self._parents)
206
# if we abort after here the weave will be corrupt
207
self._parents.append(frozenset(parents))
424
# if we abort after here the (in-memory) weave will be corrupt because only
425
# some fields are updated
426
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
427
# - Robert Collins 20060226
428
self._parents.append(parents[:])
208
429
self._sha1s.append(sha1)
430
self._names.append(version_id)
431
self._name_map[version_id] = new_version
378
588
lineno = 0 # line of weave, 0-based
380
590
for l in self._weave:
381
if isinstance(l, tuple):
591
if l.__class__ == tuple:
595
istack.append(self._names[v])
599
dset.add(self._names[v])
394
raise WeaveFormatError('unexpected instruction %r'
397
assert isinstance(l, basestring)
399
yield lineno, istack[-1], dset, l
404
def _extract(self, versions):
405
"""Yield annotation of lines in included set.
407
Yields a sequence of tuples (origin, lineno, text), where
408
origin is the origin version, lineno the index in the weave,
409
and text the text of the line.
411
The set typically but not necessarily corresponds to a version.
413
included = self.inclusions(versions)
418
lineno = 0 # line of weave, 0-based
424
WFE = WeaveFormatError
426
for l in self._weave:
427
if isinstance(l, tuple):
431
assert v not in istack
446
assert isinstance(l, basestring)
448
isactive = (not dset) and istack and (istack[-1] in included)
450
result.append((istack[-1], lineno, l))
601
dset.remove(self._names[v])
603
raise WeaveFormatError('unexpected instruction %r' % v)
605
yield lineno, istack[-1], frozenset(dset), l
454
raise WFE("unclosed insertion blocks at end of weave",
609
raise WeaveFormatError("unclosed insertion blocks "
610
"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)
489
def numversions(self):
490
l = len(self._parents)
491
assert l == len(self._sha1s)
496
return self.numversions()
499
def check(self, progress_bar=None):
500
# check no circular inclusions
501
for version in range(self.numversions()):
502
inclusions = list(self._parents[version])
505
if inclusions[-1] >= version:
506
raise WeaveFormatError("invalid included version %d for index %d"
507
% (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):
515
progress_bar.update('checking text', version, nv)
517
for l in self.get_iter(version):
520
expected = self._sha1s[version]
522
raise WeaveError("mismatched sha1 for version %d; "
523
"got %s, expected %s"
524
% (version, hd, expected))
526
# TODO: check insertions are properly nested, that there are
527
# no lines outside of insertion blocks, that deletions are
528
# 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.)
612
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
571
615
def plan_merge(self, ver_a, ver_b):
572
616
"""Return pseudo-annotation indicating how the two versions merge.
612
656
# not in either revision
613
657
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
659
def _extract(self, versions):
660
"""Yield annotation of lines in included set.
662
Yields a sequence of tuples (origin, lineno, text), where
663
origin is the origin version, lineno the index in the weave,
664
and text the text of the line.
666
The set typically but not necessarily corresponds to a version.
669
if not isinstance(i, int):
672
included = self._inclusions(versions)
678
lineno = 0 # line of weave, 0-based
684
WFE = WeaveFormatError
687
# 449 0 4474.6820 2356.5590 bzrlib.weave:556(_extract)
688
# +285282 0 1676.8040 1676.8040 +<isinstance>
689
# 1.6 seconds in 'isinstance'.
690
# changing the first isinstance:
691
# 449 0 2814.2660 1577.1760 bzrlib.weave:556(_extract)
692
# +140414 0 762.8050 762.8050 +<isinstance>
693
# note that the inline time actually dropped (less function calls)
694
# and total processing time was halved.
695
# we're still spending ~1/4 of the method in isinstance though.
696
# so lets hard code the acceptable string classes we expect:
697
# 449 0 1202.9420 786.2930 bzrlib.weave:556(_extract)
698
# +71352 0 377.5560 377.5560 +<method 'append' of 'list'
700
# yay, down to ~1/4 the initial extract time, and our inline time
701
# has shrunk again, with isinstance no longer dominating.
702
# tweaking the stack inclusion test to use a set gives:
703
# 449 0 1122.8030 713.0080 bzrlib.weave:556(_extract)
704
# +71352 0 354.9980 354.9980 +<method 'append' of 'list'
706
# - a 5% win, or possibly just noise. However with large istacks that
707
# 'in' test could dominate, so I'm leaving this change in place -
708
# when its fast enough to consider profiling big datasets we can review.
713
for l in self._weave:
714
if l.__class__ == tuple:
721
iset.remove(istack.pop())
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):
729
raise AssertionError()
732
isactive = (not dset) and istack and (istack[-1] in included)
734
result.append((istack[-1], lineno, l))
737
raise WeaveFormatError("unclosed insertion blocks "
738
"at end of weave: %s" % istack)
740
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
744
def _maybe_lookup(self, name_or_index):
745
"""Convert possible symbolic name to index, or pass through indexes.
749
if isinstance(name_or_index, (int, long)):
752
return self._lookup(name_or_index)
754
def get_lines(self, version_id):
755
"""See VersionedFile.get_lines()."""
756
int_index = self._maybe_lookup(version_id)
757
result = [line for (origin, lineno, line) in self._extract([int_index])]
758
expected_sha1 = self._sha1s[int_index]
759
measured_sha1 = sha_strings(result)
760
if measured_sha1 != expected_sha1:
761
raise errors.WeaveInvalidChecksum(
762
'file %s, revision %s, expected: %s, measured %s'
763
% (self._weave_name, version_id,
764
expected_sha1, measured_sha1))
767
def get_sha1s(self, version_ids):
768
"""See VersionedFile.get_sha1s()."""
770
for v in version_ids:
771
result[v] = self._sha1s[self._lookup(v)]
774
def num_versions(self):
775
"""How many versions are in this weave?"""
776
l = len(self._parents)
779
__len__ = num_versions
781
def check(self, progress_bar=None):
782
# TODO evaluate performance hit of using string sets in this routine.
783
# TODO: check no circular inclusions
784
# TODO: create a nested progress bar
785
for version in range(self.num_versions()):
786
inclusions = list(self._parents[version])
789
if inclusions[-1] >= version:
790
raise WeaveFormatError("invalid included version %d for index %d"
791
% (inclusions[-1], version))
793
# try extracting all versions; parallel extraction is used
794
nv = self.num_versions()
799
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
800
# The problem is that set membership is much more expensive
801
name = self._idx_to_name(i)
802
sha1s[name] = sha.new()
804
new_inc = set([name])
805
for p in self._parents[i]:
806
new_inc.update(inclusions[self._idx_to_name(p)])
808
if set(new_inc) != set(self.get_ancestry(name)):
809
raise AssertionError(
811
% (set(new_inc), set(self.get_ancestry(name))))
812
inclusions[name] = new_inc
814
nlines = len(self._weave)
816
update_text = 'checking weave'
818
short_name = os.path.basename(self._weave_name)
819
update_text = 'checking %s' % (short_name,)
820
update_text = update_text[:25]
822
for lineno, insert, deleteset, line in self._walk_internal():
824
progress_bar.update(update_text, lineno, nlines)
826
for name, name_inclusions in inclusions.items():
827
# The active inclusion must be an ancestor,
828
# and no ancestors must have deleted this line,
829
# because we don't support resurrection.
830
if (insert in name_inclusions) and not (deleteset & name_inclusions):
831
sha1s[name].update(line)
834
version = self._idx_to_name(i)
835
hd = sha1s[version].hexdigest()
836
expected = self._sha1s[i]
838
raise errors.WeaveInvalidChecksum(
839
"mismatched sha1 for version %s: "
840
"got %s, expected %s"
841
% (version, hd, expected))
843
# TODO: check insertions are properly nested, that there are
844
# no lines outside of insertion blocks, that deletions are
845
# properly paired, etc.
847
def _imported_parents(self, other, other_idx):
848
"""Return list of parents in self corresponding to indexes in other."""
850
for parent_idx in other._parents[other_idx]:
851
parent_name = other._names[parent_idx]
852
if parent_name not in self._name_map:
853
# should not be possible
854
raise WeaveError("missing parent {%s} of {%s} in %r"
855
% (parent_name, other._name_map[other_idx], self))
856
new_parents.append(self._name_map[parent_name])
859
def _check_version_consistent(self, other, other_idx, name):
860
"""Check if a version in consistent in this and other.
862
To be consistent it must have:
865
* the same direct parents (by name, not index, and disregarding
868
If present & correct return True;
869
if not present in self return False;
870
if inconsistent raise error."""
871
this_idx = self._name_map.get(name, -1)
873
if self._sha1s[this_idx] != other._sha1s[other_idx]:
874
raise errors.WeaveTextDiffers(name, self, other)
875
self_parents = self._parents[this_idx]
876
other_parents = other._parents[other_idx]
877
n1 = set([self._names[i] for i in self_parents])
878
n2 = set([other._names[i] for i in other_parents])
879
if not self._compatible_parents(n1, n2):
880
raise WeaveParentMismatch("inconsistent parents "
881
"for version {%s}: %s vs %s" % (name, n1, n2))
887
def _reweave(self, other, pb, msg):
888
"""Reweave self with other - internal helper for join().
890
:param other: The other weave to merge
891
:param pb: An optional progress bar, indicating how far done we are
892
:param msg: An optional message for the progress
894
new_weave = _reweave(self, other, pb=pb, msg=msg)
895
self._copy_weave_content(new_weave)
897
def _copy_weave_content(self, otherweave):
898
"""adsorb the content from otherweave."""
899
for attr in self.__slots__:
900
if attr != '_weave_name':
901
setattr(self, attr, copy(getattr(otherweave, attr)))
904
class WeaveFile(Weave):
905
"""A WeaveFile represents a Weave on disk and writes on change."""
907
WEAVE_SUFFIX = '.weave'
909
def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
910
"""Create a WeaveFile.
912
:param create: If not True, only open an existing knit.
914
super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
915
allow_reserved=False)
916
self._transport = transport
917
self._filemode = filemode
919
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
920
except errors.NoSuchFile:
926
def _add_lines(self, version_id, parents, lines, parent_texts,
927
left_matching_blocks, nostore_sha, random_id, check_content):
928
"""Add a version and save the weave."""
929
self.check_not_reserved_id(version_id)
930
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
931
parent_texts, left_matching_blocks, nostore_sha, random_id,
936
def copy_to(self, name, transport):
937
"""See VersionedFile.copy_to()."""
938
# as we are all in memory always, just serialise to the new place.
940
write_weave_v5(self, sio)
942
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
945
"""Save the weave."""
946
self._check_write_ok()
948
write_weave_v5(self, sio)
950
bytes = sio.getvalue()
951
path = self._weave_name + WeaveFile.WEAVE_SUFFIX
953
self._transport.put_bytes(path, bytes, self._filemode)
954
except errors.NoSuchFile:
955
self._transport.mkdir(dirname(path))
956
self._transport.put_bytes(path, bytes, self._filemode)
960
"""See VersionedFile.get_suffixes()."""
961
return [WeaveFile.WEAVE_SUFFIX]
963
def insert_record_stream(self, stream):
964
super(WeaveFile, self).insert_record_stream(stream)
967
@deprecated_method(one_five)
968
def join(self, other, pb=None, msg=None, version_ids=None,
969
ignore_missing=False):
970
"""Join other into self and save."""
971
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
975
def _reweave(wa, wb, pb=None, msg=None):
976
"""Combine two weaves and return the result.
978
This works even if a revision R has different parents in
979
wa and wb. In the resulting weave all the parents are given.
981
This is done by just building up a new weave, maintaining ordering
982
of the versions in the two inputs. More efficient approaches
983
might be possible but it should only be necessary to do
984
this operation rarely, when a new previously ghost version is
987
:param pb: An optional progress bar, indicating how far done we are
988
:param msg: An optional message for the progress
992
queue_a = range(wa.num_versions())
993
queue_b = range(wb.num_versions())
994
# first determine combined parents of all versions
995
# map from version name -> all parent names
996
combined_parents = _reweave_parent_graphs(wa, wb)
997
mutter("combined parents: %r", combined_parents)
998
order = topo_sort(combined_parents.iteritems())
999
mutter("order to reweave: %r", order)
1004
for idx, name in enumerate(order):
1006
pb.update(msg, idx, len(order))
1007
if name in wa._name_map:
1008
lines = wa.get_lines(name)
1009
if name in wb._name_map:
1010
lines_b = wb.get_lines(name)
1011
if lines != lines_b:
1012
mutter('Weaves differ on content. rev_id {%s}', name)
1013
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1015
lines = list(difflib.unified_diff(lines, lines_b,
1016
wa._weave_name, wb._weave_name))
1017
mutter('lines:\n%s', ''.join(lines))
1018
raise errors.WeaveTextDiffers(name, wa, wb)
1020
lines = wb.get_lines(name)
1021
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1024
def _reweave_parent_graphs(wa, wb):
1025
"""Return combined parent ancestry for two weaves.
1027
Returned as a list of (version_name, set(parent_names))"""
1029
for weave in [wa, wb]:
1030
for idx, name in enumerate(weave._names):
1031
p = combined.setdefault(name, set())
1032
p.update(map(weave._idx_to_name, weave._parents[idx]))
1037
"""Show the weave's table-of-contents"""
1038
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1039
for i in (6, 50, 10, 10):
679
for i in range(w.numversions()):
1042
for i in range(w.num_versions()):
680
1043
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
1045
parent_str = ' '.join(map(str, w._parents[i]))
1046
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1050
def weave_stats(weave_file, pb):
687
1051
from bzrlib.weavefile import read_weave
691
1053
wf = file(weave_file, 'rb')
692
1054
w = read_weave(wf)
693
1055
# FIXME: doesn't work on pipes
added
removed
bzrlib/weave.py
