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
71
from difflib import SequenceMatcher
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
73
from bzrlib.trace import mutter
74
from bzrlib.errors import WeaveError, WeaveFormatError, WeaveParentMismatch, \
75
WeaveRevisionNotPresent, WeaveRevisionAlreadyPresent
94
76
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):
128
80
"""weave - versioned text file storage.
130
82
A Weave manages versions of line-based text files, keeping track
271
199
return self._parents == other._parents \
272
200
and self._weave == other._weave \
273
201
and self._sha1s == other._sha1s
275
204
def __ne__(self, other):
276
205
return not self.__eq__(other)
278
def _idx_to_name(self, version):
279
return self._names[version]
281
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):
282
219
"""Convert symbolic version name to index."""
283
if not self._allow_reserved:
284
self.check_not_reserved_id(name)
286
221
return self._name_map[name]
288
raise RevisionNotPresent(name, self._weave_name)
223
raise WeaveRevisionNotPresent(name, self)
291
"""See VersionedFile.versions."""
292
226
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:
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]
376
235
def _check_repeated_add(self, name, parents, text, sha1):
377
236
"""Check that a duplicated add is OK.
379
238
If it is, return the (old) index; otherwise raise an exception.
381
idx = self._lookup(name)
240
idx = self.lookup(name)
382
241
if sorted(self._parents[idx]) != sorted(parents) \
383
242
or sha1 != self._sha1s[idx]:
384
raise RevisionAlreadyPresent(name, self._weave_name)
243
raise WeaveRevisionAlreadyPresent(name, self)
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):
246
def add(self, name, parents, text, sha1=None):
395
247
"""Add a single text on top of the weave.
397
249
Returns the index number of the newly added version.
400
252
Symbolic name for this version.
401
253
(Typically the revision-id of the revision that added it.)
404
256
List or set of direct parent version numbers.
407
259
Sequence of lines to be added in the new version.
409
:param nostore_sha: See VersionedFile.add_lines.
261
sha -- SHA-1 of the file, if known. This is trusted to be
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)
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)
420
273
self._check_versions(parents)
421
## self._check_lines(lines)
274
## self._check_lines(text)
422
275
new_version = len(self._parents)
424
278
# if we abort after here the (in-memory) weave will be corrupt because only
425
279
# some fields are updated
426
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
427
# - Robert Collins 20060226
428
280
self._parents.append(parents[:])
429
281
self._sha1s.append(sha1)
430
self._names.append(version_id)
431
self._name_map[version_id] = new_version
282
self._names.append(name)
283
self._name_map[name] = new_version
547
436
except IndexError:
548
437
raise IndexError("invalid version number %r" % i)
550
def _compatible_parents(self, my_parents, other_parents):
551
"""During join check that other_parents are joinable with my_parents.
553
Joinable is defined as 'is a subset of' - supersets may require
554
regeneration of diffs, but subsets do not.
556
return len(other_parents.difference(my_parents)) == 0
558
def annotate(self, version_id):
559
"""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.
561
447
The index indicates when the line originated in the weave."""
562
incls = [self._lookup(version_id)]
563
return [(self._idx_to_name(origin), text) for origin, lineno, text in
564
self._extract(incls)]
566
def iter_lines_added_or_present_in_versions(self, version_ids=None,
568
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
569
if version_ids is None:
570
version_ids = self.versions()
571
version_ids = set(version_ids)
572
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
573
# if inserted not in version_ids then it was inserted before the
574
# versions we care about, but because weaves cannot represent ghosts
575
# properly, we do not filter down to that
576
# if inserted not in version_ids: continue
578
yield line + '\n', inserted
582
def _walk_internal(self, version_ids=None):
583
"""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.
588
463
lineno = 0 # line of weave, 0-based
590
465
for l in self._weave:
591
if l.__class__ == tuple:
466
if isinstance(l, tuple):
595
istack.append(self._names[v])
599
dset.add(self._names[v])
601
dset.remove(self._names[v])
603
479
raise WeaveFormatError('unexpected instruction %r' % v)
605
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))
609
540
raise WeaveFormatError("unclosed insertion blocks "
610
541
"at end of weave: %s" % istack)
612
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.
625
def merge(self, merge_versions):
626
"""Automerge and mark conflicts between versions.
628
This returns a sequence, each entry describing alternatives
629
for a chunk of the file. Each of the alternatives is given as
632
If there is a chunk of the file where there's no diagreement,
633
only one alternative is given.
635
# approach: find the included versions common to all the
637
raise NotImplementedError()
641
def _delta(self, included, lines):
642
"""Return changes from basis to new revision.
644
The old text for comparison is the union of included revisions.
646
This is used in inserting a new text.
648
Delta is returned as a sequence of
649
(weave1, weave2, newlines).
651
This indicates that weave1:weave2 of the old weave should be
652
replaced by the sequence of lines in newlines. Note that
653
these line numbers are positions in the total weave and don't
654
correspond to the lines in any extracted version, or even the
655
extracted union of included versions.
657
If line1=line2, this is a pure insert; if newlines=[] this is a
658
pure delete. (Similar to difflib.)
660
raise NotImplementedError()
615
663
def plan_merge(self, ver_a, ver_b):
616
664
"""Return pseudo-annotation indicating how the two versions merge.
656
704
# not in either revision
657
705
yield 'irrelevant', line
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())
707
yield 'unchanged', '' # terminator
711
def weave_merge(self, plan):
716
for state, line in plan:
717
if state == 'unchanged' or state == 'killed-both':
718
# resync and flush queued conflicts changes if any
719
if not lines_a and not lines_b:
721
elif ch_a and not ch_b:
723
for l in lines_a: yield l
724
elif ch_b and not ch_a:
725
for l in lines_b: yield l
726
elif lines_a == lines_b:
727
for l in lines_a: yield l
729
raise AssertionError()
730
for l in lines_a: yield l
732
for l in lines_b: yield l
739
if state == 'unchanged':
742
elif state == 'killed-a':
745
elif state == 'killed-b':
748
elif state == 'new-a':
751
elif state == 'new-b':
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.
755
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
760
def join(self, other):
761
"""Integrate versions from other into this weave.
763
The resulting weave contains all the history of both weaves;
764
any version you could retrieve from either self or other can be
765
retrieved from self after this call.
767
It is illegal for the two weaves to contain different values
768
or different parents for any version. See also reweave().
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.
770
if other.numversions() == 0:
771
return # nothing to update, easy
772
# two loops so that we do not change ourselves before verifying it
774
# work through in index order to make sure we get all dependencies
775
for other_idx, name in enumerate(other._names):
776
if self._check_version_consistent(other, other_idx, name):
778
for other_idx, name in enumerate(other._names):
779
# TODO: If all the parents of the other version are already
780
# present then we can avoid some work by just taking the delta
781
# and adjusting the offsets.
782
new_parents = self._imported_parents(other, other_idx)
783
lines = other.get_lines(other_idx)
784
sha1 = other._sha1s[other_idx]
785
self.add(name, new_parents, lines, sha1)
847
788
def _imported_parents(self, other, other_idx):
848
789
"""Return list of parents in self corresponding to indexes in other."""
850
791
for parent_idx in other._parents[other_idx]:
851
792
parent_name = other._names[parent_idx]
852
if parent_name not in self._name_map:
793
if parent_name not in self._names:
853
794
# should not be possible
854
795
raise WeaveError("missing parent {%s} of {%s} in %r"
855
796
% (parent_name, other._name_map[other_idx], self))
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."""
832
def reweave(self, other):
833
"""Reweave self with other."""
834
new_weave = reweave(self, other)
899
835
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):
836
setattr(self, attr, getattr(new_weave, attr))
976
840
"""Combine two weaves and return the result.
978
842
This works even if a revision R has different parents in
983
847
might be possible but it should only be necessary to do
984
848
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())
853
queue_a = range(wa.numversions())
854
queue_b = range(wb.numversions())
994
855
# first determine combined parents of all versions
995
856
# map from version name -> all parent names
996
857
combined_parents = _reweave_parent_graphs(wa, wb)
997
858
mutter("combined parents: %r", combined_parents)
998
859
order = topo_sort(combined_parents.iteritems())
999
860
mutter("order to reweave: %r", order)
1004
for idx, name in enumerate(order):
1006
pb.update(msg, idx, len(order))
1007
862
if name in wa._name_map:
1008
863
lines = wa.get_lines(name)
1009
864
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)
865
assert lines == wb.get_lines(name)
1020
867
lines = wb.get_lines(name)
1021
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
868
wr.add(name, combined_parents[name], lines)
1024
872
def _reweave_parent_graphs(wa, wb):
1025
873
"""Return combined parent ancestry for two weaves.
1217
1072
print ' '.join(map(str, w._parents[int(argv[3])]))
1219
1074
elif cmd == 'plan-merge':
1220
# replaced by 'bzr weave-plan-merge'
1222
1076
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1224
1078
print '%14s | %s' % (state, line),
1225
1080
elif cmd == 'merge':
1226
# replaced by 'bzr weave-merge-text'
1228
1082
p = w.plan_merge(int(argv[3]), int(argv[4]))
1229
1083
sys.stdout.writelines(w.weave_merge(p))
1085
elif cmd == 'mash-merge':
1091
v1, v2 = map(int, argv[3:5])
1093
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
1095
base_lines = list(w.mash_iter(basis))
1096
a_lines = list(w.get(v1))
1097
b_lines = list(w.get(v2))
1099
from bzrlib.merge3 import Merge3
1100
m3 = Merge3(base_lines, a_lines, b_lines)
1102
name_a = 'version %d' % v1
1103
name_b = 'version %d' % v2
1104
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1231
1106
raise ValueError('unknown command %r' % cmd)
1110
def profile_main(argv):
1111
import tempfile, hotshot, hotshot.stats
1113
prof_f = tempfile.NamedTemporaryFile()
1115
prof = hotshot.Profile(prof_f.name)
1117
ret = prof.runcall(main, argv)
1120
stats = hotshot.stats.load(prof_f.name)
1122
stats.sort_stats('cumulative')
1123
## XXX: Might like to write to stderr or the trace file instead but
1124
## print_stats seems hardcoded to stdout
1125
stats.print_stats(20)
1234
1130
if __name__ == '__main__':
1236
sys.exit(main(sys.argv))
1132
if '--profile' in sys.argv:
1134
args.remove('--profile')
1135
sys.exit(profile_main(args))
1137
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
