217
199
return self._parents == other._parents \
218
200
and self._weave == other._weave \
219
201
and self._sha1s == other._sha1s
221
204
def __ne__(self, other):
222
205
return not self.__eq__(other)
224
@deprecated_method(zero_eight)
225
def idx_to_name(self, index):
226
"""Old public interface, the public interface is all names now."""
229
def _idx_to_name(self, version):
230
return self._names[version]
232
@deprecated_method(zero_eight)
233
208
def lookup(self, name):
234
"""Backwards compatibility thunk:
236
Return name, as name is valid in the api now, and spew deprecation
241
def _lookup(self, name):
242
"""Convert symbolic version name to index."""
244
210
return self._name_map[name]
246
raise RevisionNotPresent(name, self._weave_name)
248
@deprecated_method(zero_eight)
249
def iter_names(self):
250
"""Deprecated convenience function, please see VersionedFile.names()."""
251
return iter(self.names())
253
@deprecated_method(zero_eight)
255
"""See Weave.versions for the current api."""
256
return self.versions()
259
"""See VersionedFile.versions."""
260
return self._names[:]
262
def has_version(self, version_id):
263
"""See VersionedFile.has_version."""
264
return self._name_map.has_key(version_id)
266
__contains__ = has_version
268
def get_delta(self, version_id):
269
"""See VersionedFile.get_delta."""
270
return self.get_deltas([version_id])[version_id]
272
def get_deltas(self, version_ids):
273
"""See VersionedFile.get_deltas."""
274
version_ids = self.get_ancestry(version_ids)
275
for version_id in version_ids:
276
if not self.has_version(version_id):
277
raise RevisionNotPresent(version_id, self)
278
# try extracting all versions; parallel extraction is used
279
nv = self.num_versions()
285
last_parent_lines = {}
287
parent_inclusions = {}
292
# its simplest to generate a full set of prepared variables.
294
name = self._names[i]
295
sha1s[name] = self.get_sha1(name)
296
parents_list = self.get_parents(name)
298
parent = parents_list[0]
299
parents[name] = parent
300
parent_inclusions[name] = inclusions[parent]
303
parent_inclusions[name] = set()
304
# we want to emit start, finish, replacement_length, replacement_lines tuples.
305
diff_hunks[name] = []
306
current_hunks[name] = [0, 0, 0, []] # #start, finish, repl_length, repl_tuples
307
parent_linenums[name] = 0
309
parent_noeols[name] = False
310
last_parent_lines[name] = None
311
new_inc = set([name])
312
for p in self._parents[i]:
313
new_inc.update(inclusions[self._idx_to_name(p)])
314
# debug only, known good so far.
315
#assert set(new_inc) == set(self.get_ancestry(name)), \
316
# 'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
317
inclusions[name] = new_inc
319
nlines = len(self._weave)
321
for lineno, inserted, deletes, line in self._walk_internal():
322
# a line is active in a version if:
323
# insert is in the versions inclusions
325
# deleteset & the versions inclusions is an empty set.
326
# so - if we have a included by mapping - version is included by
327
# children, we get a list of children to examine for deletes affect
328
# ing them, which is less than the entire set of children.
329
for version_id in version_ids:
330
# The active inclusion must be an ancestor,
331
# and no ancestors must have deleted this line,
332
# because we don't support resurrection.
333
parent_inclusion = parent_inclusions[version_id]
334
inclusion = inclusions[version_id]
335
parent_active = inserted in parent_inclusion and not (deletes & parent_inclusion)
336
version_active = inserted in inclusion and not (deletes & inclusion)
337
if not parent_active and not version_active:
338
# unrelated line of ancestry
340
elif parent_active and version_active:
342
parent_linenum = parent_linenums[version_id]
343
if current_hunks[version_id] != [parent_linenum, parent_linenum, 0, []]:
344
diff_hunks[version_id].append(tuple(current_hunks[version_id]))
346
current_hunks[version_id] = [parent_linenum, parent_linenum, 0, []]
347
parent_linenums[version_id] = parent_linenum
350
noeols[version_id] = True
353
elif parent_active and not version_active:
355
current_hunks[version_id][1] += 1
356
parent_linenums[version_id] += 1
357
last_parent_lines[version_id] = line
358
elif not parent_active and version_active:
360
# noeol only occurs at the end of a file because we
361
# diff linewise. We want to show noeol changes as a
362
# empty diff unless the actual eol-less content changed.
365
if last_parent_lines[version_id][-1] != '\n':
366
parent_noeols[version_id] = True
367
except (TypeError, IndexError):
370
if theline[-1] != '\n':
371
noeols[version_id] = True
375
parent_should_go = False
377
if parent_noeols[version_id] == noeols[version_id]:
378
# no noeol toggle, so trust the weaves statement
379
# that this line is changed.
381
if parent_noeols[version_id]:
382
theline = theline + '\n'
383
elif parent_noeols[version_id]:
384
# parent has no eol, we do:
385
# our line is new, report as such..
387
elif noeols[version_id]:
388
# append a eol so that it looks like
390
theline = theline + '\n'
391
if parents[version_id] is not None:
392
#if last_parent_lines[version_id] is not None:
393
parent_should_go = True
394
if last_parent_lines[version_id] != theline:
397
#parent_should_go = False
399
current_hunks[version_id][2] += 1
400
current_hunks[version_id][3].append((inserted, theline))
402
# last hunk last parent line is not eaten
403
current_hunks[version_id][1] -= 1
404
if current_hunks[version_id][1] < 0:
405
current_hunks[version_id][1] = 0
406
# import pdb;pdb.set_trace()
407
# assert current_hunks[version_id][1] >= 0
411
version = self._idx_to_name(i)
412
if current_hunks[version] != [0, 0, 0, []]:
413
diff_hunks[version].append(tuple(current_hunks[version]))
415
for version_id in version_ids:
416
result[version_id] = (
420
diff_hunks[version_id],
424
def get_parents(self, version_id):
425
"""See VersionedFile.get_parent."""
426
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
428
def _check_repeated_add(self, name, parents, text, sha1):
429
"""Check that a duplicated add is OK.
431
If it is, return the (old) index; otherwise raise an exception.
433
idx = self._lookup(name)
434
if sorted(self._parents[idx]) != sorted(parents) \
435
or sha1 != self._sha1s[idx]:
436
raise RevisionAlreadyPresent(name, self._weave_name)
439
@deprecated_method(zero_eight)
440
def add_identical(self, old_rev_id, new_rev_id, parents):
441
"""Please use Weave.clone_text now."""
442
return self.clone_text(new_rev_id, old_rev_id, parents)
444
def _add_lines(self, version_id, parents, lines, parent_texts):
445
"""See VersionedFile.add_lines."""
446
return self._add(version_id, lines, map(self._lookup, parents))
448
@deprecated_method(zero_eight)
449
def add(self, name, parents, text, sha1=None):
450
"""See VersionedFile.add_lines for the non deprecated api."""
451
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
453
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):
454
216
"""Add a single text on top of the weave.
456
218
Returns the index number of the newly added version.
459
221
Symbolic name for this version.
460
222
(Typically the revision-id of the revision that added it.)
463
225
List or set of direct parent version numbers.
466
Sequence of lines to be added in the new version.
469
assert isinstance(version_id, basestring)
470
self._check_lines_not_unicode(lines)
471
self._check_lines_are_lines(lines)
473
sha1 = sha_strings(lines)
474
if version_id in self._name_map:
475
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)
477
234
self._check_versions(parents)
478
## self._check_lines(lines)
235
## self._check_lines(text)
479
236
new_version = len(self._parents)
481
243
# if we abort after here the (in-memory) weave will be corrupt because only
482
244
# some fields are updated
483
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
484
# - Robert Collins 20060226
485
245
self._parents.append(parents[:])
486
246
self._sha1s.append(sha1)
487
self._names.append(version_id)
488
self._name_map[version_id] = new_version
247
self._names.append(name)
248
self._name_map[name] = new_version
625
392
except IndexError:
626
393
raise IndexError("invalid version number %r" % i)
628
def _compatible_parents(self, my_parents, other_parents):
629
"""During join check that other_parents are joinable with my_parents.
631
Joinable is defined as 'is a subset of' - supersets may require
632
regeneration of diffs, but subsets do not.
634
return len(other_parents.difference(my_parents)) == 0
636
def annotate(self, version_id):
637
if isinstance(version_id, int):
638
warn('Weave.annotate(int) is deprecated. Please use version names'
639
' in all circumstances as of 0.8',
644
for origin, lineno, text in self._extract([version_id]):
645
result.append((origin, text))
648
return super(Weave, self).annotate(version_id)
650
def annotate_iter(self, version_id):
651
"""Yield list of (version-id, line) pairs for the specified version.
396
def annotate(self, index):
397
return list(self.annotate_iter(index))
400
def annotate_iter(self, version):
401
"""Yield list of (index-id, line) pairs for the specified version.
653
403
The index indicates when the line originated in the weave."""
654
incls = [self._lookup(version_id)]
655
for origin, lineno, text in self._extract(incls):
656
yield self._idx_to_name(origin), text
658
@deprecated_method(zero_eight)
404
for origin, lineno, text in self._extract([version]):
660
"""_walk has become visit, a supported api."""
661
return self._walk_internal()
663
def iter_lines_added_or_present_in_versions(self, version_ids=None):
664
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
665
if version_ids is None:
666
version_ids = self.versions()
667
version_ids = set(version_ids)
668
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
669
# if inserted not in version_ids then it was inserted before the
670
# versions we care about, but because weaves cannot represent ghosts
671
# properly, we do not filter down to that
672
# if inserted not in version_ids: continue
678
#@deprecated_method(zero_eight)
679
def walk(self, version_ids=None):
680
"""See VersionedFile.walk."""
681
return self._walk_internal(version_ids)
683
def _walk_internal(self, version_ids=None):
684
"""Helper method for weave actions."""
412
(lineno, insert, deletes, text)
413
for each literal line.
840
assert l.__class__ in (str, unicode)
486
assert isinstance(l, basestring)
841
487
if isactive is None:
842
488
isactive = (not dset) and istack and (istack[-1] in included)
844
490
result.append((istack[-1], lineno, l))
847
raise WeaveFormatError("unclosed insertion blocks "
848
"at end of weave: %s" % istack)
494
raise WFE("unclosed insertion blocks at end of weave",
850
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
854
@deprecated_method(zero_eight)
855
def get_iter(self, name_or_index):
856
"""Deprecated, please do not use. Lookups are not not needed.
858
Please use get_lines now.
860
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
862
@deprecated_method(zero_eight)
863
def maybe_lookup(self, name_or_index):
864
"""Deprecated, please do not use. Lookups are not not needed."""
865
return self._maybe_lookup(name_or_index)
867
def _maybe_lookup(self, name_or_index):
868
"""Convert possible symbolic name to index, or pass through indexes.
872
if isinstance(name_or_index, (int, long)):
875
return self._lookup(name_or_index)
877
@deprecated_method(zero_eight)
878
def get(self, version_id):
879
"""Please use either Weave.get_text or Weave.get_lines as desired."""
880
return self.get_lines(version_id)
882
def get_lines(self, version_id):
883
"""See VersionedFile.get_lines()."""
884
int_index = self._maybe_lookup(version_id)
885
result = [line for (origin, lineno, line) in self._extract([int_index])]
886
expected_sha1 = self._sha1s[int_index]
887
measured_sha1 = sha_strings(result)
888
if measured_sha1 != expected_sha1:
889
raise errors.WeaveInvalidChecksum(
890
'file %s, revision %s, expected: %s, measured %s'
891
% (self._weave_name, version_id,
892
expected_sha1, measured_sha1))
895
def get_sha1(self, version_id):
896
"""See VersionedFile.get_sha1()."""
897
return self._sha1s[self._lookup(version_id)]
899
@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)
900
529
def numversions(self):
901
"""How many versions are in this weave?
903
Deprecated in favour of num_versions.
905
return self.num_versions()
907
def num_versions(self):
908
"""How many versions are in this weave?"""
909
530
l = len(self._parents)
910
531
assert l == len(self._sha1s)
913
__len__ = num_versions
536
return self.numversions()
915
539
def check(self, progress_bar=None):
916
# TODO evaluate performance hit of using string sets in this routine.
917
# TODO: check no circular inclusions
918
# TODO: create a nested progress bar
919
for version in range(self.num_versions()):
540
# check no circular inclusions
541
for version in range(self.numversions()):
920
542
inclusions = list(self._parents[version])
922
544
inclusions.sort()
924
546
raise WeaveFormatError("invalid included version %d for index %d"
925
547
% (inclusions[-1], version))
927
# try extracting all versions; parallel extraction is used
928
nv = self.num_versions()
933
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
934
# The problem is that set membership is much more expensive
935
name = self._idx_to_name(i)
936
sha1s[name] = sha.new()
938
new_inc = set([name])
939
for p in self._parents[i]:
940
new_inc.update(inclusions[self._idx_to_name(p)])
942
assert set(new_inc) == set(self.get_ancestry(name)), \
943
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
944
inclusions[name] = new_inc
946
nlines = len(self._weave)
948
update_text = 'checking weave'
950
short_name = os.path.basename(self._weave_name)
951
update_text = 'checking %s' % (short_name,)
952
update_text = update_text[:25]
954
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):
956
progress_bar.update(update_text, lineno, nlines)
958
for name, name_inclusions in inclusions.items():
959
# The active inclusion must be an ancestor,
960
# and no ancestors must have deleted this line,
961
# because we don't support resurrection.
962
if (insert in name_inclusions) and not (deleteset & name_inclusions):
963
sha1s[name].update(line)
966
version = self._idx_to_name(i)
967
hd = sha1s[version].hexdigest()
968
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]
969
560
if hd != expected:
970
raise errors.WeaveInvalidChecksum(
971
"mismatched sha1 for version %s: "
972
"got %s, expected %s"
973
% (version, hd, expected))
561
raise WeaveError("mismatched sha1 for version %d; "
562
"got %s, expected %s"
563
% (version, hd, expected))
975
565
# TODO: check insertions are properly nested, that there are
976
566
# no lines outside of insertion blocks, that deletions are
977
567
# properly paired, etc.
979
def _join(self, other, pb, msg, version_ids, ignore_missing):
980
"""Worker routine for join()."""
981
if not other.versions():
982
return # nothing to update, easy
985
# versions is never none, InterWeave checks this.
988
# two loops so that we do not change ourselves before verifying it
990
# work through in index order to make sure we get all dependencies
993
# get the selected versions only that are in other.versions.
994
version_ids = set(other.versions()).intersection(set(version_ids))
995
# pull in the referenced graph.
996
version_ids = other.get_ancestry(version_ids)
997
pending_graph = [(version, other.get_parents(version)) for
998
version in version_ids]
999
for name in topo_sort(pending_graph):
1000
other_idx = other._name_map[name]
1001
# returns True if we have it, False if we need it.
1002
if not self._check_version_consistent(other, other_idx, name):
1003
names_to_join.append((other_idx, name))
1012
for other_idx, name in names_to_join:
1013
# TODO: If all the parents of the other version are already
1014
# present then we can avoid some work by just taking the delta
1015
# and adjusting the offsets.
1016
new_parents = self._imported_parents(other, other_idx)
1017
sha1 = other._sha1s[other_idx]
1022
pb.update(msg, merged, len(names_to_join))
1024
lines = other.get_lines(other_idx)
1025
self._add(name, lines, new_parents, sha1)
1027
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1028
merged, processed, self._weave_name, time.time()-time0))
1030
def _imported_parents(self, other, other_idx):
1031
"""Return list of parents in self corresponding to indexes in other."""
1033
for parent_idx in other._parents[other_idx]:
1034
parent_name = other._names[parent_idx]
1035
if parent_name not in self._name_map:
1036
# should not be possible
1037
raise WeaveError("missing parent {%s} of {%s} in %r"
1038
% (parent_name, other._name_map[other_idx], self))
1039
new_parents.append(self._name_map[parent_name])
1042
def _check_version_consistent(self, other, other_idx, name):
1043
"""Check if a version in consistent in this and other.
1045
To be consistent it must have:
1048
* the same direct parents (by name, not index, and disregarding
1051
If present & correct return True;
1052
if not present in self return False;
1053
if inconsistent raise error."""
1054
this_idx = self._name_map.get(name, -1)
1056
if self._sha1s[this_idx] != other._sha1s[other_idx]:
1057
raise errors.WeaveTextDiffers(name, self, other)
1058
self_parents = self._parents[this_idx]
1059
other_parents = other._parents[other_idx]
1060
n1 = set([self._names[i] for i in self_parents])
1061
n2 = set([other._names[i] for i in other_parents])
1062
if not self._compatible_parents(n1, n2):
1063
raise WeaveParentMismatch("inconsistent parents "
1064
"for version {%s}: %s vs %s" % (name, n1, n2))
1070
@deprecated_method(zero_eight)
1071
def reweave(self, other, pb=None, msg=None):
1072
"""reweave has been superseded by plain use of join."""
1073
return self.join(other, pb, msg)
1075
def _reweave(self, other, pb, msg):
1076
"""Reweave self with other - internal helper for join().
1078
:param other: The other weave to merge
1079
:param pb: An optional progress bar, indicating how far done we are
1080
:param msg: An optional message for the progress
1082
new_weave = _reweave(self, other, pb=pb, msg=msg)
1083
self._copy_weave_content(new_weave)
1085
def _copy_weave_content(self, otherweave):
1086
"""adsorb the content from otherweave."""
1087
for attr in self.__slots__:
1088
if attr != '_weave_name':
1089
setattr(self, attr, copy(getattr(otherweave, attr)))
1092
class WeaveFile(Weave):
1093
"""A WeaveFile represents a Weave on disk and writes on change."""
1095
WEAVE_SUFFIX = '.weave'
1097
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1098
"""Create a WeaveFile.
1100
:param create: If not True, only open an existing knit.
1102
super(WeaveFile, self).__init__(name, access_mode)
1103
self._transport = transport
1104
self._filemode = filemode
1106
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1107
except errors.NoSuchFile:
1113
def _add_lines(self, version_id, parents, lines, parent_texts):
1114
"""Add a version and save the weave."""
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(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(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):
added
removed
bzrlib/weave.py
