66
66
# be done fairly efficiently because the sequence numbers constrain
67
67
# the possible relationships.
69
# FIXME: the conflict markers should be *7* characters
72
from cStringIO import StringIO
77
from bzrlib.lazy_import import lazy_import
78
lazy_import(globals(), """
79
from bzrlib import tsort
86
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
87
RevisionAlreadyPresent,
89
UnavailableRepresentation,
90
WeaveRevisionAlreadyPresent,
91
WeaveRevisionNotPresent,
93
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
94
import bzrlib.patiencediff
95
from bzrlib.revision import NULL_REVISION
96
from bzrlib.symbol_versioning import *
71
from difflib import SequenceMatcher
97
73
from bzrlib.trace import mutter
98
from bzrlib.versionedfile import (
104
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
107
class WeaveContentFactory(ContentFactory):
108
"""Content factory for streaming from weaves.
110
:seealso ContentFactory:
113
def __init__(self, version, weave):
114
"""Create a WeaveContentFactory for version from weave."""
115
ContentFactory.__init__(self)
116
self.sha1 = weave.get_sha1s([version])[version]
117
self.key = (version,)
118
parents = weave.get_parent_map([version])[version]
119
self.parents = tuple((parent,) for parent in parents)
120
self.storage_kind = 'fulltext'
123
def get_bytes_as(self, storage_kind):
124
if storage_kind == 'fulltext':
125
return self._weave.get_text(self.key[-1])
126
elif storage_kind == 'chunked':
127
return self._weave.get_lines(self.key[-1])
129
raise UnavailableRepresentation(self.key, storage_kind, 'fulltext')
132
class Weave(VersionedFile):
74
from bzrlib.errors import WeaveError, WeaveFormatError, WeaveParentMismatch, \
75
WeaveRevisionNotPresent, WeaveRevisionAlreadyPresent
76
from bzrlib.tsort import topo_sort
133
80
"""weave - versioned text file storage.
135
82
A Weave manages versions of line-based text files, keeping track
276
199
return self._parents == other._parents \
277
200
and self._weave == other._weave \
278
201
and self._sha1s == other._sha1s
280
204
def __ne__(self, other):
281
205
return not self.__eq__(other)
283
def _idx_to_name(self, version):
284
return self._names[version]
286
def _lookup(self, name):
207
def __contains__(self, name):
208
return self._name_map.has_key(name)
210
def maybe_lookup(self, name_or_index):
211
"""Convert possible symbolic name to index, or pass through indexes."""
212
if isinstance(name_or_index, (int, long)):
215
return self.lookup(name_or_index)
218
def lookup(self, name):
287
219
"""Convert symbolic version name to index."""
288
if not self._allow_reserved:
289
self.check_not_reserved_id(name)
291
221
return self._name_map[name]
293
raise RevisionNotPresent(name, self._weave_name)
223
raise WeaveRevisionNotPresent(name, self)
296
"""See VersionedFile.versions."""
297
226
return self._names[:]
299
def has_version(self, version_id):
300
"""See VersionedFile.has_version."""
301
return (version_id in self._name_map)
303
__contains__ = has_version
305
def get_record_stream(self, versions, ordering, include_delta_closure):
306
"""Get a stream of records for versions.
308
:param versions: The versions to include. Each version is a tuple
310
:param ordering: Either 'unordered' or 'topological'. A topologically
311
sorted stream has compression parents strictly before their
313
:param include_delta_closure: If True then the closure across any
314
compression parents will be included (in the opaque data).
315
:return: An iterator of ContentFactory objects, each of which is only
316
valid until the iterator is advanced.
318
versions = [version[-1] for version in versions]
319
if ordering == 'topological':
320
parents = self.get_parent_map(versions)
321
new_versions = tsort.topo_sort(parents)
322
new_versions.extend(set(versions).difference(set(parents)))
323
versions = new_versions
324
for version in versions:
326
yield WeaveContentFactory(version, self)
328
yield AbsentContentFactory((version,))
330
def get_parent_map(self, version_ids):
331
"""See VersionedFile.get_parent_map."""
333
for version_id in version_ids:
334
if version_id == NULL_REVISION:
339
map(self._idx_to_name,
340
self._parents[self._lookup(version_id)]))
341
except RevisionNotPresent:
343
result[version_id] = parents
346
def get_parents_with_ghosts(self, version_id):
347
raise NotImplementedError(self.get_parents_with_ghosts)
349
def insert_record_stream(self, stream):
350
"""Insert a record stream into this versioned file.
352
:param stream: A stream of records to insert.
354
:seealso VersionedFile.get_record_stream:
357
for record in stream:
358
# Raise an error when a record is missing.
359
if record.storage_kind == 'absent':
360
raise RevisionNotPresent([record.key[0]], self)
361
# adapt to non-tuple interface
362
parents = [parent[0] for parent in record.parents]
363
if (record.storage_kind == 'fulltext'
364
or record.storage_kind == 'chunked'):
365
self.add_lines(record.key[0], parents,
366
osutils.chunks_to_lines(record.get_bytes_as('chunked')))
368
adapter_key = record.storage_kind, 'fulltext'
370
adapter = adapters[adapter_key]
372
adapter_factory = adapter_registry.get(adapter_key)
373
adapter = adapter_factory(self)
374
adapters[adapter_key] = adapter
375
lines = split_lines(adapter.get_bytes(
376
record, record.get_bytes_as(record.storage_kind)))
378
self.add_lines(record.key[0], parents, lines)
379
except RevisionAlreadyPresent:
228
def iter_names(self):
229
"""Yield a list of all names in this weave."""
230
return iter(self._names)
232
def idx_to_name(self, version):
233
return self._names[version]
382
235
def _check_repeated_add(self, name, parents, text, sha1):
383
236
"""Check that a duplicated add is OK.
385
238
If it is, return the (old) index; otherwise raise an exception.
387
idx = self._lookup(name)
240
idx = self.lookup(name)
388
241
if sorted(self._parents[idx]) != sorted(parents) \
389
242
or sha1 != self._sha1s[idx]:
390
raise RevisionAlreadyPresent(name, self._weave_name)
243
raise WeaveRevisionAlreadyPresent(name, self)
393
def _add_lines(self, version_id, parents, lines, parent_texts,
394
left_matching_blocks, nostore_sha, random_id, check_content):
395
"""See VersionedFile.add_lines."""
396
idx = self._add(version_id, lines, map(self._lookup, parents),
397
nostore_sha=nostore_sha)
398
return sha_strings(lines), sum(map(len, lines)), idx
400
def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
246
def add(self, name, parents, text, sha1=None):
401
247
"""Add a single text on top of the weave.
403
249
Returns the index number of the newly added version.
406
252
Symbolic name for this version.
407
253
(Typically the revision-id of the revision that added it.)
410
256
List or set of direct parent version numbers.
413
259
Sequence of lines to be added in the new version.
415
:param nostore_sha: See VersionedFile.add_lines.
261
sha -- SHA-1 of the file, if known. This is trusted to be
417
self._check_lines_not_unicode(lines)
418
self._check_lines_are_lines(lines)
420
sha1 = sha_strings(lines)
421
if sha1 == nostore_sha:
422
raise errors.ExistingContent
423
if version_id in self._name_map:
424
return self._check_repeated_add(version_id, parents, lines, sha1)
264
from bzrlib.osutils import sha_strings
266
assert isinstance(name, basestring)
268
sha1 = sha_strings(text)
269
if name in self._name_map:
270
return self._check_repeated_add(name, parents, text, sha1)
272
parents = map(self.maybe_lookup, parents)
426
273
self._check_versions(parents)
427
## self._check_lines(lines)
274
## self._check_lines(text)
428
275
new_version = len(self._parents)
430
278
# if we abort after here the (in-memory) weave will be corrupt because only
431
279
# some fields are updated
432
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
433
# - Robert Collins 20060226
434
280
self._parents.append(parents[:])
435
281
self._sha1s.append(sha1)
436
self._names.append(version_id)
437
self._name_map[version_id] = new_version
282
self._names.append(name)
283
self._name_map[name] = new_version
553
436
except IndexError:
554
437
raise IndexError("invalid version number %r" % i)
556
def _compatible_parents(self, my_parents, other_parents):
557
"""During join check that other_parents are joinable with my_parents.
559
Joinable is defined as 'is a subset of' - supersets may require
560
regeneration of diffs, but subsets do not.
562
return len(other_parents.difference(my_parents)) == 0
564
def annotate(self, version_id):
565
"""Return a list of (version-id, line) tuples for version_id.
440
def annotate(self, name_or_index):
441
return list(self.annotate_iter(name_or_index))
444
def annotate_iter(self, name_or_index):
445
"""Yield list of (index-id, line) pairs for the specified version.
567
447
The index indicates when the line originated in the weave."""
568
incls = [self._lookup(version_id)]
569
return [(self._idx_to_name(origin), text) for origin, lineno, text in
570
self._extract(incls)]
572
def iter_lines_added_or_present_in_versions(self, version_ids=None,
574
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
575
if version_ids is None:
576
version_ids = self.versions()
577
version_ids = set(version_ids)
578
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
579
# if inserted not in version_ids then it was inserted before the
580
# versions we care about, but because weaves cannot represent ghosts
581
# properly, we do not filter down to that
582
# if inserted not in version_ids: continue
584
yield line + '\n', inserted
588
def _walk_internal(self, version_ids=None):
589
"""Helper method for weave actions."""
448
incls = [self.maybe_lookup(name_or_index)]
449
for origin, lineno, text in self._extract(incls):
456
(lineno, insert, deletes, text)
457
for each literal line.
594
463
lineno = 0 # line of weave, 0-based
596
465
for l in self._weave:
597
if l.__class__ == tuple:
466
if isinstance(l, tuple):
601
istack.append(self._names[v])
605
dset.add(self._names[v])
607
dset.remove(self._names[v])
609
479
raise WeaveFormatError('unexpected instruction %r' % v)
611
yield lineno, istack[-1], frozenset(dset), l
481
assert isinstance(l, basestring)
483
yield lineno, istack[-1], dset, l
488
def _extract(self, versions):
489
"""Yield annotation of lines in included set.
491
Yields a sequence of tuples (origin, lineno, text), where
492
origin is the origin version, lineno the index in the weave,
493
and text the text of the line.
495
The set typically but not necessarily corresponds to a version.
498
if not isinstance(i, int):
501
included = self.inclusions(versions)
506
lineno = 0 # line of weave, 0-based
512
WFE = WeaveFormatError
514
for l in self._weave:
515
if isinstance(l, tuple):
519
assert v not in istack
533
assert isinstance(l, basestring)
535
isactive = (not dset) and istack and (istack[-1] in included)
537
result.append((istack[-1], lineno, l))
615
540
raise WeaveFormatError("unclosed insertion blocks "
616
541
"at end of weave: %s" % istack)
618
543
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
548
def get_iter(self, name_or_index):
549
"""Yield lines for the specified version."""
550
incls = [self.maybe_lookup(name_or_index)]
551
for origin, lineno, line in self._extract(incls):
555
def get_text(self, name_or_index):
556
return ''.join(self.get_iter(name_or_index))
557
assert isinstance(version, int)
560
def get_lines(self, name_or_index):
561
return list(self.get_iter(name_or_index))
567
def mash_iter(self, included):
568
"""Return composed version of multiple included versions."""
569
included = map(self.maybe_lookup, included)
570
for origin, lineno, text in self._extract(included):
574
def dump(self, to_file):
575
from pprint import pprint
576
print >>to_file, "Weave._weave = ",
577
pprint(self._weave, to_file)
578
print >>to_file, "Weave._parents = ",
579
pprint(self._parents, to_file)
583
def numversions(self):
584
l = len(self._parents)
585
assert l == len(self._sha1s)
590
return self.numversions()
593
def check(self, progress_bar=None):
594
# check no circular inclusions
595
for version in range(self.numversions()):
596
inclusions = list(self._parents[version])
599
if inclusions[-1] >= version:
600
raise WeaveFormatError("invalid included version %d for index %d"
601
% (inclusions[-1], version))
603
# try extracting all versions; this is a bit slow and parallel
604
# extraction could be used
605
nv = self.numversions()
606
for version in range(nv):
608
progress_bar.update('checking text', version, nv)
610
for l in self.get_iter(version):
613
expected = self._sha1s[version]
615
raise WeaveError("mismatched sha1 for version %d; "
616
"got %s, expected %s"
617
% (version, hd, expected))
619
# TODO: check insertions are properly nested, that there are
620
# no lines outside of insertion blocks, that deletions are
621
# properly paired, etc.
624
def _delta(self, included, lines):
625
"""Return changes from basis to new revision.
627
The old text for comparison is the union of included revisions.
629
This is used in inserting a new text.
631
Delta is returned as a sequence of
632
(weave1, weave2, newlines).
634
This indicates that weave1:weave2 of the old weave should be
635
replaced by the sequence of lines in newlines. Note that
636
these line numbers are positions in the total weave and don't
637
correspond to the lines in any extracted version, or even the
638
extracted union of included versions.
640
If line1=line2, this is a pure insert; if newlines=[] this is a
641
pure delete. (Similar to difflib.)
643
raise NotImplementedError()
621
646
def plan_merge(self, ver_a, ver_b):
622
647
"""Return pseudo-annotation indicating how the two versions merge.
662
687
# not in either revision
663
688
yield 'irrelevant', line
665
def _extract(self, versions):
666
"""Yield annotation of lines in included set.
668
Yields a sequence of tuples (origin, lineno, text), where
669
origin is the origin version, lineno the index in the weave,
670
and text the text of the line.
672
The set typically but not necessarily corresponds to a version.
675
if not isinstance(i, int):
678
included = self._inclusions(versions)
684
lineno = 0 # line of weave, 0-based
690
WFE = WeaveFormatError
693
# 449 0 4474.6820 2356.5590 bzrlib.weave:556(_extract)
694
# +285282 0 1676.8040 1676.8040 +<isinstance>
695
# 1.6 seconds in 'isinstance'.
696
# changing the first isinstance:
697
# 449 0 2814.2660 1577.1760 bzrlib.weave:556(_extract)
698
# +140414 0 762.8050 762.8050 +<isinstance>
699
# note that the inline time actually dropped (less function calls)
700
# and total processing time was halved.
701
# we're still spending ~1/4 of the method in isinstance though.
702
# so lets hard code the acceptable string classes we expect:
703
# 449 0 1202.9420 786.2930 bzrlib.weave:556(_extract)
704
# +71352 0 377.5560 377.5560 +<method 'append' of 'list'
706
# yay, down to ~1/4 the initial extract time, and our inline time
707
# has shrunk again, with isinstance no longer dominating.
708
# tweaking the stack inclusion test to use a set gives:
709
# 449 0 1122.8030 713.0080 bzrlib.weave:556(_extract)
710
# +71352 0 354.9980 354.9980 +<method 'append' of 'list'
712
# - a 5% win, or possibly just noise. However with large istacks that
713
# 'in' test could dominate, so I'm leaving this change in place -
714
# when its fast enough to consider profiling big datasets we can review.
719
for l in self._weave:
720
if l.__class__ == tuple:
727
iset.remove(istack.pop())
690
yield 'unchanged', '' # terminator
694
def weave_merge(self, plan):
699
for state, line in plan:
700
if state == 'unchanged' or state == 'killed-both':
701
# resync and flush queued conflicts changes if any
702
if not lines_a and not lines_b:
704
elif ch_a and not ch_b:
706
for l in lines_a: yield l
707
elif ch_b and not ch_a:
708
for l in lines_b: yield l
709
elif lines_a == lines_b:
710
for l in lines_a: yield l
735
raise AssertionError()
713
for l in lines_a: yield l
715
for l in lines_b: yield l
722
if state == 'unchanged':
725
elif state == 'killed-a':
728
elif state == 'killed-b':
731
elif state == 'new-a':
734
elif state == 'new-b':
738
isactive = (not dset) and istack and (istack[-1] in included)
740
result.append((istack[-1], lineno, l))
743
raise WeaveFormatError("unclosed insertion blocks "
744
"at end of weave: %s" % istack)
746
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
750
def _maybe_lookup(self, name_or_index):
751
"""Convert possible symbolic name to index, or pass through indexes.
738
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
743
def join(self, other):
744
"""Integrate versions from other into this weave.
746
The resulting weave contains all the history of both weaves;
747
any version you could retrieve from either self or other can be
748
retrieved from self after this call.
750
It is illegal for the two weaves to contain different values
751
or different parents for any version. See also reweave().
755
if isinstance(name_or_index, (int, long)):
758
return self._lookup(name_or_index)
760
def get_lines(self, version_id):
761
"""See VersionedFile.get_lines()."""
762
int_index = self._maybe_lookup(version_id)
763
result = [line for (origin, lineno, line) in self._extract([int_index])]
764
expected_sha1 = self._sha1s[int_index]
765
measured_sha1 = sha_strings(result)
766
if measured_sha1 != expected_sha1:
767
raise errors.WeaveInvalidChecksum(
768
'file %s, revision %s, expected: %s, measured %s'
769
% (self._weave_name, version_id,
770
expected_sha1, measured_sha1))
773
def get_sha1s(self, version_ids):
774
"""See VersionedFile.get_sha1s()."""
776
for v in version_ids:
777
result[v] = self._sha1s[self._lookup(v)]
780
def num_versions(self):
781
"""How many versions are in this weave?"""
782
l = len(self._parents)
785
__len__ = num_versions
787
def check(self, progress_bar=None):
788
# TODO evaluate performance hit of using string sets in this routine.
789
# TODO: check no circular inclusions
790
# TODO: create a nested progress bar
791
for version in range(self.num_versions()):
792
inclusions = list(self._parents[version])
795
if inclusions[-1] >= version:
796
raise WeaveFormatError("invalid included version %d for index %d"
797
% (inclusions[-1], version))
799
# try extracting all versions; parallel extraction is used
800
nv = self.num_versions()
805
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
806
# The problem is that set membership is much more expensive
807
name = self._idx_to_name(i)
810
new_inc = set([name])
811
for p in self._parents[i]:
812
new_inc.update(inclusions[self._idx_to_name(p)])
814
if set(new_inc) != set(self.get_ancestry(name)):
815
raise AssertionError(
817
% (set(new_inc), set(self.get_ancestry(name))))
818
inclusions[name] = new_inc
820
nlines = len(self._weave)
822
update_text = 'checking weave'
824
short_name = os.path.basename(self._weave_name)
825
update_text = 'checking %s' % (short_name,)
826
update_text = update_text[:25]
828
for lineno, insert, deleteset, line in self._walk_internal():
830
progress_bar.update(update_text, lineno, nlines)
832
for name, name_inclusions in inclusions.items():
833
# The active inclusion must be an ancestor,
834
# and no ancestors must have deleted this line,
835
# because we don't support resurrection.
836
if (insert in name_inclusions) and not (deleteset & name_inclusions):
837
sha1s[name].update(line)
840
version = self._idx_to_name(i)
841
hd = sha1s[version].hexdigest()
842
expected = self._sha1s[i]
844
raise errors.WeaveInvalidChecksum(
845
"mismatched sha1 for version %s: "
846
"got %s, expected %s"
847
% (version, hd, expected))
849
# TODO: check insertions are properly nested, that there are
850
# no lines outside of insertion blocks, that deletions are
851
# properly paired, etc.
753
if other.numversions() == 0:
754
return # nothing to update, easy
755
# two loops so that we do not change ourselves before verifying it
757
# work through in index order to make sure we get all dependencies
758
for other_idx, name in enumerate(other._names):
759
if self._check_version_consistent(other, other_idx, name):
761
for other_idx, name in enumerate(other._names):
762
# TODO: If all the parents of the other version are already
763
# present then we can avoid some work by just taking the delta
764
# and adjusting the offsets.
765
new_parents = self._imported_parents(other, other_idx)
766
lines = other.get_lines(other_idx)
767
sha1 = other._sha1s[other_idx]
768
self.add(name, new_parents, lines, sha1)
853
771
def _imported_parents(self, other, other_idx):
854
772
"""Return list of parents in self corresponding to indexes in other."""
856
774
for parent_idx in other._parents[other_idx]:
857
775
parent_name = other._names[parent_idx]
858
if parent_name not in self._name_map:
776
if parent_name not in self._names:
859
777
# should not be possible
860
778
raise WeaveError("missing parent {%s} of {%s} in %r"
861
779
% (parent_name, other._name_map[other_idx], self))
893
def _reweave(self, other, pb, msg):
894
"""Reweave self with other - internal helper for join().
896
:param other: The other weave to merge
897
:param pb: An optional progress bar, indicating how far done we are
898
:param msg: An optional message for the progress
900
new_weave = _reweave(self, other, pb=pb, msg=msg)
901
self._copy_weave_content(new_weave)
903
def _copy_weave_content(self, otherweave):
904
"""adsorb the content from otherweave."""
815
def reweave(self, other):
816
"""Reweave self with other."""
817
new_weave = reweave(self, other)
905
818
for attr in self.__slots__:
906
if attr != '_weave_name':
907
setattr(self, attr, copy(getattr(otherweave, attr)))
910
class WeaveFile(Weave):
911
"""A WeaveFile represents a Weave on disk and writes on change."""
913
WEAVE_SUFFIX = '.weave'
915
def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
916
"""Create a WeaveFile.
918
:param create: If not True, only open an existing knit.
920
super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
921
allow_reserved=False)
922
self._transport = transport
923
self._filemode = filemode
925
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
926
except errors.NoSuchFile:
932
def _add_lines(self, version_id, parents, lines, parent_texts,
933
left_matching_blocks, nostore_sha, random_id, check_content):
934
"""Add a version and save the weave."""
935
self.check_not_reserved_id(version_id)
936
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
937
parent_texts, left_matching_blocks, nostore_sha, random_id,
942
def copy_to(self, name, transport):
943
"""See VersionedFile.copy_to()."""
944
# as we are all in memory always, just serialise to the new place.
946
write_weave_v5(self, sio)
948
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
951
"""Save the weave."""
952
self._check_write_ok()
954
write_weave_v5(self, sio)
956
bytes = sio.getvalue()
957
path = self._weave_name + WeaveFile.WEAVE_SUFFIX
959
self._transport.put_bytes(path, bytes, self._filemode)
960
except errors.NoSuchFile:
961
self._transport.mkdir(dirname(path))
962
self._transport.put_bytes(path, bytes, self._filemode)
966
"""See VersionedFile.get_suffixes()."""
967
return [WeaveFile.WEAVE_SUFFIX]
969
def insert_record_stream(self, stream):
970
super(WeaveFile, self).insert_record_stream(stream)
973
@deprecated_method(one_five)
974
def join(self, other, pb=None, msg=None, version_ids=None,
975
ignore_missing=False):
976
"""Join other into self and save."""
977
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
981
def _reweave(wa, wb, pb=None, msg=None):
819
setattr(self, attr, getattr(new_weave, attr))
982
823
"""Combine two weaves and return the result.
984
825
This works even if a revision R has different parents in
989
830
might be possible but it should only be necessary to do
990
831
this operation rarely, when a new previously ghost version is
993
:param pb: An optional progress bar, indicating how far done we are
994
:param msg: An optional message for the progress
998
queue_a = range(wa.num_versions())
999
queue_b = range(wb.num_versions())
836
queue_a = range(wa.numversions())
837
queue_b = range(wb.numversions())
1000
838
# first determine combined parents of all versions
1001
839
# map from version name -> all parent names
1002
840
combined_parents = _reweave_parent_graphs(wa, wb)
1003
841
mutter("combined parents: %r", combined_parents)
1004
order = tsort.topo_sort(combined_parents.iteritems())
842
order = topo_sort(combined_parents.iteritems())
1005
843
mutter("order to reweave: %r", order)
1010
for idx, name in enumerate(order):
1012
pb.update(msg, idx, len(order))
1013
845
if name in wa._name_map:
1014
846
lines = wa.get_lines(name)
1015
847
if name in wb._name_map:
1016
lines_b = wb.get_lines(name)
1017
if lines != lines_b:
1018
mutter('Weaves differ on content. rev_id {%s}', name)
1019
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1021
lines = list(difflib.unified_diff(lines, lines_b,
1022
wa._weave_name, wb._weave_name))
1023
mutter('lines:\n%s', ''.join(lines))
1024
raise errors.WeaveTextDiffers(name, wa, wb)
848
assert lines == wb.get_lines(name)
1026
850
lines = wb.get_lines(name)
1027
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
851
wr.add(name, combined_parents[name], lines)
1030
855
def _reweave_parent_graphs(wa, wb):
1031
856
"""Return combined parent ancestry for two weaves.
1223
1055
print ' '.join(map(str, w._parents[int(argv[3])]))
1225
1057
elif cmd == 'plan-merge':
1226
# replaced by 'bzr weave-plan-merge'
1228
1059
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1230
1061
print '%14s | %s' % (state, line),
1231
1063
elif cmd == 'merge':
1232
# replaced by 'bzr weave-merge-text'
1234
1065
p = w.plan_merge(int(argv[3]), int(argv[4]))
1235
1066
sys.stdout.writelines(w.weave_merge(p))
1068
elif cmd == 'mash-merge':
1074
v1, v2 = map(int, argv[3:5])
1076
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
1078
base_lines = list(w.mash_iter(basis))
1079
a_lines = list(w.get(v1))
1080
b_lines = list(w.get(v2))
1082
from bzrlib.merge3 import Merge3
1083
m3 = Merge3(base_lines, a_lines, b_lines)
1085
name_a = 'version %d' % v1
1086
name_b = 'version %d' % v2
1087
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1237
1089
raise ValueError('unknown command %r' % cmd)
1093
def profile_main(argv):
1094
import tempfile, hotshot, hotshot.stats
1096
prof_f = tempfile.NamedTemporaryFile()
1098
prof = hotshot.Profile(prof_f.name)
1100
ret = prof.runcall(main, argv)
1103
stats = hotshot.stats.load(prof_f.name)
1105
stats.sort_stats('cumulative')
1106
## XXX: Might like to write to stderr or the trace file instead but
1107
## print_stats seems hardcoded to stdout
1108
stats.print_stats(20)
1240
1113
if __name__ == '__main__':
1242
sys.exit(main(sys.argv))
1115
if '--profile' in sys.argv:
1117
args.remove('--profile')
1118
sys.exit(profile_main(args))
1120
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
