205
220
return self._parents == other._parents \
206
221
and self._weave == other._weave \
207
222
and self._sha1s == other._sha1s
210
224
def __ne__(self, other):
211
225
return not self.__eq__(other)
214
def maybe_lookup(self, name_or_index):
215
"""Convert possible symbolic name to index, or pass through indexes."""
216
if isinstance(name_or_index, (int, long)):
219
return self.lookup(name_or_index)
222
def lookup(self, name):
227
def _idx_to_name(self, version):
228
return self._names[version]
230
def _lookup(self, name):
223
231
"""Convert symbolic version name to index."""
232
self.check_not_reserved_id(name)
225
234
return self._name_map[name]
227
raise WeaveError("name %r not present in weave %r" %
228
(name, self._weave_name))
231
def iter_names(self):
232
"""Yield a list of all names in this weave."""
233
return iter(self._names)
235
def idx_to_name(self, version):
236
return self._names[version]
236
raise RevisionNotPresent(name, self._weave_name)
239
"""See VersionedFile.versions."""
240
return self._names[:]
242
def has_version(self, version_id):
243
"""See VersionedFile.has_version."""
244
return (version_id in self._name_map)
246
__contains__ = has_version
248
def get_parent_map(self, version_ids):
249
"""See VersionedFile.get_parent_map."""
251
for version_id in version_ids:
253
result[version_id] = tuple(
254
map(self._idx_to_name, self._parents[self._lookup(version_id)]))
255
except RevisionNotPresent:
259
def get_parents_with_ghosts(self, version_id):
260
raise NotImplementedError(self.get_parents_with_ghosts)
239
262
def _check_repeated_add(self, name, parents, text, sha1):
240
263
"""Check that a duplicated add is OK.
242
265
If it is, return the (old) index; otherwise raise an exception.
244
idx = self.lookup(name)
245
if sorted(self._parents[idx]) != sorted(parents):
246
raise WeaveError("name \"%s\" already present in weave "
247
"with different parents" % name)
248
if sha1 != self._sha1s[idx]:
249
raise WeaveError("name \"%s\" already present in weave "
250
"with different text" % name)
267
idx = self._lookup(name)
268
if sorted(self._parents[idx]) != sorted(parents) \
269
or sha1 != self._sha1s[idx]:
270
raise RevisionAlreadyPresent(name, self._weave_name)
255
def add(self, name, parents, text, sha1=None):
273
def _add_lines(self, version_id, parents, lines, parent_texts,
274
left_matching_blocks, nostore_sha, random_id, check_content):
275
"""See VersionedFile.add_lines."""
276
idx = self._add(version_id, lines, map(self._lookup, parents),
277
nostore_sha=nostore_sha)
278
return sha_strings(lines), sum(map(len, lines)), idx
280
def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
256
281
"""Add a single text on top of the weave.
258
283
Returns the index number of the newly added version.
261
286
Symbolic name for this version.
262
287
(Typically the revision-id of the revision that added it.)
265
290
List or set of direct parent version numbers.
268
293
Sequence of lines to be added in the new version.
270
sha -- SHA-1 of the file, if known. This is trusted to be
295
:param nostore_sha: See VersionedFile.add_lines.
273
from bzrlib.osutils import sha_strings
275
assert isinstance(name, basestring)
277
sha1 = sha_strings(text)
278
if name in self._name_map:
279
return self._check_repeated_add(name, parents, text, sha1)
281
parents = map(self.maybe_lookup, parents)
297
assert isinstance(version_id, basestring)
298
self._check_lines_not_unicode(lines)
299
self._check_lines_are_lines(lines)
301
sha1 = sha_strings(lines)
302
if sha1 == nostore_sha:
303
raise errors.ExistingContent
304
if version_id in self._name_map:
305
return self._check_repeated_add(version_id, parents, lines, sha1)
282
307
self._check_versions(parents)
283
## self._check_lines(text)
308
## self._check_lines(lines)
284
309
new_version = len(self._parents)
287
311
# if we abort after here the (in-memory) weave will be corrupt because only
288
312
# some fields are updated
313
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
314
# - Robert Collins 20060226
289
315
self._parents.append(parents[:])
290
316
self._sha1s.append(sha1)
291
self._names.append(name)
292
self._name_map[name] = new_version
317
self._names.append(version_id)
318
self._name_map[version_id] = new_version
445
445
except IndexError:
446
446
raise IndexError("invalid version number %r" % i)
449
def annotate(self, name_or_index):
450
return list(self.annotate_iter(name_or_index))
453
def annotate_iter(self, name_or_index):
454
"""Yield list of (index-id, line) pairs for the specified version.
448
def _compatible_parents(self, my_parents, other_parents):
449
"""During join check that other_parents are joinable with my_parents.
451
Joinable is defined as 'is a subset of' - supersets may require
452
regeneration of diffs, but subsets do not.
454
return len(other_parents.difference(my_parents)) == 0
456
def annotate_iter(self, version_id):
457
"""Yield list of (version-id, line) pairs for the specified version.
456
459
The index indicates when the line originated in the weave."""
457
incls = [self.maybe_lookup(name_or_index)]
460
incls = [self._lookup(version_id)]
458
461
for origin, lineno, text in self._extract(incls):
466
(lineno, insert, deletes, text)
467
for each literal line.
462
yield self._idx_to_name(origin), text
464
def iter_lines_added_or_present_in_versions(self, version_ids=None,
466
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
467
if version_ids is None:
468
version_ids = self.versions()
469
version_ids = set(version_ids)
470
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
471
# if inserted not in version_ids then it was inserted before the
472
# versions we care about, but because weaves cannot represent ghosts
473
# properly, we do not filter down to that
474
# if inserted not in version_ids: continue
476
yield line + '\n', inserted
480
def _walk_internal(self, version_ids=None):
481
"""Helper method for weave actions."""
473
486
lineno = 0 # line of weave, 0-based
475
488
for l in self._weave:
476
if isinstance(l, tuple):
489
if l.__class__ == tuple:
493
istack.append(self._names[v])
497
assert self._names[v] not in dset
498
dset.add(self._names[v])
500
dset.remove(self._names[v])
489
raise WeaveFormatError('unexpected instruction %r'
502
raise WeaveFormatError('unexpected instruction %r' % v)
492
assert isinstance(l, basestring)
504
assert l.__class__ in (str, unicode)
494
yield lineno, istack[-1], dset, l
506
yield lineno, istack[-1], frozenset(dset), l
510
raise WeaveFormatError("unclosed insertion blocks "
511
"at end of weave: %s" % istack)
513
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
516
def plan_merge(self, ver_a, ver_b):
517
"""Return pseudo-annotation indicating how the two versions merge.
519
This is computed between versions a and b and their common
522
Weave lines present in none of them are skipped entirely.
524
inc_a = set(self.get_ancestry([ver_a]))
525
inc_b = set(self.get_ancestry([ver_b]))
526
inc_c = inc_a & inc_b
528
for lineno, insert, deleteset, line in self._walk_internal([ver_a, ver_b]):
529
if deleteset & inc_c:
530
# killed in parent; can't be in either a or b
531
# not relevant to our work
532
yield 'killed-base', line
533
elif insert in inc_c:
534
# was inserted in base
535
killed_a = bool(deleteset & inc_a)
536
killed_b = bool(deleteset & inc_b)
537
if killed_a and killed_b:
538
yield 'killed-both', line
540
yield 'killed-a', line
542
yield 'killed-b', line
544
yield 'unchanged', line
545
elif insert in inc_a:
546
if deleteset & inc_a:
547
yield 'ghost-a', line
551
elif insert in inc_b:
552
if deleteset & inc_b:
553
yield 'ghost-b', line
557
# not in either revision
558
yield 'irrelevant', line
560
yield 'unchanged', '' # terminator
499
562
def _extract(self, versions):
500
563
"""Yield annotation of lines in included set.
544
assert isinstance(l, basestring)
636
assert l.__class__ in (str, unicode)
545
637
if isactive is None:
546
638
isactive = (not dset) and istack and (istack[-1] in included)
548
640
result.append((istack[-1], lineno, l))
552
raise WFE("unclosed insertion blocks at end of weave",
643
raise WeaveFormatError("unclosed insertion blocks "
644
"at end of weave: %s" % istack)
555
raise WFE("unclosed deletion blocks at end of weave",
562
def get_iter(self, name_or_index):
563
"""Yield lines for the specified version."""
564
incls = [self.maybe_lookup(name_or_index)]
565
for origin, lineno, line in self._extract(incls):
569
def get_text(self, name_or_index):
570
return ''.join(self.get_iter(name_or_index))
571
assert isinstance(version, int)
574
def get_lines(self, name_or_index):
575
return list(self.get_iter(name_or_index))
581
def mash_iter(self, included):
582
"""Return composed version of multiple included versions."""
583
included = map(self.maybe_lookup, included)
584
for origin, lineno, text in self._extract(included):
588
def dump(self, to_file):
589
from pprint import pprint
590
print >>to_file, "Weave._weave = ",
591
pprint(self._weave, to_file)
592
print >>to_file, "Weave._parents = ",
593
pprint(self._parents, to_file)
597
def numversions(self):
646
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
650
def _maybe_lookup(self, name_or_index):
651
"""Convert possible symbolic name to index, or pass through indexes.
655
if isinstance(name_or_index, (int, long)):
658
return self._lookup(name_or_index)
660
def get_lines(self, version_id):
661
"""See VersionedFile.get_lines()."""
662
int_index = self._maybe_lookup(version_id)
663
result = [line for (origin, lineno, line) in self._extract([int_index])]
664
expected_sha1 = self._sha1s[int_index]
665
measured_sha1 = sha_strings(result)
666
if measured_sha1 != expected_sha1:
667
raise errors.WeaveInvalidChecksum(
668
'file %s, revision %s, expected: %s, measured %s'
669
% (self._weave_name, version_id,
670
expected_sha1, measured_sha1))
673
def get_sha1(self, version_id):
674
"""See VersionedFile.get_sha1()."""
675
return self._sha1s[self._lookup(version_id)]
677
def get_sha1s(self, version_ids):
678
"""See VersionedFile.get_sha1s()."""
679
return [self._sha1s[self._lookup(v)] for v in version_ids]
681
def num_versions(self):
682
"""How many versions are in this weave?"""
598
683
l = len(self._parents)
599
684
assert l == len(self._sha1s)
604
return self.numversions()
687
__len__ = num_versions
607
689
def check(self, progress_bar=None):
608
# check no circular inclusions
609
for version in range(self.numversions()):
690
# TODO evaluate performance hit of using string sets in this routine.
691
# TODO: check no circular inclusions
692
# TODO: create a nested progress bar
693
for version in range(self.num_versions()):
610
694
inclusions = list(self._parents[version])
612
696
inclusions.sort()
614
698
raise WeaveFormatError("invalid included version %d for index %d"
615
699
% (inclusions[-1], version))
617
# try extracting all versions; this is a bit slow and parallel
618
# extraction could be used
619
nv = self.numversions()
620
for version in range(nv):
701
# try extracting all versions; parallel extraction is used
702
nv = self.num_versions()
707
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
708
# The problem is that set membership is much more expensive
709
name = self._idx_to_name(i)
710
sha1s[name] = sha.new()
712
new_inc = set([name])
713
for p in self._parents[i]:
714
new_inc.update(inclusions[self._idx_to_name(p)])
716
assert set(new_inc) == set(self.get_ancestry(name)), \
717
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
718
inclusions[name] = new_inc
720
nlines = len(self._weave)
722
update_text = 'checking weave'
724
short_name = os.path.basename(self._weave_name)
725
update_text = 'checking %s' % (short_name,)
726
update_text = update_text[:25]
728
for lineno, insert, deleteset, line in self._walk_internal():
622
progress_bar.update('checking text', version, nv)
624
for l in self.get_iter(version):
627
expected = self._sha1s[version]
730
progress_bar.update(update_text, lineno, nlines)
732
for name, name_inclusions in inclusions.items():
733
# The active inclusion must be an ancestor,
734
# and no ancestors must have deleted this line,
735
# because we don't support resurrection.
736
if (insert in name_inclusions) and not (deleteset & name_inclusions):
737
sha1s[name].update(line)
740
version = self._idx_to_name(i)
741
hd = sha1s[version].hexdigest()
742
expected = self._sha1s[i]
628
743
if hd != expected:
629
raise WeaveError("mismatched sha1 for version %d; "
630
"got %s, expected %s"
631
% (version, hd, expected))
744
raise errors.WeaveInvalidChecksum(
745
"mismatched sha1 for version %s: "
746
"got %s, expected %s"
747
% (version, hd, expected))
633
749
# TODO: check insertions are properly nested, that there are
634
750
# no lines outside of insertion blocks, that deletions are
635
751
# properly paired, etc.
639
def merge(self, merge_versions):
640
"""Automerge and mark conflicts between versions.
642
This returns a sequence, each entry describing alternatives
643
for a chunk of the file. Each of the alternatives is given as
646
If there is a chunk of the file where there's no diagreement,
647
only one alternative is given.
649
# approach: find the included versions common to all the
651
raise NotImplementedError()
655
def _delta(self, included, lines):
656
"""Return changes from basis to new revision.
658
The old text for comparison is the union of included revisions.
660
This is used in inserting a new text.
662
Delta is returned as a sequence of
663
(weave1, weave2, newlines).
665
This indicates that weave1:weave2 of the old weave should be
666
replaced by the sequence of lines in newlines. Note that
667
these line numbers are positions in the total weave and don't
668
correspond to the lines in any extracted version, or even the
669
extracted union of included versions.
671
If line1=line2, this is a pure insert; if newlines=[] this is a
672
pure delete. (Similar to difflib.)
674
raise NotImplementedError()
677
def plan_merge(self, ver_a, ver_b):
678
"""Return pseudo-annotation indicating how the two versions merge.
680
This is computed between versions a and b and their common
683
Weave lines present in none of them are skipped entirely.
685
inc_a = self.inclusions([ver_a])
686
inc_b = self.inclusions([ver_b])
687
inc_c = inc_a & inc_b
689
for lineno, insert, deleteset, line in self._walk():
690
if deleteset & inc_c:
691
# killed in parent; can't be in either a or b
692
# not relevant to our work
693
yield 'killed-base', line
694
elif insert in inc_c:
695
# was inserted in base
696
killed_a = bool(deleteset & inc_a)
697
killed_b = bool(deleteset & inc_b)
698
if killed_a and killed_b:
699
yield 'killed-both', line
701
yield 'killed-a', line
703
yield 'killed-b', line
705
yield 'unchanged', line
706
elif insert in inc_a:
707
if deleteset & inc_a:
708
yield 'ghost-a', line
712
elif insert in inc_b:
713
if deleteset & inc_b:
714
yield 'ghost-b', line
718
# not in either revision
719
yield 'irrelevant', line
721
yield 'unchanged', '' # terminator
725
def weave_merge(self, plan):
730
for state, line in plan:
731
if state == 'unchanged' or state == 'killed-both':
732
# resync and flush queued conflicts changes if any
733
if not lines_a and not lines_b:
735
elif ch_a and not ch_b:
737
for l in lines_a: yield l
738
elif ch_b and not ch_a:
739
for l in lines_b: yield l
740
elif lines_a == lines_b:
741
for l in lines_a: yield l
744
for l in lines_a: yield l
746
for l in lines_b: yield l
753
if state == 'unchanged':
756
elif state == 'killed-a':
759
elif state == 'killed-b':
762
elif state == 'new-a':
765
elif state == 'new-b':
769
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
774
def join(self, other):
775
"""Integrate versions from other into this weave.
777
The resulting weave contains all the history of both weaves;
778
any version you could retrieve from either self or other can be
779
retrieved from self after this call.
781
It is illegal for the two weaves to contain different values
782
or different parents for any version. See also reweave().
784
if other.numversions() == 0:
753
def _join(self, other, pb, msg, version_ids, ignore_missing):
754
"""Worker routine for join()."""
755
if not other.versions():
785
756
return # nothing to update, easy
759
# versions is never none, InterWeave checks this.
786
762
# two loops so that we do not change ourselves before verifying it
788
764
# work through in index order to make sure we get all dependencies
789
for other_idx, name in enumerate(other._names):
790
if self._check_version_consistent(other, other_idx, name):
792
for other_idx, name in enumerate(other._names):
793
# TODO: If all the parents of the other version are already
767
# get the selected versions only that are in other.versions.
768
version_ids = set(other.versions()).intersection(set(version_ids))
769
# pull in the referenced graph.
770
version_ids = other.get_ancestry(version_ids)
771
pending_parents = other.get_parent_map(version_ids)
772
pending_graph = pending_parents.items()
773
if len(pending_graph) != len(version_ids):
774
raise RevisionNotPresent(
775
set(version_ids) - set(pending_parents.keys()), self)
776
for name in topo_sort(pending_graph):
777
other_idx = other._name_map[name]
778
# returns True if we have it, False if we need it.
779
if not self._check_version_consistent(other, other_idx, name):
780
names_to_join.append((other_idx, name))
788
for other_idx, name in names_to_join:
789
# TODO: If all the parents of the other version are already
794
790
# present then we can avoid some work by just taking the delta
795
791
# and adjusting the offsets.
796
792
new_parents = self._imported_parents(other, other_idx)
793
sha1 = other._sha1s[other_idx]
798
pb.update(msg, merged, len(names_to_join))
797
800
lines = other.get_lines(other_idx)
798
sha1 = other._sha1s[other_idx]
799
self.add(name, new_parents, lines, sha1)
801
self._add(name, lines, new_parents, sha1)
803
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
804
merged, processed, self._weave_name, time.time()-time0))
802
806
def _imported_parents(self, other, other_idx):
803
807
"""Return list of parents in self corresponding to indexes in other."""
805
809
for parent_idx in other._parents[other_idx]:
806
810
parent_name = other._names[parent_idx]
807
if parent_name not in self._names:
811
if parent_name not in self._name_map:
808
812
# should not be possible
809
813
raise WeaveError("missing parent {%s} of {%s} in %r"
810
814
% (parent_name, other._name_map[other_idx], self))
846
def reweave(self, other):
847
"""Reweave self with other."""
848
new_weave = reweave(self, other)
846
def _reweave(self, other, pb, msg):
847
"""Reweave self with other - internal helper for join().
849
:param other: The other weave to merge
850
:param pb: An optional progress bar, indicating how far done we are
851
:param msg: An optional message for the progress
853
new_weave = _reweave(self, other, pb=pb, msg=msg)
854
self._copy_weave_content(new_weave)
856
def _copy_weave_content(self, otherweave):
857
"""adsorb the content from otherweave."""
849
858
for attr in self.__slots__:
850
setattr(self, attr, getattr(new_weave, attr))
859
if attr != '_weave_name':
860
setattr(self, attr, copy(getattr(otherweave, attr)))
863
class WeaveFile(Weave):
864
"""A WeaveFile represents a Weave on disk and writes on change."""
866
WEAVE_SUFFIX = '.weave'
868
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
869
"""Create a WeaveFile.
871
:param create: If not True, only open an existing knit.
873
super(WeaveFile, self).__init__(name, access_mode)
874
self._transport = transport
875
self._filemode = filemode
877
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
878
except errors.NoSuchFile:
884
def _add_lines(self, version_id, parents, lines, parent_texts,
885
left_matching_blocks, nostore_sha, random_id, check_content):
886
"""Add a version and save the weave."""
887
self.check_not_reserved_id(version_id)
888
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
889
parent_texts, left_matching_blocks, nostore_sha, random_id,
894
def _clone_text(self, new_version_id, old_version_id, parents):
895
"""See VersionedFile.clone_text."""
896
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
899
def copy_to(self, name, transport):
900
"""See VersionedFile.copy_to()."""
901
# as we are all in memory always, just serialise to the new place.
903
write_weave_v5(self, sio)
905
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
907
def create_empty(self, name, transport, filemode=None):
908
return WeaveFile(name, transport, filemode, create=True)
911
"""Save the weave."""
912
self._check_write_ok()
914
write_weave_v5(self, sio)
916
self._transport.put_file(self._weave_name + WeaveFile.WEAVE_SUFFIX,
922
"""See VersionedFile.get_suffixes()."""
923
return [WeaveFile.WEAVE_SUFFIX]
925
def join(self, other, pb=None, msg=None, version_ids=None,
926
ignore_missing=False):
927
"""Join other into self and save."""
928
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
932
def _reweave(wa, wb, pb=None, msg=None):
854
933
"""Combine two weaves and return the result.
856
935
This works even if a revision R has different parents in
861
940
might be possible but it should only be necessary to do
862
941
this operation rarely, when a new previously ghost version is
944
:param pb: An optional progress bar, indicating how far done we are
945
:param msg: An optional message for the progress
867
queue_a = range(wa.numversions())
868
queue_b = range(wb.numversions())
949
queue_a = range(wa.num_versions())
950
queue_b = range(wb.num_versions())
869
951
# first determine combined parents of all versions
870
952
# map from version name -> all parent names
871
953
combined_parents = _reweave_parent_graphs(wa, wb)
872
954
mutter("combined parents: %r", combined_parents)
873
order = _make_reweave_order(wa._names, wb._names, combined_parents)
955
order = topo_sort(combined_parents.iteritems())
874
956
mutter("order to reweave: %r", order)
961
for idx, name in enumerate(order):
963
pb.update(msg, idx, len(order))
876
964
if name in wa._name_map:
877
965
lines = wa.get_lines(name)
878
966
if name in wb._name_map:
879
assert lines == wb.get_lines(name)
967
lines_b = wb.get_lines(name)
969
mutter('Weaves differ on content. rev_id {%s}', name)
970
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
972
lines = list(difflib.unified_diff(lines, lines_b,
973
wa._weave_name, wb._weave_name))
974
mutter('lines:\n%s', ''.join(lines))
975
raise errors.WeaveTextDiffers(name, wa, wb)
881
977
lines = wb.get_lines(name)
882
wr.add(name, combined_parents[name], lines)
978
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
886
981
def _reweave_parent_graphs(wa, wb):
887
982
"""Return combined parent ancestry for two weaves.
1120
1174
print ' '.join(map(str, w._parents[int(argv[3])]))
1122
1176
elif cmd == 'plan-merge':
1177
# replaced by 'bzr weave-plan-merge'
1124
1179
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1126
1181
print '%14s | %s' % (state, line),
1128
1182
elif cmd == 'merge':
1183
# replaced by 'bzr weave-merge-text'
1130
1185
p = w.plan_merge(int(argv[3]), int(argv[4]))
1131
1186
sys.stdout.writelines(w.weave_merge(p))
1133
elif cmd == 'mash-merge':
1139
v1, v2 = map(int, argv[3:5])
1141
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
1143
base_lines = list(w.mash_iter(basis))
1144
a_lines = list(w.get(v1))
1145
b_lines = list(w.get(v2))
1147
from bzrlib.merge3 import Merge3
1148
m3 = Merge3(base_lines, a_lines, b_lines)
1150
name_a = 'version %d' % v1
1151
name_b = 'version %d' % v2
1152
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1154
1188
raise ValueError('unknown command %r' % cmd)
1158
def profile_main(argv):
1159
import tempfile, hotshot, hotshot.stats
1161
prof_f = tempfile.NamedTemporaryFile()
1163
prof = hotshot.Profile(prof_f.name)
1165
ret = prof.runcall(main, argv)
1168
stats = hotshot.stats.load(prof_f.name)
1170
stats.sort_stats('cumulative')
1171
## XXX: Might like to write to stderr or the trace file instead but
1172
## print_stats seems hardcoded to stdout
1173
stats.print_stats(20)
1178
1191
if __name__ == '__main__':
1180
if '--profile' in sys.argv:
1182
args.remove('--profile')
1183
sys.exit(profile_main(args))
1185
sys.exit(main(sys.argv))
1193
sys.exit(main(sys.argv))
1196
class InterWeave(InterVersionedFile):
1197
"""Optimised code paths for weave to weave operations."""
1199
_matching_file_from_factory = staticmethod(WeaveFile)
1200
_matching_file_to_factory = staticmethod(WeaveFile)
1203
def is_compatible(source, target):
1204
"""Be compatible with weaves."""
1206
return (isinstance(source, Weave) and
1207
isinstance(target, Weave))
1208
except AttributeError:
1211
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1212
"""See InterVersionedFile.join."""
1213
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1214
if self.target.versions() == [] and version_ids is None:
1215
self.target._copy_weave_content(self.source)
1217
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1220
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
