201
224
return self._parents == other._parents \
202
225
and self._weave == other._weave \
203
226
and self._sha1s == other._sha1s
206
228
def __ne__(self, other):
207
229
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)
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)
220
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):
221
249
"""Convert symbolic version name to index."""
250
self.check_not_reserved_id(name)
223
252
return self._name_map[name]
225
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."""
228
268
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]
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)])
237
436
def _check_repeated_add(self, name, parents, text, sha1):
238
437
"""Check that a duplicated add is OK.
240
439
If it is, return the (old) index; otherwise raise an exception.
242
idx = self.lookup(name)
441
idx = self._lookup(name)
243
442
if sorted(self._parents[idx]) != sorted(parents) \
244
443
or sha1 != self._sha1s[idx]:
245
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)
248
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):
249
462
"""Add a single text on top of the weave.
251
464
Returns the index number of the newly added version.
254
467
Symbolic name for this version.
255
468
(Typically the revision-id of the revision that added it.)
258
471
List or set of direct parent version numbers.
261
474
Sequence of lines to be added in the new version.
263
sha -- SHA-1 of the file, if known. This is trusted to be
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)
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)
275
485
self._check_versions(parents)
276
## self._check_lines(text)
486
## self._check_lines(lines)
277
487
new_version = len(self._parents)
280
489
# if we abort after here the (in-memory) weave will be corrupt because only
281
490
# some fields are updated
491
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
492
# - Robert Collins 20060226
282
493
self._parents.append(parents[:])
283
494
self._sha1s.append(sha1)
284
self._names.append(name)
285
self._name_map[name] = new_version
495
self._names.append(version_id)
496
self._name_map[version_id] = new_version
438
633
except IndexError:
439
634
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.
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.
449
647
The index indicates when the line originated in the weave."""
450
incls = [self.maybe_lookup(name_or_index)]
648
incls = [self._lookup(version_id)]
451
649
for origin, lineno, text in self._extract(incls):
650
yield self._idx_to_name(origin), text
652
@deprecated_method(zero_eight)
458
(lineno, insert, deletes, text)
459
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)
555
850
def get_iter(self, name_or_index):
556
"""Yield lines for the specified version."""
557
incls = [self.maybe_lookup(name_or_index)]
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)):
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.
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)
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
def get_sha1s(self, version_ids):
895
"""See VersionedFile.get_sha1s()."""
896
return [self._sha1s[self._lookup(v)] for v in version_ids]
898
@deprecated_method(zero_eight)
613
899
def numversions(self):
900
"""How many versions are in this weave?
902
Deprecated in favour of num_versions.
904
return self.num_versions()
906
def num_versions(self):
907
"""How many versions are in this weave?"""
614
908
l = len(self._parents)
615
909
assert l == len(self._sha1s)
620
return self.numversions()
912
__len__ = num_versions
622
914
def check(self, progress_bar=None):
623
# check no circular inclusions
624
for version in range(self.numversions()):
915
# TODO evaluate performance hit of using string sets in this routine.
916
# TODO: check no circular inclusions
917
# TODO: create a nested progress bar
918
for version in range(self.num_versions()):
625
919
inclusions = list(self._parents[version])
627
921
inclusions.sort()
652
950
update_text = 'checking %s' % (short_name,)
653
951
update_text = update_text[:25]
655
for lineno, insert, deleteset, line in self._walk():
953
for lineno, insert, deleteset, line in self._walk_internal():
657
955
progress_bar.update(update_text, lineno, nlines)
659
for j, j_inc in enumerate(inclusions):
957
for name, name_inclusions in inclusions.items():
660
958
# The active inclusion must be an ancestor,
661
959
# and no ancestors must have deleted this line,
662
960
# because we don't support resurrection.
663
if (insert in j_inc) and not (deleteset & j_inc):
664
sha1s[j].update(line)
961
if (insert in name_inclusions) and not (deleteset & name_inclusions):
962
sha1s[name].update(line)
666
for version in range(nv):
965
version = self._idx_to_name(i)
667
966
hd = sha1s[version].hexdigest()
668
expected = self._sha1s[version]
967
expected = self._sha1s[i]
669
968
if hd != expected:
670
969
raise errors.WeaveInvalidChecksum(
671
970
"mismatched sha1 for version %s: "
672
971
"got %s, expected %s"
673
% (self._names[version], hd, expected))
972
% (version, hd, expected))
675
974
# TODO: check insertions are properly nested, that there are
676
975
# no lines outside of insertion blocks, that deletions are
677
976
# 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:
978
def _join(self, other, pb, msg, version_ids, ignore_missing):
979
"""Worker routine for join()."""
980
if not other.versions():
814
981
return # nothing to update, easy
984
# versions is never none, InterWeave checks this.
815
987
# two loops so that we do not change ourselves before verifying it
817
989
# 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)
992
# get the selected versions only that are in other.versions.
993
version_ids = set(other.versions()).intersection(set(version_ids))
994
# pull in the referenced graph.
995
version_ids = other.get_ancestry(version_ids)
996
pending_graph = [(version, other.get_parents(version)) for
997
version in version_ids]
998
for name in topo_sort(pending_graph):
999
other_idx = other._name_map[name]
1000
# returns True if we have it, False if we need it.
1001
if not self._check_version_consistent(other, other_idx, name):
1002
names_to_join.append((other_idx, name))
824
for other_idx, name in enumerate(other._names):
1011
for other_idx, name in names_to_join:
825
1012
# TODO: If all the parents of the other version are already
826
1013
# present then we can avoid some work by just taking the delta
827
1014
# and adjusting the offsets.
828
1015
new_parents = self._imported_parents(other, other_idx)
829
1016
sha1 = other._sha1s[other_idx]
1021
pb.update(msg, merged, len(names_to_join))
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
1023
lines = other.get_lines(other_idx)
842
self.add(name, new_parents, lines, sha1)
1024
self._add(name, lines, new_parents, sha1)
844
1026
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
845
merged,processed,self._weave_name, time.time( )-time0))
1027
merged, processed, self._weave_name, time.time()-time0))
850
1029
def _imported_parents(self, other, other_idx):
851
1030
"""Return list of parents in self corresponding to indexes in other."""
852
1031
new_parents = []
853
1032
for parent_idx in other._parents[other_idx]:
854
1033
parent_name = other._names[parent_idx]
855
if parent_name not in self._names:
1034
if parent_name not in self._name_map:
856
1035
# should not be possible
857
1036
raise WeaveError("missing parent {%s} of {%s} in %r"
858
1037
% (parent_name, other._name_map[other_idx], self))
894
def reweave(self, other):
895
"""Reweave self with other."""
896
new_weave = reweave(self, other)
1069
@deprecated_method(zero_eight)
1070
def reweave(self, other, pb=None, msg=None):
1071
"""reweave has been superseded by plain use of join."""
1072
return self.join(other, pb, msg)
1074
def _reweave(self, other, pb, msg):
1075
"""Reweave self with other - internal helper for join().
1077
:param other: The other weave to merge
1078
:param pb: An optional progress bar, indicating how far done we are
1079
:param msg: An optional message for the progress
1081
new_weave = _reweave(self, other, pb=pb, msg=msg)
1082
self._copy_weave_content(new_weave)
1084
def _copy_weave_content(self, otherweave):
1085
"""adsorb the content from otherweave."""
897
1086
for attr in self.__slots__:
898
setattr(self, attr, getattr(new_weave, attr))
1087
if attr != '_weave_name':
1088
setattr(self, attr, copy(getattr(otherweave, attr)))
1091
class WeaveFile(Weave):
1092
"""A WeaveFile represents a Weave on disk and writes on change."""
1094
WEAVE_SUFFIX = '.weave'
1096
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1097
"""Create a WeaveFile.
1099
:param create: If not True, only open an existing knit.
1101
super(WeaveFile, self).__init__(name, access_mode)
1102
self._transport = transport
1103
self._filemode = filemode
1105
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1106
except errors.NoSuchFile:
1112
def _add_lines(self, version_id, parents, lines, parent_texts):
1113
"""Add a version and save the weave."""
1114
self.check_not_reserved_id(version_id)
1115
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1120
def _clone_text(self, new_version_id, old_version_id, parents):
1121
"""See VersionedFile.clone_text."""
1122
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1125
def copy_to(self, name, transport):
1126
"""See VersionedFile.copy_to()."""
1127
# as we are all in memory always, just serialise to the new place.
1129
write_weave_v5(self, sio)
1131
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1133
def create_empty(self, name, transport, filemode=None):
1134
return WeaveFile(name, transport, filemode, create=True)
1137
"""Save the weave."""
1138
self._check_write_ok()
1140
write_weave_v5(self, sio)
1142
self._transport.put_file(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1148
"""See VersionedFile.get_suffixes()."""
1149
return [WeaveFile.WEAVE_SUFFIX]
1151
def join(self, other, pb=None, msg=None, version_ids=None,
1152
ignore_missing=False):
1153
"""Join other into self and save."""
1154
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1158
@deprecated_function(zero_eight)
1159
def reweave(wa, wb, pb=None, msg=None):
1160
"""reweaving is deprecation, please just use weave.join()."""
1161
_reweave(wa, wb, pb, msg)
1163
def _reweave(wa, wb, pb=None, msg=None):
902
1164
"""Combine two weaves and return the result.
904
1166
This works even if a revision R has different parents in
909
1171
might be possible but it should only be necessary to do
910
1172
this operation rarely, when a new previously ghost version is
1175
:param pb: An optional progress bar, indicating how far done we are
1176
:param msg: An optional message for the progress
915
queue_a = range(wa.numversions())
916
queue_b = range(wb.numversions())
1180
queue_a = range(wa.num_versions())
1181
queue_b = range(wb.num_versions())
917
1182
# first determine combined parents of all versions
918
1183
# map from version name -> all parent names
919
1184
combined_parents = _reweave_parent_graphs(wa, wb)
920
1185
mutter("combined parents: %r", combined_parents)
921
1186
order = topo_sort(combined_parents.iteritems())
922
1187
mutter("order to reweave: %r", order)
1192
for idx, name in enumerate(order):
1194
pb.update(msg, idx, len(order))
924
1195
if name in wa._name_map:
925
1196
lines = wa.get_lines(name)
926
1197
if name in wb._name_map:
927
assert lines == wb.get_lines(name)
1198
lines_b = wb.get_lines(name)
1199
if lines != lines_b:
1200
mutter('Weaves differ on content. rev_id {%s}', name)
1201
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1203
lines = list(difflib.unified_diff(lines, lines_b,
1204
wa._weave_name, wb._weave_name))
1205
mutter('lines:\n%s', ''.join(lines))
1206
raise errors.WeaveTextDiffers(name, wa, wb)
929
1208
lines = wb.get_lines(name)
930
wr.add(name, combined_parents[name], lines)
1209
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
934
1212
def _reweave_parent_graphs(wa, wb):
935
1213
"""Return combined parent ancestry for two weaves.
1134
1405
print ' '.join(map(str, w._parents[int(argv[3])]))
1136
1407
elif cmd == 'plan-merge':
1408
# replaced by 'bzr weave-plan-merge'
1138
1410
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1140
1412
print '%14s | %s' % (state, line),
1142
1413
elif cmd == 'merge':
1414
# replaced by 'bzr weave-merge-text'
1144
1416
p = w.plan_merge(int(argv[3]), int(argv[4]))
1145
1417
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
1419
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
1422
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))
1424
sys.exit(main(sys.argv))
1427
class InterWeave(InterVersionedFile):
1428
"""Optimised code paths for weave to weave operations."""
1430
_matching_file_from_factory = staticmethod(WeaveFile)
1431
_matching_file_to_factory = staticmethod(WeaveFile)
1434
def is_compatible(source, target):
1435
"""Be compatible with weaves."""
1437
return (isinstance(source, Weave) and
1438
isinstance(target, Weave))
1439
except AttributeError:
1442
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1443
"""See InterVersionedFile.join."""
1444
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1445
if self.target.versions() == [] and version_ids is None:
1446
self.target._copy_weave_content(self.source)
1449
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1450
except errors.WeaveParentMismatch:
1451
self.target._reweave(self.source, pb, msg)
1454
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
