199
224
return self._parents == other._parents \
200
225
and self._weave == other._weave \
201
226
and self._sha1s == other._sha1s
204
228
def __ne__(self, other):
205
229
return not self.__eq__(other)
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)
231
@deprecated_method(zero_eight)
232
def idx_to_name(self, index):
233
"""Old public interface, the public interface is all names now."""
236
def _idx_to_name(self, version):
237
return self._names[version]
239
@deprecated_method(zero_eight)
218
240
def lookup(self, name):
241
"""Backwards compatibility thunk:
243
Return name, as name is valid in the api now, and spew deprecation
248
def _lookup(self, name):
219
249
"""Convert symbolic version name to index."""
250
self.check_not_reserved_id(name)
221
252
return self._name_map[name]
223
raise WeaveRevisionNotPresent(name, self)
254
raise RevisionNotPresent(name, self._weave_name)
256
@deprecated_method(zero_eight)
257
def iter_names(self):
258
"""Deprecated convenience function, please see VersionedFile.names()."""
259
return iter(self.names())
261
@deprecated_method(zero_eight)
263
"""See Weave.versions for the current api."""
264
return self.versions()
267
"""See VersionedFile.versions."""
226
268
return self._names[:]
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]
270
def has_version(self, version_id):
271
"""See VersionedFile.has_version."""
272
return (version_id in self._name_map)
274
__contains__ = has_version
276
def get_delta(self, version_id):
277
"""See VersionedFile.get_delta."""
278
return self.get_deltas([version_id])[version_id]
280
def get_deltas(self, version_ids):
281
"""See VersionedFile.get_deltas."""
282
version_ids = self.get_ancestry(version_ids)
283
for version_id in version_ids:
284
if not self.has_version(version_id):
285
raise RevisionNotPresent(version_id, self)
286
# try extracting all versions; parallel extraction is used
287
nv = self.num_versions()
293
last_parent_lines = {}
295
parent_inclusions = {}
300
# its simplest to generate a full set of prepared variables.
302
name = self._names[i]
303
sha1s[name] = self.get_sha1(name)
304
parents_list = self.get_parents(name)
306
parent = parents_list[0]
307
parents[name] = parent
308
parent_inclusions[name] = inclusions[parent]
311
parent_inclusions[name] = set()
312
# we want to emit start, finish, replacement_length, replacement_lines tuples.
313
diff_hunks[name] = []
314
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
315
parent_linenums[name] = 0
317
parent_noeols[name] = False
318
last_parent_lines[name] = None
319
new_inc = set([name])
320
for p in self._parents[i]:
321
new_inc.update(inclusions[self._idx_to_name(p)])
322
# debug only, known good so far.
323
#assert set(new_inc) == set(self.get_ancestry(name)), \
324
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
325
inclusions[name] = new_inc
327
nlines = len(self._weave)
329
for lineno, inserted, deletes, line in self._walk_internal():
330
# a line is active in a version if:
331
# insert is in the versions inclusions
333
# deleteset & the versions inclusions is an empty set.
334
# so - if we have a included by mapping - version is included by
335
# children, we get a list of children to examine for deletes affect
336
# ing them, which is less than the entire set of children.
337
for version_id in version_ids:
338
# The active inclusion must be an ancestor,
339
# and no ancestors must have deleted this line,
340
# because we don't support resurrection.
341
parent_inclusion = parent_inclusions[version_id]
342
inclusion = inclusions[version_id]
343
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
344
version_active = inserted in inclusion and not (deletes & inclusion)
345
if not parent_active and not version_active:
346
# unrelated line of ancestry
348
elif parent_active and version_active:
350
parent_linenum = parent_linenums[version_id]
351
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
352
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
354
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
355
parent_linenums[version_id] = parent_linenum
358
noeols[version_id] = True
361
elif parent_active and not version_active:
363
current_hunks[version_id][1] += 1
364
parent_linenums[version_id] += 1
365
last_parent_lines[version_id] = line
366
elif not parent_active and version_active:
368
# noeol only occurs at the end of a file because we
369
# diff linewise. We want to show noeol changes as a
370
# empty diff unless the actual eol-less content changed.
373
if last_parent_lines[version_id][-1] != '\n':
374
parent_noeols[version_id] = True
375
except (TypeError, IndexError):
378
if theline[-1] != '\n':
379
noeols[version_id] = True
383
parent_should_go = False
385
if parent_noeols[version_id] == noeols[version_id]:
386
# no noeol toggle, so trust the weaves statement
387
# that this line is changed.
389
if parent_noeols[version_id]:
390
theline = theline + '\n'
391
elif parent_noeols[version_id]:
392
# parent has no eol, we do:
393
# our line is new, report as such..
395
elif noeols[version_id]:
396
# append a eol so that it looks like
398
theline = theline + '\n'
399
if parents[version_id] is not None:
400
#if last_parent_lines[version_id] is not None:
401
parent_should_go = True
402
if last_parent_lines[version_id] != theline:
405
#parent_should_go = False
407
current_hunks[version_id][2] += 1
408
current_hunks[version_id][3].append((inserted, theline))
410
# last hunk last parent line is not eaten
411
current_hunks[version_id][1] -= 1
412
if current_hunks[version_id][1] < 0:
413
current_hunks[version_id][1] = 0
414
# import pdb;pdb.set_trace()
415
# assert current_hunks[version_id][1] >= 0
419
version = self._idx_to_name(i)
420
if current_hunks[version] != [0, 0, 0, []]:
421
diff_hunks[version].append(tuple(current_hunks[version]))
423
for version_id in version_ids:
424
result[version_id] = (
428
diff_hunks[version_id],
432
def get_parents(self, version_id):
433
"""See VersionedFile.get_parent."""
434
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
235
436
def _check_repeated_add(self, name, parents, text, sha1):
236
437
"""Check that a duplicated add is OK.
238
439
If it is, return the (old) index; otherwise raise an exception.
240
idx = self.lookup(name)
441
idx = self._lookup(name)
241
442
if sorted(self._parents[idx]) != sorted(parents) \
242
443
or sha1 != self._sha1s[idx]:
243
raise WeaveRevisionAlreadyPresent(name, self)
444
raise RevisionAlreadyPresent(name, self._weave_name)
447
@deprecated_method(zero_eight)
448
def add_identical(self, old_rev_id, new_rev_id, parents):
449
"""Please use Weave.clone_text now."""
450
return self.clone_text(new_rev_id, old_rev_id, parents)
452
def _add_lines(self, version_id, parents, lines, parent_texts):
453
"""See VersionedFile.add_lines."""
454
return self._add(version_id, lines, map(self._lookup, parents))
456
@deprecated_method(zero_eight)
246
457
def add(self, name, parents, text, sha1=None):
458
"""See VersionedFile.add_lines for the non deprecated api."""
459
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
461
def _add(self, version_id, lines, parents, sha1=None):
247
462
"""Add a single text on top of the weave.
249
464
Returns the index number of the newly added version.
252
467
Symbolic name for this version.
253
468
(Typically the revision-id of the revision that added it.)
256
471
List or set of direct parent version numbers.
259
474
Sequence of lines to be added in the new version.
261
sha -- SHA-1 of the file, if known. This is trusted to be
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)
477
assert isinstance(version_id, basestring)
478
self._check_lines_not_unicode(lines)
479
self._check_lines_are_lines(lines)
481
sha1 = sha_strings(lines)
482
if version_id in self._name_map:
483
return self._check_repeated_add(version_id, parents, lines, sha1)
273
485
self._check_versions(parents)
274
## self._check_lines(text)
486
## self._check_lines(lines)
275
487
new_version = len(self._parents)
278
489
# if we abort after here the (in-memory) weave will be corrupt because only
279
490
# some fields are updated
491
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
492
# - Robert Collins 20060226
280
493
self._parents.append(parents[:])
281
494
self._sha1s.append(sha1)
282
self._names.append(name)
283
self._name_map[name] = new_version
495
self._names.append(version_id)
496
self._name_map[version_id] = new_version
436
633
except IndexError:
437
634
raise IndexError("invalid version number %r" % i)
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.
636
def _compatible_parents(self, my_parents, other_parents):
637
"""During join check that other_parents are joinable with my_parents.
639
Joinable is defined as 'is a subset of' - supersets may require
640
regeneration of diffs, but subsets do not.
642
return len(other_parents.difference(my_parents)) == 0
644
def annotate_iter(self, version_id):
645
"""Yield list of (version-id, line) pairs for the specified version.
447
647
The index indicates when the line originated in the weave."""
448
incls = [self.maybe_lookup(name_or_index)]
648
incls = [self._lookup(version_id)]
449
649
for origin, lineno, text in self._extract(incls):
650
yield self._idx_to_name(origin), text
652
@deprecated_method(zero_eight)
456
(lineno, insert, deletes, text)
457
for each literal line.
654
"""_walk has become visit, a supported api."""
655
return self._walk_internal()
657
def iter_lines_added_or_present_in_versions(self, version_ids=None,
659
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
660
if version_ids is None:
661
version_ids = self.versions()
662
version_ids = set(version_ids)
663
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
664
# if inserted not in version_ids then it was inserted before the
665
# versions we care about, but because weaves cannot represent ghosts
666
# properly, we do not filter down to that
667
# if inserted not in version_ids: continue
673
#@deprecated_method(zero_eight)
674
def walk(self, version_ids=None):
675
"""See VersionedFile.walk."""
676
return self._walk_internal(version_ids)
678
def _walk_internal(self, version_ids=None):
679
"""Helper method for weave actions."""
849
@deprecated_method(zero_eight)
548
850
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)
851
"""Deprecated, please do not use. Lookups are not not needed.
853
Please use get_lines now.
855
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
857
@deprecated_method(zero_eight)
858
def maybe_lookup(self, name_or_index):
859
"""Deprecated, please do not use. Lookups are not not needed."""
860
return self._maybe_lookup(name_or_index)
862
def _maybe_lookup(self, name_or_index):
863
"""Convert possible symbolic name to index, or pass through indexes.
867
if isinstance(name_or_index, (int, long)):
870
return self._lookup(name_or_index)
872
@deprecated_method(zero_eight)
873
def get(self, version_id):
874
"""Please use either Weave.get_text or Weave.get_lines as desired."""
875
return self.get_lines(version_id)
877
def get_lines(self, version_id):
878
"""See VersionedFile.get_lines()."""
879
int_index = self._maybe_lookup(version_id)
880
result = [line for (origin, lineno, line) in self._extract([int_index])]
881
expected_sha1 = self._sha1s[int_index]
882
measured_sha1 = sha_strings(result)
883
if measured_sha1 != expected_sha1:
884
raise errors.WeaveInvalidChecksum(
885
'file %s, revision %s, expected: %s, measured %s'
886
% (self._weave_name, version_id,
887
expected_sha1, measured_sha1))
890
def get_sha1(self, version_id):
891
"""See VersionedFile.get_sha1()."""
892
return self._sha1s[self._lookup(version_id)]
894
@deprecated_method(zero_eight)
583
895
def numversions(self):
896
"""How many versions are in this weave?
898
Deprecated in favour of num_versions.
900
return self.num_versions()
902
def num_versions(self):
903
"""How many versions are in this weave?"""
584
904
l = len(self._parents)
585
905
assert l == len(self._sha1s)
590
return self.numversions()
908
__len__ = num_versions
593
910
def check(self, progress_bar=None):
594
# check no circular inclusions
595
for version in range(self.numversions()):
911
# TODO evaluate performance hit of using string sets in this routine.
912
# TODO: check no circular inclusions
913
# TODO: create a nested progress bar
914
for version in range(self.num_versions()):
596
915
inclusions = list(self._parents[version])
598
917
inclusions.sort()
600
919
raise WeaveFormatError("invalid included version %d for index %d"
601
920
% (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):
922
# try extracting all versions; parallel extraction is used
923
nv = self.num_versions()
928
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
929
# The problem is that set membership is much more expensive
930
name = self._idx_to_name(i)
931
sha1s[name] = sha.new()
933
new_inc = set([name])
934
for p in self._parents[i]:
935
new_inc.update(inclusions[self._idx_to_name(p)])
937
assert set(new_inc) == set(self.get_ancestry(name)), \
938
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
939
inclusions[name] = new_inc
941
nlines = len(self._weave)
943
update_text = 'checking weave'
945
short_name = os.path.basename(self._weave_name)
946
update_text = 'checking %s' % (short_name,)
947
update_text = update_text[:25]
949
for lineno, insert, deleteset, line in self._walk_internal():
608
progress_bar.update('checking text', version, nv)
610
for l in self.get_iter(version):
613
expected = self._sha1s[version]
951
progress_bar.update(update_text, lineno, nlines)
953
for name, name_inclusions in inclusions.items():
954
# The active inclusion must be an ancestor,
955
# and no ancestors must have deleted this line,
956
# because we don't support resurrection.
957
if (insert in name_inclusions) and not (deleteset & name_inclusions):
958
sha1s[name].update(line)
961
version = self._idx_to_name(i)
962
hd = sha1s[version].hexdigest()
963
expected = self._sha1s[i]
614
964
if hd != expected:
615
raise WeaveError("mismatched sha1 for version %d; "
616
"got %s, expected %s"
617
% (version, hd, expected))
965
raise errors.WeaveInvalidChecksum(
966
"mismatched sha1 for version %s: "
967
"got %s, expected %s"
968
% (version, hd, expected))
619
970
# TODO: check insertions are properly nested, that there are
620
971
# no lines outside of insertion blocks, that deletions are
621
972
# 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()
663
def plan_merge(self, ver_a, ver_b):
664
"""Return pseudo-annotation indicating how the two versions merge.
666
This is computed between versions a and b and their common
669
Weave lines present in none of them are skipped entirely.
671
inc_a = self.inclusions([ver_a])
672
inc_b = self.inclusions([ver_b])
673
inc_c = inc_a & inc_b
675
for lineno, insert, deleteset, line in self._walk():
676
if deleteset & inc_c:
677
# killed in parent; can't be in either a or b
678
# not relevant to our work
679
yield 'killed-base', line
680
elif insert in inc_c:
681
# was inserted in base
682
killed_a = bool(deleteset & inc_a)
683
killed_b = bool(deleteset & inc_b)
684
if killed_a and killed_b:
685
yield 'killed-both', line
687
yield 'killed-a', line
689
yield 'killed-b', line
691
yield 'unchanged', line
692
elif insert in inc_a:
693
if deleteset & inc_a:
694
yield 'ghost-a', line
698
elif insert in inc_b:
699
if deleteset & inc_b:
700
yield 'ghost-b', line
704
# not in either revision
705
yield 'irrelevant', line
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
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':
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().
770
if other.numversions() == 0:
974
def _join(self, other, pb, msg, version_ids, ignore_missing):
975
"""Worker routine for join()."""
976
if not other.versions():
771
977
return # nothing to update, easy
980
# versions is never none, InterWeave checks this.
772
983
# two loops so that we do not change ourselves before verifying it
774
985
# 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
988
# get the selected versions only that are in other.versions.
989
version_ids = set(other.versions()).intersection(set(version_ids))
990
# pull in the referenced graph.
991
version_ids = other.get_ancestry(version_ids)
992
pending_graph = [(version, other.get_parents(version)) for
993
version in version_ids]
994
for name in topo_sort(pending_graph):
995
other_idx = other._name_map[name]
996
# returns True if we have it, False if we need it.
997
if not self._check_version_consistent(other, other_idx, name):
998
names_to_join.append((other_idx, name))
1007
for other_idx, name in names_to_join:
1008
# TODO: If all the parents of the other version are already
780
1009
# present then we can avoid some work by just taking the delta
781
1010
# and adjusting the offsets.
782
1011
new_parents = self._imported_parents(other, other_idx)
1012
sha1 = other._sha1s[other_idx]
1017
pb.update(msg, merged, len(names_to_join))
783
1019
lines = other.get_lines(other_idx)
784
sha1 = other._sha1s[other_idx]
785
self.add(name, new_parents, lines, sha1)
1020
self._add(name, lines, new_parents, sha1)
1022
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1023
merged, processed, self._weave_name, time.time()-time0))
788
1025
def _imported_parents(self, other, other_idx):
789
1026
"""Return list of parents in self corresponding to indexes in other."""
790
1027
new_parents = []
791
1028
for parent_idx in other._parents[other_idx]:
792
1029
parent_name = other._names[parent_idx]
793
if parent_name not in self._names:
1030
if parent_name not in self._name_map:
794
1031
# should not be possible
795
1032
raise WeaveError("missing parent {%s} of {%s} in %r"
796
1033
% (parent_name, other._name_map[other_idx], self))
832
def reweave(self, other):
833
"""Reweave self with other."""
834
new_weave = reweave(self, other)
1065
@deprecated_method(zero_eight)
1066
def reweave(self, other, pb=None, msg=None):
1067
"""reweave has been superseded by plain use of join."""
1068
return self.join(other, pb, msg)
1070
def _reweave(self, other, pb, msg):
1071
"""Reweave self with other - internal helper for join().
1073
:param other: The other weave to merge
1074
:param pb: An optional progress bar, indicating how far done we are
1075
:param msg: An optional message for the progress
1077
new_weave = _reweave(self, other, pb=pb, msg=msg)
1078
self._copy_weave_content(new_weave)
1080
def _copy_weave_content(self, otherweave):
1081
"""adsorb the content from otherweave."""
835
1082
for attr in self.__slots__:
836
setattr(self, attr, getattr(new_weave, attr))
1083
if attr != '_weave_name':
1084
setattr(self, attr, copy(getattr(otherweave, attr)))
1087
class WeaveFile(Weave):
1088
"""A WeaveFile represents a Weave on disk and writes on change."""
1090
WEAVE_SUFFIX = '.weave'
1092
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1093
"""Create a WeaveFile.
1095
:param create: If not True, only open an existing knit.
1097
super(WeaveFile, self).__init__(name, access_mode)
1098
self._transport = transport
1099
self._filemode = filemode
1101
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1102
except errors.NoSuchFile:
1108
def _add_lines(self, version_id, parents, lines, parent_texts):
1109
"""Add a version and save the weave."""
1110
self.check_not_reserved_id(version_id)
1111
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1116
def _clone_text(self, new_version_id, old_version_id, parents):
1117
"""See VersionedFile.clone_text."""
1118
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1121
def copy_to(self, name, transport):
1122
"""See VersionedFile.copy_to()."""
1123
# as we are all in memory always, just serialise to the new place.
1125
write_weave_v5(self, sio)
1127
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1129
def create_empty(self, name, transport, filemode=None):
1130
return WeaveFile(name, transport, filemode, create=True)
1133
"""Save the weave."""
1134
self._check_write_ok()
1136
write_weave_v5(self, sio)
1138
self._transport.put_file(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1144
"""See VersionedFile.get_suffixes()."""
1145
return [WeaveFile.WEAVE_SUFFIX]
1147
def join(self, other, pb=None, msg=None, version_ids=None,
1148
ignore_missing=False):
1149
"""Join other into self and save."""
1150
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1154
@deprecated_function(zero_eight)
1155
def reweave(wa, wb, pb=None, msg=None):
1156
"""reweaving is deprecation, please just use weave.join()."""
1157
_reweave(wa, wb, pb, msg)
1159
def _reweave(wa, wb, pb=None, msg=None):
840
1160
"""Combine two weaves and return the result.
842
1162
This works even if a revision R has different parents in
847
1167
might be possible but it should only be necessary to do
848
1168
this operation rarely, when a new previously ghost version is
1171
:param pb: An optional progress bar, indicating how far done we are
1172
:param msg: An optional message for the progress
853
queue_a = range(wa.numversions())
854
queue_b = range(wb.numversions())
1176
queue_a = range(wa.num_versions())
1177
queue_b = range(wb.num_versions())
855
1178
# first determine combined parents of all versions
856
1179
# map from version name -> all parent names
857
1180
combined_parents = _reweave_parent_graphs(wa, wb)
858
1181
mutter("combined parents: %r", combined_parents)
859
1182
order = topo_sort(combined_parents.iteritems())
860
1183
mutter("order to reweave: %r", order)
1188
for idx, name in enumerate(order):
1190
pb.update(msg, idx, len(order))
862
1191
if name in wa._name_map:
863
1192
lines = wa.get_lines(name)
864
1193
if name in wb._name_map:
865
assert lines == wb.get_lines(name)
1194
lines_b = wb.get_lines(name)
1195
if lines != lines_b:
1196
mutter('Weaves differ on content. rev_id {%s}', name)
1197
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1199
lines = list(difflib.unified_diff(lines, lines_b,
1200
wa._weave_name, wb._weave_name))
1201
mutter('lines:\n%s', ''.join(lines))
1202
raise errors.WeaveTextDiffers(name, wa, wb)
867
1204
lines = wb.get_lines(name)
868
wr.add(name, combined_parents[name], lines)
1205
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
872
1208
def _reweave_parent_graphs(wa, wb):
873
1209
"""Return combined parent ancestry for two weaves.
1072
1401
print ' '.join(map(str, w._parents[int(argv[3])]))
1074
1403
elif cmd == 'plan-merge':
1404
# replaced by 'bzr weave-plan-merge'
1076
1406
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1078
1408
print '%14s | %s' % (state, line),
1080
1409
elif cmd == 'merge':
1410
# replaced by 'bzr weave-merge-text'
1082
1412
p = w.plan_merge(int(argv[3]), int(argv[4]))
1083
1413
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))
1106
1415
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)
1130
1418
if __name__ == '__main__':
1132
if '--profile' in sys.argv:
1134
args.remove('--profile')
1135
sys.exit(profile_main(args))
1137
sys.exit(main(sys.argv))
1420
sys.exit(main(sys.argv))
1423
class InterWeave(InterVersionedFile):
1424
"""Optimised code paths for weave to weave operations."""
1426
_matching_file_from_factory = staticmethod(WeaveFile)
1427
_matching_file_to_factory = staticmethod(WeaveFile)
1430
def is_compatible(source, target):
1431
"""Be compatible with weaves."""
1433
return (isinstance(source, Weave) and
1434
isinstance(target, Weave))
1435
except AttributeError:
1438
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1439
"""See InterVersionedFile.join."""
1440
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1441
if self.target.versions() == [] and version_ids is None:
1442
self.target._copy_weave_content(self.source)
1445
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1446
except errors.WeaveParentMismatch:
1447
self.target._reweave(self.source, pb, msg)
1450
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
