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
72
from difflib import SequenceMatcher
74
from bzrlib.trace import mutter
75
81
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
76
WeaveRevisionNotPresent, WeaveRevisionAlreadyPresent)
82
RevisionAlreadyPresent,
84
UnavailableRepresentation,
85
WeaveRevisionAlreadyPresent,
86
WeaveRevisionNotPresent,
77
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
78
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):
82
128
"""weave - versioned text file storage.
84
130
A Weave manages versions of line-based text files, keeping track
170
216
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
217
'_weave_name', '_matcher', '_allow_reserved']
173
def __init__(self, weave_name=None):
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)
175
229
self._parents = []
178
232
self._name_map = {}
179
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
181
245
def __repr__(self):
182
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)
186
256
"""Return a deep copy of self.
201
271
return self._parents == other._parents \
202
272
and self._weave == other._weave \
203
273
and self._sha1s == other._sha1s
206
275
def __ne__(self, other):
207
276
return not self.__eq__(other)
209
def __contains__(self, name):
210
return self._name_map.has_key(name)
212
def maybe_lookup(self, name_or_index):
213
"""Convert possible symbolic name to index, or pass through indexes."""
214
if isinstance(name_or_index, (int, long)):
217
return self.lookup(name_or_index)
220
def lookup(self, name):
278
def _idx_to_name(self, version):
279
return self._names[version]
281
def _lookup(self, name):
221
282
"""Convert symbolic version name to index."""
283
if not self._allow_reserved:
284
self.check_not_reserved_id(name)
223
286
return self._name_map[name]
225
raise WeaveRevisionNotPresent(name, self)
288
raise RevisionNotPresent(name, self._weave_name)
291
"""See VersionedFile.versions."""
228
292
return self._names[:]
230
def iter_names(self):
231
"""Yield a list of all names in this weave."""
232
return iter(self._names)
234
def idx_to_name(self, version):
235
return self._names[version]
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:
237
376
def _check_repeated_add(self, name, parents, text, sha1):
238
377
"""Check that a duplicated add is OK.
240
379
If it is, return the (old) index; otherwise raise an exception.
242
idx = self.lookup(name)
381
idx = self._lookup(name)
243
382
if sorted(self._parents[idx]) != sorted(parents) \
244
383
or sha1 != self._sha1s[idx]:
245
raise WeaveRevisionAlreadyPresent(name, self)
384
raise RevisionAlreadyPresent(name, self._weave_name)
248
def add(self, name, parents, text, sha1=None):
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):
249
395
"""Add a single text on top of the weave.
251
397
Returns the index number of the newly added version.
254
400
Symbolic name for this version.
255
401
(Typically the revision-id of the revision that added it.)
258
404
List or set of direct parent version numbers.
261
407
Sequence of lines to be added in the new version.
263
sha -- SHA-1 of the file, if known. This is trusted to be
409
:param nostore_sha: See VersionedFile.add_lines.
266
from bzrlib.osutils import sha_strings
268
assert isinstance(name, basestring)
270
sha1 = sha_strings(text)
271
if name in self._name_map:
272
return self._check_repeated_add(name, parents, text, sha1)
274
parents = map(self.maybe_lookup, parents)
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)
275
420
self._check_versions(parents)
276
## self._check_lines(text)
421
## self._check_lines(lines)
277
422
new_version = len(self._parents)
280
424
# if we abort after here the (in-memory) weave will be corrupt because only
281
425
# some fields are updated
426
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
427
# - Robert Collins 20060226
282
428
self._parents.append(parents[:])
283
429
self._sha1s.append(sha1)
284
self._names.append(name)
285
self._name_map[name] = new_version
430
self._names.append(version_id)
431
self._name_map[version_id] = new_version
438
547
except IndexError:
439
548
raise IndexError("invalid version number %r" % i)
442
def annotate(self, name_or_index):
443
return list(self.annotate_iter(name_or_index))
446
def annotate_iter(self, name_or_index):
447
"""Yield list of (index-id, line) pairs for the specified version.
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.
449
561
The index indicates when the line originated in the weave."""
450
incls = [self.maybe_lookup(name_or_index)]
451
for origin, lineno, text in self._extract(incls):
458
(lineno, insert, deletes, text)
459
for each literal line.
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."""
519
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.
521
713
for l in self._weave:
522
if isinstance(l, tuple):
714
if l.__class__ == tuple:
526
assert v not in istack
721
iset.remove(istack.pop())
531
723
if v in included:
536
726
if v in included:
729
raise AssertionError()
540
assert isinstance(l, basestring)
541
731
if isactive is None:
542
732
isactive = (not dset) and istack and (istack[-1] in included)
555
def get_iter(self, name_or_index):
556
"""Yield lines for the specified version."""
557
incls = [self.maybe_lookup(name_or_index)]
562
# We don't have sha1 sums for multiple entries
564
for origin, lineno, line in self._extract(incls):
569
expected_sha1 = self._sha1s[index]
570
measured_sha1 = cur_sha.hexdigest()
571
if measured_sha1 != expected_sha1:
572
raise errors.WeaveInvalidChecksum(
573
'file %s, revision %s, expected: %s, measured %s'
574
% (self._weave_name, self._names[index],
575
expected_sha1, measured_sha1))
578
def get_text(self, name_or_index):
579
return ''.join(self.get_iter(name_or_index))
580
assert isinstance(version, int)
583
def get_lines(self, name_or_index):
584
return list(self.get_iter(name_or_index))
590
def get_sha1(self, name):
591
"""Get the stored sha1 sum for the given revision.
744
def _maybe_lookup(self, name_or_index):
745
"""Convert possible symbolic name to index, or pass through indexes.
593
:param name: The name of the version to lookup
595
return self._sha1s[self.lookup(name)]
597
def mash_iter(self, included):
598
"""Return composed version of multiple included versions."""
599
included = map(self.maybe_lookup, included)
600
for origin, lineno, text in self._extract(included):
604
def dump(self, to_file):
605
from pprint import pprint
606
print >>to_file, "Weave._weave = ",
607
pprint(self._weave, to_file)
608
print >>to_file, "Weave._parents = ",
609
pprint(self._parents, to_file)
613
def numversions(self):
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?"""
614
776
l = len(self._parents)
615
assert l == len(self._sha1s)
620
return self.numversions()
779
__len__ = num_versions
622
781
def check(self, progress_bar=None):
623
# check no circular inclusions
624
for version in range(self.numversions()):
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()):
625
786
inclusions = list(self._parents[version])
627
788
inclusions.sort()
652
819
update_text = 'checking %s' % (short_name,)
653
820
update_text = update_text[:25]
655
for lineno, insert, deleteset, line in self._walk():
822
for lineno, insert, deleteset, line in self._walk_internal():
657
824
progress_bar.update(update_text, lineno, nlines)
659
for j, j_inc in enumerate(inclusions):
826
for name, name_inclusions in inclusions.items():
660
827
# The active inclusion must be an ancestor,
661
828
# and no ancestors must have deleted this line,
662
829
# because we don't support resurrection.
663
if (insert in j_inc) and not (deleteset & j_inc):
664
sha1s[j].update(line)
830
if (insert in name_inclusions) and not (deleteset & name_inclusions):
831
sha1s[name].update(line)
666
for version in range(nv):
834
version = self._idx_to_name(i)
667
835
hd = sha1s[version].hexdigest()
668
expected = self._sha1s[version]
836
expected = self._sha1s[i]
669
837
if hd != expected:
670
838
raise errors.WeaveInvalidChecksum(
671
839
"mismatched sha1 for version %s: "
672
840
"got %s, expected %s"
673
% (self._names[version], hd, expected))
841
% (version, hd, expected))
675
843
# TODO: check insertions are properly nested, that there are
676
844
# no lines outside of insertion blocks, that deletions are
677
845
# properly paired, etc.
679
def _delta(self, included, lines):
680
"""Return changes from basis to new revision.
682
The old text for comparison is the union of included revisions.
684
This is used in inserting a new text.
686
Delta is returned as a sequence of
687
(weave1, weave2, newlines).
689
This indicates that weave1:weave2 of the old weave should be
690
replaced by the sequence of lines in newlines. Note that
691
these line numbers are positions in the total weave and don't
692
correspond to the lines in any extracted version, or even the
693
extracted union of included versions.
695
If line1=line2, this is a pure insert; if newlines=[] this is a
696
pure delete. (Similar to difflib.)
698
raise NotImplementedError()
701
def plan_merge(self, ver_a, ver_b):
702
"""Return pseudo-annotation indicating how the two versions merge.
704
This is computed between versions a and b and their common
707
Weave lines present in none of them are skipped entirely.
709
inc_a = self.inclusions([ver_a])
710
inc_b = self.inclusions([ver_b])
711
inc_c = inc_a & inc_b
713
for lineno, insert, deleteset, line in self._walk():
714
if deleteset & inc_c:
715
# killed in parent; can't be in either a or b
716
# not relevant to our work
717
yield 'killed-base', line
718
elif insert in inc_c:
719
# was inserted in base
720
killed_a = bool(deleteset & inc_a)
721
killed_b = bool(deleteset & inc_b)
722
if killed_a and killed_b:
723
yield 'killed-both', line
725
yield 'killed-a', line
727
yield 'killed-b', line
729
yield 'unchanged', line
730
elif insert in inc_a:
731
if deleteset & inc_a:
732
yield 'ghost-a', line
736
elif insert in inc_b:
737
if deleteset & inc_b:
738
yield 'ghost-b', line
742
# not in either revision
743
yield 'irrelevant', line
745
yield 'unchanged', '' # terminator
749
def weave_merge(self, plan):
753
# TODO: Return a structured form of the conflicts (e.g. 2-tuples for
754
# conflicted regions), rather than just inserting the markers.
756
# TODO: Show some version information (e.g. author, date) on
757
# conflicted regions.
758
for state, line in plan:
759
if state == 'unchanged' or state == 'killed-both':
760
# resync and flush queued conflicts changes if any
761
if not lines_a and not lines_b:
763
elif ch_a and not ch_b:
765
for l in lines_a: yield l
766
elif ch_b and not ch_a:
767
for l in lines_b: yield l
768
elif lines_a == lines_b:
769
for l in lines_a: yield l
772
for l in lines_a: yield l
774
for l in lines_b: yield l
781
if state == 'unchanged':
784
elif state == 'killed-a':
787
elif state == 'killed-b':
790
elif state == 'new-a':
793
elif state == 'new-b':
797
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
802
def join(self, other):
804
"""Integrate versions from other into this weave.
806
The resulting weave contains all the history of both weaves;
807
any version you could retrieve from either self or other can be
808
retrieved from self after this call.
810
It is illegal for the two weaves to contain different values
811
or different parents for any version. See also reweave().
813
if other.numversions() == 0:
814
return # nothing to update, easy
815
# two loops so that we do not change ourselves before verifying it
817
# work through in index order to make sure we get all dependencies
818
for other_idx, name in enumerate(other._names):
819
self._check_version_consistent(other, other_idx, name)
824
for other_idx, name in enumerate(other._names):
825
# TODO: If all the parents of the other version are already
826
# present then we can avoid some work by just taking the delta
827
# and adjusting the offsets.
828
new_parents = self._imported_parents(other, other_idx)
829
sha1 = other._sha1s[other_idx]
833
if name in self._names:
834
idx = self.lookup(name)
835
n1 = map(other.idx_to_name, other._parents[other_idx] )
836
n2 = map(self.idx_to_name, self._parents[other_idx] )
837
if sha1 == self._sha1s[idx] and n1 == n2:
841
lines = other.get_lines(other_idx)
842
self.add(name, new_parents, lines, sha1)
844
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
845
merged,processed,self._weave_name, time.time( )-time0))
850
847
def _imported_parents(self, other, other_idx):
851
848
"""Return list of parents in self corresponding to indexes in other."""
853
850
for parent_idx in other._parents[other_idx]:
854
851
parent_name = other._names[parent_idx]
855
if parent_name not in self._names:
852
if parent_name not in self._name_map:
856
853
# should not be possible
857
854
raise WeaveError("missing parent {%s} of {%s} in %r"
858
855
% (parent_name, other._name_map[other_idx], self))
894
def reweave(self, other):
895
"""Reweave self with other."""
896
new_weave = reweave(self, other)
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."""
897
899
for attr in self.__slots__:
898
setattr(self, attr, getattr(new_weave, attr))
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):
902
976
"""Combine two weaves and return the result.
904
978
This works even if a revision R has different parents in
909
983
might be possible but it should only be necessary to do
910
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
915
queue_a = range(wa.numversions())
916
queue_b = range(wb.numversions())
992
queue_a = range(wa.num_versions())
993
queue_b = range(wb.num_versions())
917
994
# first determine combined parents of all versions
918
995
# map from version name -> all parent names
919
996
combined_parents = _reweave_parent_graphs(wa, wb)
920
997
mutter("combined parents: %r", combined_parents)
921
998
order = topo_sort(combined_parents.iteritems())
922
999
mutter("order to reweave: %r", order)
1004
for idx, name in enumerate(order):
1006
pb.update(msg, idx, len(order))
924
1007
if name in wa._name_map:
925
1008
lines = wa.get_lines(name)
926
1009
if name in wb._name_map:
927
assert lines == wb.get_lines(name)
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)
929
1020
lines = wb.get_lines(name)
930
wr.add(name, combined_parents[name], lines)
1021
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
934
1024
def _reweave_parent_graphs(wa, wb):
935
1025
"""Return combined parent ancestry for two weaves.
1134
1217
print ' '.join(map(str, w._parents[int(argv[3])]))
1136
1219
elif cmd == 'plan-merge':
1220
# replaced by 'bzr weave-plan-merge'
1138
1222
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1140
1224
print '%14s | %s' % (state, line),
1142
1225
elif cmd == 'merge':
1226
# replaced by 'bzr weave-merge-text'
1144
1228
p = w.plan_merge(int(argv[3]), int(argv[4]))
1145
1229
sys.stdout.writelines(w.weave_merge(p))
1147
elif cmd == 'mash-merge':
1153
v1, v2 = map(int, argv[3:5])
1155
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
1157
base_lines = list(w.mash_iter(basis))
1158
a_lines = list(w.get(v1))
1159
b_lines = list(w.get(v2))
1161
from bzrlib.merge3 import Merge3
1162
m3 = Merge3(base_lines, a_lines, b_lines)
1164
name_a = 'version %d' % v1
1165
name_b = 'version %d' % v2
1166
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1168
1231
raise ValueError('unknown command %r' % cmd)
1172
def profile_main(argv):
1173
import tempfile, hotshot, hotshot.stats
1175
prof_f = tempfile.NamedTemporaryFile()
1177
prof = hotshot.Profile(prof_f.name)
1179
ret = prof.runcall(main, argv)
1182
stats = hotshot.stats.load(prof_f.name)
1184
stats.sort_stats('cumulative')
1185
## XXX: Might like to write to stderr or the trace file instead but
1186
## print_stats seems hardcoded to stdout
1187
stats.print_stats(20)
1192
def lsprofile_main(argv):
1193
from bzrlib.lsprof import profile
1194
ret,stats = profile(main, argv)
1200
1234
if __name__ == '__main__':
1202
if '--profile' in sys.argv:
1204
args.remove('--profile')
1205
sys.exit(profile_main(args))
1206
elif '--lsprof' in sys.argv:
1208
args.remove('--lsprof')
1209
sys.exit(lsprofile_main(args))
1211
sys.exit(main(sys.argv))
1236
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
