224
199
return self._parents == other._parents \
225
200
and self._weave == other._weave \
226
201
and self._sha1s == other._sha1s
228
204
def __ne__(self, other):
229
205
return not self.__eq__(other)
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)
240
208
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):
249
"""Convert symbolic version name to index."""
250
self.check_not_reserved_id(name)
252
210
return self._name_map[name]
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."""
268
return self._names[:]
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)])
436
def _check_repeated_add(self, name, parents, text, sha1):
437
"""Check that a duplicated add is OK.
439
If it is, return the (old) index; otherwise raise an exception.
441
idx = self._lookup(name)
442
if sorted(self._parents[idx]) != sorted(parents) \
443
or sha1 != self._sha1s[idx]:
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)
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):
212
raise WeaveError("name %s not present in weave" % name)
215
def add(self, name, parents, text):
462
216
"""Add a single text on top of the weave.
464
218
Returns the index number of the newly added version.
467
221
Symbolic name for this version.
468
222
(Typically the revision-id of the revision that added it.)
471
225
List or set of direct parent version numbers.
474
Sequence of lines to be added in the new version.
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)
228
Sequence of lines to be added in the new version."""
230
assert isinstance(name, basestring)
231
if name in self._name_map:
232
raise WeaveError("name %r already present in weave" % name)
485
234
self._check_versions(parents)
486
## self._check_lines(lines)
235
## self._check_lines(text)
487
236
new_version = len(self._parents)
489
243
# if we abort after here the (in-memory) weave will be corrupt because only
490
244
# some fields are updated
491
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
492
# - Robert Collins 20060226
493
245
self._parents.append(parents[:])
494
246
self._sha1s.append(sha1)
495
self._names.append(version_id)
496
self._name_map[version_id] = new_version
247
self._names.append(name)
248
self._name_map[name] = new_version
835
assert l.__class__ in (str, unicode)
486
assert isinstance(l, basestring)
836
487
if isactive is None:
837
488
isactive = (not dset) and istack and (istack[-1] in included)
839
490
result.append((istack[-1], lineno, l))
842
raise WeaveFormatError("unclosed insertion blocks "
843
"at end of weave: %s" % istack)
494
raise WFE("unclosed insertion blocks at end of weave",
845
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
849
@deprecated_method(zero_eight)
850
def get_iter(self, 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)):
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)
497
raise WFE("unclosed deletion blocks at end of weave",
504
def get_iter(self, version):
505
"""Yield lines for the specified version."""
506
for origin, lineno, line in self._extract([version]):
510
def get(self, index):
511
return list(self.get_iter(index))
514
def mash_iter(self, included):
515
"""Return composed version of multiple included versions."""
516
for origin, lineno, text in self._extract(included):
520
def dump(self, to_file):
521
from pprint import pprint
522
print >>to_file, "Weave._weave = ",
523
pprint(self._weave, to_file)
524
print >>to_file, "Weave._parents = ",
525
pprint(self._parents, to_file)
899
529
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?"""
908
530
l = len(self._parents)
909
531
assert l == len(self._sha1s)
912
__len__ = num_versions
536
return self.numversions()
914
539
def check(self, progress_bar=None):
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()):
540
# check no circular inclusions
541
for version in range(self.numversions()):
919
542
inclusions = list(self._parents[version])
921
544
inclusions.sort()
923
546
raise WeaveFormatError("invalid included version %d for index %d"
924
547
% (inclusions[-1], version))
926
# try extracting all versions; parallel extraction is used
927
nv = self.num_versions()
932
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
933
# The problem is that set membership is much more expensive
934
name = self._idx_to_name(i)
935
sha1s[name] = sha.new()
937
new_inc = set([name])
938
for p in self._parents[i]:
939
new_inc.update(inclusions[self._idx_to_name(p)])
941
assert set(new_inc) == set(self.get_ancestry(name)), \
942
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
943
inclusions[name] = new_inc
945
nlines = len(self._weave)
947
update_text = 'checking weave'
949
short_name = os.path.basename(self._weave_name)
950
update_text = 'checking %s' % (short_name,)
951
update_text = update_text[:25]
953
for lineno, insert, deleteset, line in self._walk_internal():
549
# try extracting all versions; this is a bit slow and parallel
550
# extraction could be used
551
nv = self.numversions()
552
for version in range(nv):
955
progress_bar.update(update_text, lineno, nlines)
957
for name, name_inclusions in inclusions.items():
958
# The active inclusion must be an ancestor,
959
# and no ancestors must have deleted this line,
960
# because we don't support resurrection.
961
if (insert in name_inclusions) and not (deleteset & name_inclusions):
962
sha1s[name].update(line)
965
version = self._idx_to_name(i)
966
hd = sha1s[version].hexdigest()
967
expected = self._sha1s[i]
554
progress_bar.update('checking text', version, nv)
556
for l in self.get_iter(version):
559
expected = self._sha1s[version]
968
560
if hd != expected:
969
raise errors.WeaveInvalidChecksum(
970
"mismatched sha1 for version %s: "
971
"got %s, expected %s"
972
% (version, hd, expected))
561
raise WeaveError("mismatched sha1 for version %d; "
562
"got %s, expected %s"
563
% (version, hd, expected))
974
565
# TODO: check insertions are properly nested, that there are
975
566
# no lines outside of insertion blocks, that deletions are
976
567
# properly paired, etc.
978
def _join(self, other, pb, msg, version_ids, ignore_missing):
979
"""Worker routine for join()."""
980
if not other.versions():
981
return # nothing to update, easy
984
# versions is never none, InterWeave checks this.
987
# two loops so that we do not change ourselves before verifying it
989
# work through in index order to make sure we get all dependencies
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))
1011
for other_idx, name in names_to_join:
1012
# TODO: If all the parents of the other version are already
1013
# present then we can avoid some work by just taking the delta
1014
# and adjusting the offsets.
1015
new_parents = self._imported_parents(other, other_idx)
1016
sha1 = other._sha1s[other_idx]
1021
pb.update(msg, merged, len(names_to_join))
1023
lines = other.get_lines(other_idx)
1024
self._add(name, lines, new_parents, sha1)
1026
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1027
merged, processed, self._weave_name, time.time()-time0))
1029
def _imported_parents(self, other, other_idx):
1030
"""Return list of parents in self corresponding to indexes in other."""
1032
for parent_idx in other._parents[other_idx]:
1033
parent_name = other._names[parent_idx]
1034
if parent_name not in self._name_map:
1035
# should not be possible
1036
raise WeaveError("missing parent {%s} of {%s} in %r"
1037
% (parent_name, other._name_map[other_idx], self))
1038
new_parents.append(self._name_map[parent_name])
1041
def _check_version_consistent(self, other, other_idx, name):
1042
"""Check if a version in consistent in this and other.
1044
To be consistent it must have:
1047
* the same direct parents (by name, not index, and disregarding
1050
If present & correct return True;
1051
if not present in self return False;
1052
if inconsistent raise error."""
1053
this_idx = self._name_map.get(name, -1)
1055
if self._sha1s[this_idx] != other._sha1s[other_idx]:
1056
raise errors.WeaveTextDiffers(name, self, other)
1057
self_parents = self._parents[this_idx]
1058
other_parents = other._parents[other_idx]
1059
n1 = set([self._names[i] for i in self_parents])
1060
n2 = set([other._names[i] for i in other_parents])
1061
if not self._compatible_parents(n1, n2):
1062
raise WeaveParentMismatch("inconsistent parents "
1063
"for version {%s}: %s vs %s" % (name, n1, n2))
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."""
1086
for attr in self.__slots__:
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):
1164
"""Combine two weaves and return the result.
1166
This works even if a revision R has different parents in
1167
wa and wb. In the resulting weave all the parents are given.
1169
This is done by just building up a new weave, maintaining ordering
1170
of the versions in the two inputs. More efficient approaches
1171
might be possible but it should only be necessary to do
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
1180
queue_a = range(wa.num_versions())
1181
queue_b = range(wb.num_versions())
1182
# first determine combined parents of all versions
1183
# map from version name -> all parent names
1184
combined_parents = _reweave_parent_graphs(wa, wb)
1185
mutter("combined parents: %r", combined_parents)
1186
order = topo_sort(combined_parents.iteritems())
1187
mutter("order to reweave: %r", order)
1192
for idx, name in enumerate(order):
1194
pb.update(msg, idx, len(order))
1195
if name in wa._name_map:
1196
lines = wa.get_lines(name)
1197
if name in wb._name_map:
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)
1208
lines = wb.get_lines(name)
1209
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1212
def _reweave_parent_graphs(wa, wb):
1213
"""Return combined parent ancestry for two weaves.
1215
Returned as a list of (version_name, set(parent_names))"""
1217
for weave in [wa, wb]:
1218
for idx, name in enumerate(weave._names):
1219
p = combined.setdefault(name, set())
1220
p.update(map(weave._idx_to_name, weave._parents[idx]))
571
def merge(self, merge_versions):
572
"""Automerge and mark conflicts between versions.
574
This returns a sequence, each entry describing alternatives
575
for a chunk of the file. Each of the alternatives is given as
578
If there is a chunk of the file where there's no diagreement,
579
only one alternative is given.
582
# approach: find the included versions common to all the
584
raise NotImplementedError()
588
def _delta(self, included, lines):
589
"""Return changes from basis to new revision.
591
The old text for comparison is the union of included revisions.
593
This is used in inserting a new text.
595
Delta is returned as a sequence of
596
(weave1, weave2, newlines).
598
This indicates that weave1:weave2 of the old weave should be
599
replaced by the sequence of lines in newlines. Note that
600
these line numbers are positions in the total weave and don't
601
correspond to the lines in any extracted version, or even the
602
extracted union of included versions.
604
If line1=line2, this is a pure insert; if newlines=[] this is a
605
pure delete. (Similar to difflib.)
610
def plan_merge(self, ver_a, ver_b):
611
"""Return pseudo-annotation indicating how the two versions merge.
613
This is computed between versions a and b and their common
616
Weave lines present in none of them are skipped entirely.
618
inc_a = self.inclusions([ver_a])
619
inc_b = self.inclusions([ver_b])
620
inc_c = inc_a & inc_b
622
for lineno, insert, deleteset, line in self._walk():
623
if deleteset & inc_c:
624
# killed in parent; can't be in either a or b
625
# not relevant to our work
626
yield 'killed-base', line
627
elif insert in inc_c:
628
# was inserted in base
629
killed_a = bool(deleteset & inc_a)
630
killed_b = bool(deleteset & inc_b)
631
if killed_a and killed_b:
632
yield 'killed-both', line
634
yield 'killed-a', line
636
yield 'killed-b', line
638
yield 'unchanged', line
639
elif insert in inc_a:
640
if deleteset & inc_a:
641
yield 'ghost-a', line
645
elif insert in inc_b:
646
if deleteset & inc_b:
647
yield 'ghost-b', line
651
# not in either revision
652
yield 'irrelevant', line
654
yield 'unchanged', '' # terminator
658
def weave_merge(self, plan):
663
for state, line in plan:
664
if state == 'unchanged' or state == 'killed-both':
665
# resync and flush queued conflicts changes if any
666
if not lines_a and not lines_b:
668
elif ch_a and not ch_b:
670
for l in lines_a: yield l
671
elif ch_b and not ch_a:
672
for l in lines_b: yield l
673
elif lines_a == lines_b:
674
for l in lines_a: yield l
677
for l in lines_a: yield l
679
for l in lines_b: yield l
686
if state == 'unchanged':
689
elif state == 'killed-a':
692
elif state == 'killed-b':
695
elif state == 'new-a':
698
elif state == 'new-b':
702
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
1224
712
def weave_toc(w):
1405
883
print ' '.join(map(str, w._parents[int(argv[3])]))
1407
885
elif cmd == 'plan-merge':
1408
# replaced by 'bzr weave-plan-merge'
1410
887
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1412
889
print '%14s | %s' % (state, line),
1413
891
elif cmd == 'merge':
1414
# replaced by 'bzr weave-merge-text'
1416
893
p = w.plan_merge(int(argv[3]), int(argv[4]))
1417
894
sys.stdout.writelines(w.weave_merge(p))
896
elif cmd == 'mash-merge':
902
v1, v2 = map(int, argv[3:5])
904
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
906
base_lines = list(w.mash_iter(basis))
907
a_lines = list(w.get(v1))
908
b_lines = list(w.get(v2))
910
from bzrlib.merge3 import Merge3
911
m3 = Merge3(base_lines, a_lines, b_lines)
913
name_a = 'version %d' % v1
914
name_b = 'version %d' % v2
915
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1419
917
raise ValueError('unknown command %r' % cmd)
921
def profile_main(argv):
922
import tempfile, hotshot, hotshot.stats
924
prof_f = tempfile.NamedTemporaryFile()
926
prof = hotshot.Profile(prof_f.name)
928
ret = prof.runcall(main, argv)
931
stats = hotshot.stats.load(prof_f.name)
933
stats.sort_stats('cumulative')
934
## XXX: Might like to write to stderr or the trace file instead but
935
## print_stats seems hardcoded to stdout
936
stats.print_stats(20)
1422
941
if __name__ == '__main__':
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)
943
if '--profile' in sys.argv:
945
args.remove('--profile')
946
sys.exit(profile_main(args))
948
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
