201
221
return self._parents == other._parents \
202
222
and self._weave == other._weave \
203
223
and self._sha1s == other._sha1s
206
225
def __ne__(self, other):
207
226
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)
228
@deprecated_method(zero_eight)
229
def idx_to_name(self, index):
230
"""Old public interface, the public interface is all names now."""
233
def _idx_to_name(self, version):
234
return self._names[version]
236
@deprecated_method(zero_eight)
220
237
def lookup(self, name):
238
"""Backwards compatibility thunk:
240
Return name, as name is valid in the api now, and spew deprecation
245
def _lookup(self, name):
221
246
"""Convert symbolic version name to index."""
223
248
return self._name_map[name]
225
raise WeaveRevisionNotPresent(name, self)
250
raise RevisionNotPresent(name, self._weave_name)
252
@deprecated_method(zero_eight)
253
def iter_names(self):
254
"""Deprecated convenience function, please see VersionedFile.names()."""
255
return iter(self.names())
257
@deprecated_method(zero_eight)
259
"""See Weave.versions for the current api."""
260
return self.versions()
263
"""See VersionedFile.versions."""
228
264
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]
266
def has_version(self, version_id):
267
"""See VersionedFile.has_version."""
268
return self._name_map.has_key(version_id)
270
__contains__ = has_version
272
def get_delta(self, version_id):
273
"""See VersionedFile.get_delta."""
274
return self.get_deltas([version_id])[version_id]
276
def get_deltas(self, version_ids):
277
"""See VersionedFile.get_deltas."""
278
version_ids = self.get_ancestry(version_ids)
279
for version_id in version_ids:
280
if not self.has_version(version_id):
281
raise RevisionNotPresent(version_id, self)
282
# try extracting all versions; parallel extraction is used
283
nv = self.num_versions()
289
last_parent_lines = {}
291
parent_inclusions = {}
296
# its simplest to generate a full set of prepared variables.
298
name = self._names[i]
299
sha1s[name] = self.get_sha1(name)
300
parents_list = self.get_parents(name)
302
parent = parents_list[0]
303
parents[name] = parent
304
parent_inclusions[name] = inclusions[parent]
307
parent_inclusions[name] = set()
308
# we want to emit start, finish, replacement_length, replacement_lines tuples.
309
diff_hunks[name] = []
310
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
311
parent_linenums[name] = 0
313
parent_noeols[name] = False
314
last_parent_lines[name] = None
315
new_inc = set([name])
316
for p in self._parents[i]:
317
new_inc.update(inclusions[self._idx_to_name(p)])
318
# debug only, known good so far.
319
#assert set(new_inc) == set(self.get_ancestry(name)), \
320
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
321
inclusions[name] = new_inc
323
nlines = len(self._weave)
325
for lineno, inserted, deletes, line in self._walk_internal():
326
# a line is active in a version if:
327
# insert is in the versions inclusions
329
# deleteset & the versions inclusions is an empty set.
330
# so - if we have a included by mapping - version is included by
331
# children, we get a list of children to examine for deletes affect
332
# ing them, which is less than the entire set of children.
333
for version_id in version_ids:
334
# The active inclusion must be an ancestor,
335
# and no ancestors must have deleted this line,
336
# because we don't support resurrection.
337
parent_inclusion = parent_inclusions[version_id]
338
inclusion = inclusions[version_id]
339
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
340
version_active = inserted in inclusion and not (deletes & inclusion)
341
if not parent_active and not version_active:
342
# unrelated line of ancestry
344
elif parent_active and version_active:
346
parent_linenum = parent_linenums[version_id]
347
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
348
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
350
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
351
parent_linenums[version_id] = parent_linenum
354
noeols[version_id] = True
357
elif parent_active and not version_active:
359
current_hunks[version_id][1] += 1
360
parent_linenums[version_id] += 1
361
last_parent_lines[version_id] = line
362
elif not parent_active and version_active:
364
# noeol only occurs at the end of a file because we
365
# diff linewise. We want to show noeol changes as a
366
# empty diff unless the actual eol-less content changed.
369
if last_parent_lines[version_id][-1] != '\n':
370
parent_noeols[version_id] = True
371
except (TypeError, IndexError):
374
if theline[-1] != '\n':
375
noeols[version_id] = True
379
parent_should_go = False
381
if parent_noeols[version_id] == noeols[version_id]:
382
# no noeol toggle, so trust the weaves statement
383
# that this line is changed.
385
if parent_noeols[version_id]:
386
theline = theline + '\n'
387
elif parent_noeols[version_id]:
388
# parent has no eol, we do:
389
# our line is new, report as such..
391
elif noeols[version_id]:
392
# append a eol so that it looks like
394
theline = theline + '\n'
395
if parents[version_id] is not None:
396
#if last_parent_lines[version_id] is not None:
397
parent_should_go = True
398
if last_parent_lines[version_id] != theline:
401
#parent_should_go = False
403
current_hunks[version_id][2] += 1
404
current_hunks[version_id][3].append((inserted, theline))
406
# last hunk last parent line is not eaten
407
current_hunks[version_id][1] -= 1
408
if current_hunks[version_id][1] < 0:
409
current_hunks[version_id][1] = 0
410
# import pdb;pdb.set_trace()
411
# assert current_hunks[version_id][1] >= 0
415
version = self._idx_to_name(i)
416
if current_hunks[version] != [0, 0, 0, []]:
417
diff_hunks[version].append(tuple(current_hunks[version]))
419
for version_id in version_ids:
420
result[version_id] = (
424
diff_hunks[version_id],
428
def get_parents(self, version_id):
429
"""See VersionedFile.get_parent."""
430
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
237
432
def _check_repeated_add(self, name, parents, text, sha1):
238
433
"""Check that a duplicated add is OK.
240
435
If it is, return the (old) index; otherwise raise an exception.
242
idx = self.lookup(name)
437
idx = self._lookup(name)
243
438
if sorted(self._parents[idx]) != sorted(parents) \
244
439
or sha1 != self._sha1s[idx]:
245
raise WeaveRevisionAlreadyPresent(name, self)
440
raise RevisionAlreadyPresent(name, self._weave_name)
443
@deprecated_method(zero_eight)
444
def add_identical(self, old_rev_id, new_rev_id, parents):
445
"""Please use Weave.clone_text now."""
446
return self.clone_text(new_rev_id, old_rev_id, parents)
448
def _add_lines(self, version_id, parents, lines, parent_texts):
449
"""See VersionedFile.add_lines."""
450
return self._add(version_id, lines, map(self._lookup, parents))
452
@deprecated_method(zero_eight)
248
453
def add(self, name, parents, text, sha1=None):
454
"""See VersionedFile.add_lines for the non deprecated api."""
455
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
457
def _add(self, version_id, lines, parents, sha1=None):
249
458
"""Add a single text on top of the weave.
251
460
Returns the index number of the newly added version.
254
463
Symbolic name for this version.
255
464
(Typically the revision-id of the revision that added it.)
258
467
List or set of direct parent version numbers.
261
470
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)
473
assert isinstance(version_id, basestring)
474
self._check_lines_not_unicode(lines)
475
self._check_lines_are_lines(lines)
477
sha1 = sha_strings(lines)
478
if version_id in self._name_map:
479
return self._check_repeated_add(version_id, parents, lines, sha1)
275
481
self._check_versions(parents)
276
## self._check_lines(text)
482
## self._check_lines(lines)
277
483
new_version = len(self._parents)
280
485
# if we abort after here the (in-memory) weave will be corrupt because only
281
486
# some fields are updated
487
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
488
# - Robert Collins 20060226
282
489
self._parents.append(parents[:])
283
490
self._sha1s.append(sha1)
284
self._names.append(name)
285
self._name_map[name] = new_version
491
self._names.append(version_id)
492
self._name_map[version_id] = new_version
438
629
except IndexError:
439
630
raise IndexError("invalid version number %r" % i)
632
def _compatible_parents(self, my_parents, other_parents):
633
"""During join check that other_parents are joinable with my_parents.
635
Joinable is defined as 'is a subset of' - supersets may require
636
regeneration of diffs, but subsets do not.
638
return len(other_parents.difference(my_parents)) == 0
640
def annotate(self, version_id):
641
if isinstance(version_id, int):
642
warnings.warn('Weave.annotate(int) is deprecated. Please use version names'
643
' in all circumstances as of 0.8',
648
for origin, lineno, text in self._extract([version_id]):
649
result.append((origin, text))
652
return super(Weave, self).annotate(version_id)
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.
654
def annotate_iter(self, version_id):
655
"""Yield list of (version-id, line) pairs for the specified version.
449
657
The index indicates when the line originated in the weave."""
450
incls = [self.maybe_lookup(name_or_index)]
658
incls = [self._lookup(version_id)]
451
659
for origin, lineno, text in self._extract(incls):
660
yield self._idx_to_name(origin), text
662
@deprecated_method(zero_eight)
458
(lineno, insert, deletes, text)
459
for each literal line.
664
"""_walk has become visit, a supported api."""
665
return self._walk_internal()
667
def iter_lines_added_or_present_in_versions(self, version_ids=None):
668
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
669
if version_ids is None:
670
version_ids = self.versions()
671
version_ids = set(version_ids)
672
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
673
# if inserted not in version_ids then it was inserted before the
674
# versions we care about, but because weaves cannot represent ghosts
675
# properly, we do not filter down to that
676
# if inserted not in version_ids: continue
682
#@deprecated_method(zero_eight)
683
def walk(self, version_ids=None):
684
"""See VersionedFile.walk."""
685
return self._walk_internal(version_ids)
687
def _walk_internal(self, version_ids=None):
688
"""Helper method for weave actions."""
858
@deprecated_method(zero_eight)
555
859
def get_iter(self, name_or_index):
556
"""Yield lines for the specified version."""
557
incls = [self.maybe_lookup(name_or_index)]
860
"""Deprecated, please do not use. Lookups are not not needed.
862
Please use get_lines now.
864
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
866
@deprecated_method(zero_eight)
867
def maybe_lookup(self, name_or_index):
868
"""Deprecated, please do not use. Lookups are not not needed."""
869
return self._maybe_lookup(name_or_index)
871
def _maybe_lookup(self, name_or_index):
872
"""Convert possible symbolic name to index, or pass through indexes.
876
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)
879
return self._lookup(name_or_index)
881
@deprecated_method(zero_eight)
882
def get(self, version_id):
883
"""Please use either Weave.get_text or Weave.get_lines as desired."""
884
return self.get_lines(version_id)
886
def get_lines(self, version_id):
887
"""See VersionedFile.get_lines()."""
888
int_index = self._maybe_lookup(version_id)
889
result = [line for (origin, lineno, line) in self._extract([int_index])]
890
expected_sha1 = self._sha1s[int_index]
891
measured_sha1 = sha_strings(result)
892
if measured_sha1 != expected_sha1:
893
raise errors.WeaveInvalidChecksum(
894
'file %s, revision %s, expected: %s, measured %s'
895
% (self._weave_name, version_id,
896
expected_sha1, measured_sha1))
899
def get_sha1(self, version_id):
900
"""See VersionedFile.get_sha1()."""
901
return self._sha1s[self._lookup(version_id)]
903
@deprecated_method(zero_eight)
613
904
def numversions(self):
905
"""How many versions are in this weave?
907
Deprecated in favour of num_versions.
909
return self.num_versions()
911
def num_versions(self):
912
"""How many versions are in this weave?"""
614
913
l = len(self._parents)
615
914
assert l == len(self._sha1s)
620
return self.numversions()
917
__len__ = num_versions
622
919
def check(self, progress_bar=None):
623
# check no circular inclusions
624
for version in range(self.numversions()):
920
# TODO evaluate performance hit of using string sets in this routine.
921
# TODO: check no circular inclusions
922
# TODO: create a nested progress bar
923
for version in range(self.num_versions()):
625
924
inclusions = list(self._parents[version])
627
926
inclusions.sort()
652
955
update_text = 'checking %s' % (short_name,)
653
956
update_text = update_text[:25]
655
for lineno, insert, deleteset, line in self._walk():
958
for lineno, insert, deleteset, line in self._walk_internal():
657
960
progress_bar.update(update_text, lineno, nlines)
659
for j, j_inc in enumerate(inclusions):
962
for name, name_inclusions in inclusions.items():
660
963
# The active inclusion must be an ancestor,
661
964
# and no ancestors must have deleted this line,
662
965
# because we don't support resurrection.
663
if (insert in j_inc) and not (deleteset & j_inc):
664
sha1s[j].update(line)
966
if (insert in name_inclusions) and not (deleteset & name_inclusions):
967
sha1s[name].update(line)
666
for version in range(nv):
970
version = self._idx_to_name(i)
667
971
hd = sha1s[version].hexdigest()
668
expected = self._sha1s[version]
972
expected = self._sha1s[i]
669
973
if hd != expected:
670
974
raise errors.WeaveInvalidChecksum(
671
975
"mismatched sha1 for version %s: "
672
976
"got %s, expected %s"
673
% (self._names[version], hd, expected))
977
% (version, hd, expected))
675
979
# TODO: check insertions are properly nested, that there are
676
980
# no lines outside of insertion blocks, that deletions are
677
981
# 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:
983
def _join(self, other, pb, msg, version_ids, ignore_missing):
984
"""Worker routine for join()."""
985
if not other.versions():
814
986
return # nothing to update, easy
989
# versions is never none, InterWeave checks this.
815
992
# two loops so that we do not change ourselves before verifying it
817
994
# 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)
997
# get the selected versions only that are in other.versions.
998
version_ids = set(other.versions()).intersection(set(version_ids))
999
# pull in the referenced graph.
1000
version_ids = other.get_ancestry(version_ids)
1001
pending_graph = [(version, other.get_parents(version)) for
1002
version in version_ids]
1003
for name in topo_sort(pending_graph):
1004
other_idx = other._name_map[name]
1005
# returns True if we have it, False if we need it.
1006
if not self._check_version_consistent(other, other_idx, name):
1007
names_to_join.append((other_idx, name))
824
for other_idx, name in enumerate(other._names):
1016
for other_idx, name in names_to_join:
825
1017
# TODO: If all the parents of the other version are already
826
1018
# present then we can avoid some work by just taking the delta
827
1019
# and adjusting the offsets.
828
1020
new_parents = self._imported_parents(other, other_idx)
829
1021
sha1 = other._sha1s[other_idx]
1026
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
1028
lines = other.get_lines(other_idx)
842
self.add(name, new_parents, lines, sha1)
1029
self._add(name, lines, new_parents, sha1)
844
1031
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
845
merged,processed,self._weave_name, time.time( )-time0))
1032
merged, processed, self._weave_name, time.time()-time0))
850
1034
def _imported_parents(self, other, other_idx):
851
1035
"""Return list of parents in self corresponding to indexes in other."""
852
1036
new_parents = []
853
1037
for parent_idx in other._parents[other_idx]:
854
1038
parent_name = other._names[parent_idx]
855
if parent_name not in self._names:
1039
if parent_name not in self._name_map:
856
1040
# should not be possible
857
1041
raise WeaveError("missing parent {%s} of {%s} in %r"
858
1042
% (parent_name, other._name_map[other_idx], self))
894
def reweave(self, other):
895
"""Reweave self with other."""
896
new_weave = reweave(self, other)
1074
@deprecated_method(zero_eight)
1075
def reweave(self, other, pb=None, msg=None):
1076
"""reweave has been superseded by plain use of join."""
1077
return self.join(other, pb, msg)
1079
def _reweave(self, other, pb, msg):
1080
"""Reweave self with other - internal helper for join().
1082
:param other: The other weave to merge
1083
:param pb: An optional progress bar, indicating how far done we are
1084
:param msg: An optional message for the progress
1086
new_weave = _reweave(self, other, pb=pb, msg=msg)
1087
self._copy_weave_content(new_weave)
1089
def _copy_weave_content(self, otherweave):
1090
"""adsorb the content from otherweave."""
897
1091
for attr in self.__slots__:
898
setattr(self, attr, getattr(new_weave, attr))
1092
if attr != '_weave_name':
1093
setattr(self, attr, copy(getattr(otherweave, attr)))
1096
class WeaveFile(Weave):
1097
"""A WeaveFile represents a Weave on disk and writes on change."""
1099
WEAVE_SUFFIX = '.weave'
1101
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1102
"""Create a WeaveFile.
1104
:param create: If not True, only open an existing knit.
1106
super(WeaveFile, self).__init__(name, access_mode)
1107
self._transport = transport
1108
self._filemode = filemode
1110
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1111
except errors.NoSuchFile:
1117
def _add_lines(self, version_id, parents, lines, parent_texts):
1118
"""Add a version and save the weave."""
1119
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1124
def _clone_text(self, new_version_id, old_version_id, parents):
1125
"""See VersionedFile.clone_text."""
1126
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1129
def copy_to(self, name, transport):
1130
"""See VersionedFile.copy_to()."""
1131
# as we are all in memory always, just serialise to the new place.
1133
write_weave_v5(self, sio)
1135
transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1137
def create_empty(self, name, transport, filemode=None):
1138
return WeaveFile(name, transport, filemode, create=True)
1141
"""Save the weave."""
1142
self._check_write_ok()
1144
write_weave_v5(self, sio)
1146
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1152
"""See VersionedFile.get_suffixes()."""
1153
return [WeaveFile.WEAVE_SUFFIX]
1155
def join(self, other, pb=None, msg=None, version_ids=None,
1156
ignore_missing=False):
1157
"""Join other into self and save."""
1158
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1162
@deprecated_function(zero_eight)
1163
def reweave(wa, wb, pb=None, msg=None):
1164
"""reweaving is deprecation, please just use weave.join()."""
1165
_reweave(wa, wb, pb, msg)
1167
def _reweave(wa, wb, pb=None, msg=None):
902
1168
"""Combine two weaves and return the result.
904
1170
This works even if a revision R has different parents in
909
1175
might be possible but it should only be necessary to do
910
1176
this operation rarely, when a new previously ghost version is
1179
:param pb: An optional progress bar, indicating how far done we are
1180
:param msg: An optional message for the progress
915
queue_a = range(wa.numversions())
916
queue_b = range(wb.numversions())
1184
queue_a = range(wa.num_versions())
1185
queue_b = range(wb.num_versions())
917
1186
# first determine combined parents of all versions
918
1187
# map from version name -> all parent names
919
1188
combined_parents = _reweave_parent_graphs(wa, wb)
920
1189
mutter("combined parents: %r", combined_parents)
921
1190
order = topo_sort(combined_parents.iteritems())
922
1191
mutter("order to reweave: %r", order)
1196
for idx, name in enumerate(order):
1198
pb.update(msg, idx, len(order))
924
1199
if name in wa._name_map:
925
1200
lines = wa.get_lines(name)
926
1201
if name in wb._name_map:
927
assert lines == wb.get_lines(name)
1202
lines_b = wb.get_lines(name)
1203
if lines != lines_b:
1204
mutter('Weaves differ on content. rev_id {%s}', name)
1205
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1207
lines = list(difflib.unified_diff(lines, lines_b,
1208
wa._weave_name, wb._weave_name))
1209
mutter('lines:\n%s', ''.join(lines))
1210
raise errors.WeaveTextDiffers(name, wa, wb)
929
1212
lines = wb.get_lines(name)
930
wr.add(name, combined_parents[name], lines)
1213
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
934
1216
def _reweave_parent_graphs(wa, wb):
935
1217
"""Return combined parent ancestry for two weaves.
1134
1409
print ' '.join(map(str, w._parents[int(argv[3])]))
1136
1411
elif cmd == 'plan-merge':
1412
# replaced by 'bzr weave-plan-merge'
1138
1414
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1140
1416
print '%14s | %s' % (state, line),
1142
1417
elif cmd == 'merge':
1418
# replaced by 'bzr weave-merge-text'
1144
1420
p = w.plan_merge(int(argv[3]), int(argv[4]))
1145
1421
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
1423
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
1426
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))
1428
sys.exit(main(sys.argv))
1431
class InterWeave(InterVersionedFile):
1432
"""Optimised code paths for weave to weave operations."""
1434
_matching_file_from_factory = staticmethod(WeaveFile)
1435
_matching_file_to_factory = staticmethod(WeaveFile)
1438
def is_compatible(source, target):
1439
"""Be compatible with weaves."""
1441
return (isinstance(source, Weave) and
1442
isinstance(target, Weave))
1443
except AttributeError:
1446
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1447
"""See InterVersionedFile.join."""
1448
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1449
if self.target.versions() == [] and version_ids is None:
1450
self.target._copy_weave_content(self.source)
1453
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1454
except errors.WeaveParentMismatch:
1455
self.target._reweave(self.source, pb, msg)
1458
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
