224
205
return self._parents == other._parents \
225
206
and self._weave == other._weave \
226
207
and self._sha1s == other._sha1s
228
210
def __ne__(self, other):
229
211
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)
214
def maybe_lookup(self, name_or_index):
215
"""Convert possible symbolic name to index, or pass through indexes."""
216
if isinstance(name_or_index, (int, long)):
219
return self.lookup(name_or_index)
240
222
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
223
"""Convert symbolic version name to index."""
250
self.check_not_reserved_id(name)
252
225
return self._name_map[name]
254
raise RevisionNotPresent(name, self._weave_name)
256
@deprecated_method(zero_eight)
227
raise WeaveError("name %r not present in weave %r" %
228
(name, self._weave_name))
257
231
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)])
232
"""Yield a list of all names in this weave."""
233
return iter(self._names)
235
def idx_to_name(self, version):
236
return self._names[version]
436
239
def _check_repeated_add(self, name, parents, text, sha1):
437
240
"""Check that a duplicated add is OK.
439
242
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)
244
idx = self.lookup(name)
245
if sorted(self._parents[idx]) != sorted(parents):
246
raise WeaveError("name \"%s\" already present in weave "
247
"with different parents" % name)
248
if sha1 != self._sha1s[idx]:
249
raise WeaveError("name \"%s\" already present in weave "
250
"with different text" % 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
255
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):
462
256
"""Add a single text on top of the weave.
464
258
Returns the index number of the newly added version.
467
261
Symbolic name for this version.
468
262
(Typically the revision-id of the revision that added it.)
471
265
List or set of direct parent version numbers.
474
268
Sequence of lines to be added in the new version.
270
sha -- SHA-1 of the file, if known. This is trusted to be
477
assert isinstance(version_id, basestring)
478
self._check_lines_not_unicode(lines)
479
self._check_lines_are_lines(lines)
481
sha1 = sha_strings(lines)
482
if version_id in self._name_map:
483
return self._check_repeated_add(version_id, parents, lines, sha1)
273
from bzrlib.osutils import sha_strings
275
assert isinstance(name, basestring)
277
sha1 = sha_strings(text)
278
if name in self._name_map:
279
return self._check_repeated_add(name, parents, text, sha1)
281
parents = map(self.maybe_lookup, parents)
485
282
self._check_versions(parents)
486
## self._check_lines(lines)
283
## self._check_lines(text)
487
284
new_version = len(self._parents)
489
287
# if we abort after here the (in-memory) weave will be corrupt because only
490
288
# some fields are updated
491
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
492
# - Robert Collins 20060226
493
289
self._parents.append(parents[:])
494
290
self._sha1s.append(sha1)
495
self._names.append(version_id)
496
self._name_map[version_id] = new_version
291
self._names.append(name)
292
self._name_map[name] = new_version
633
445
except IndexError:
634
446
raise IndexError("invalid version number %r" % i)
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(self, version_id):
645
if isinstance(version_id, int):
646
warnings.warn('Weave.annotate(int) is deprecated. Please use version names'
647
' in all circumstances as of 0.8',
652
for origin, lineno, text in self._extract([version_id]):
653
result.append((origin, text))
656
return super(Weave, self).annotate(version_id)
658
def annotate_iter(self, version_id):
659
"""Yield list of (version-id, line) pairs for the specified version.
449
def annotate(self, name_or_index):
450
return list(self.annotate_iter(name_or_index))
453
def annotate_iter(self, name_or_index):
454
"""Yield list of (index-id, line) pairs for the specified version.
661
456
The index indicates when the line originated in the weave."""
662
incls = [self._lookup(version_id)]
457
incls = [self.maybe_lookup(name_or_index)]
663
458
for origin, lineno, text in self._extract(incls):
664
yield self._idx_to_name(origin), text
666
@deprecated_method(zero_eight)
668
"""_walk has become visit, a supported api."""
669
return self._walk_internal()
671
def iter_lines_added_or_present_in_versions(self, version_ids=None,
673
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
674
if version_ids is None:
675
version_ids = self.versions()
676
version_ids = set(version_ids)
677
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
678
# if inserted not in version_ids then it was inserted before the
679
# versions we care about, but because weaves cannot represent ghosts
680
# properly, we do not filter down to that
681
# if inserted not in version_ids: continue
687
#@deprecated_method(zero_eight)
688
def walk(self, version_ids=None):
689
"""See VersionedFile.walk."""
690
return self._walk_internal(version_ids)
692
def _walk_internal(self, version_ids=None):
693
"""Helper method for weave actions."""
466
(lineno, insert, deletes, text)
467
for each literal line.
849
assert l.__class__ in (str, unicode)
544
assert isinstance(l, basestring)
850
545
if isactive is None:
851
546
isactive = (not dset) and istack and (istack[-1] in included)
853
548
result.append((istack[-1], lineno, l))
856
raise WeaveFormatError("unclosed insertion blocks "
857
"at end of weave: %s" % istack)
552
raise WFE("unclosed insertion blocks at end of weave",
859
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
555
raise WFE("unclosed deletion blocks at end of weave",
863
@deprecated_method(zero_eight)
864
562
def get_iter(self, name_or_index):
865
"""Deprecated, please do not use. Lookups are not not needed.
867
Please use get_lines now.
869
return iter(self.get_lines(self._maybe_lookup(name_or_index)))
871
@deprecated_method(zero_eight)
872
def maybe_lookup(self, name_or_index):
873
"""Deprecated, please do not use. Lookups are not not needed."""
874
return self._maybe_lookup(name_or_index)
876
def _maybe_lookup(self, name_or_index):
877
"""Convert possible symbolic name to index, or pass through indexes.
881
if isinstance(name_or_index, (int, long)):
884
return self._lookup(name_or_index)
886
@deprecated_method(zero_eight)
887
def get(self, version_id):
888
"""Please use either Weave.get_text or Weave.get_lines as desired."""
889
return self.get_lines(version_id)
891
def get_lines(self, version_id):
892
"""See VersionedFile.get_lines()."""
893
int_index = self._maybe_lookup(version_id)
894
result = [line for (origin, lineno, line) in self._extract([int_index])]
895
expected_sha1 = self._sha1s[int_index]
896
measured_sha1 = sha_strings(result)
897
if measured_sha1 != expected_sha1:
898
raise errors.WeaveInvalidChecksum(
899
'file %s, revision %s, expected: %s, measured %s'
900
% (self._weave_name, version_id,
901
expected_sha1, measured_sha1))
904
def get_sha1(self, version_id):
905
"""See VersionedFile.get_sha1()."""
906
return self._sha1s[self._lookup(version_id)]
908
@deprecated_method(zero_eight)
563
"""Yield lines for the specified version."""
564
incls = [self.maybe_lookup(name_or_index)]
565
for origin, lineno, line in self._extract(incls):
569
def get_text(self, name_or_index):
570
return ''.join(self.get_iter(name_or_index))
571
assert isinstance(version, int)
574
def get_lines(self, name_or_index):
575
return list(self.get_iter(name_or_index))
581
def mash_iter(self, included):
582
"""Return composed version of multiple included versions."""
583
included = map(self.maybe_lookup, included)
584
for origin, lineno, text in self._extract(included):
588
def dump(self, to_file):
589
from pprint import pprint
590
print >>to_file, "Weave._weave = ",
591
pprint(self._weave, to_file)
592
print >>to_file, "Weave._parents = ",
593
pprint(self._parents, to_file)
909
597
def numversions(self):
910
"""How many versions are in this weave?
912
Deprecated in favour of num_versions.
914
return self.num_versions()
916
def num_versions(self):
917
"""How many versions are in this weave?"""
918
598
l = len(self._parents)
919
599
assert l == len(self._sha1s)
922
__len__ = num_versions
604
return self.numversions()
924
607
def check(self, progress_bar=None):
925
# TODO evaluate performance hit of using string sets in this routine.
926
# TODO: check no circular inclusions
927
# TODO: create a nested progress bar
928
for version in range(self.num_versions()):
608
# check no circular inclusions
609
for version in range(self.numversions()):
929
610
inclusions = list(self._parents[version])
931
612
inclusions.sort()
933
614
raise WeaveFormatError("invalid included version %d for index %d"
934
615
% (inclusions[-1], version))
936
# try extracting all versions; parallel extraction is used
937
nv = self.num_versions()
942
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
943
# The problem is that set membership is much more expensive
944
name = self._idx_to_name(i)
945
sha1s[name] = sha.new()
947
new_inc = set([name])
948
for p in self._parents[i]:
949
new_inc.update(inclusions[self._idx_to_name(p)])
951
assert set(new_inc) == set(self.get_ancestry(name)), \
952
'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
953
inclusions[name] = new_inc
955
nlines = len(self._weave)
957
update_text = 'checking weave'
959
short_name = os.path.basename(self._weave_name)
960
update_text = 'checking %s' % (short_name,)
961
update_text = update_text[:25]
963
for lineno, insert, deleteset, line in self._walk_internal():
617
# try extracting all versions; this is a bit slow and parallel
618
# extraction could be used
619
nv = self.numversions()
620
for version in range(nv):
965
progress_bar.update(update_text, lineno, nlines)
967
for name, name_inclusions in inclusions.items():
968
# The active inclusion must be an ancestor,
969
# and no ancestors must have deleted this line,
970
# because we don't support resurrection.
971
if (insert in name_inclusions) and not (deleteset & name_inclusions):
972
sha1s[name].update(line)
975
version = self._idx_to_name(i)
976
hd = sha1s[version].hexdigest()
977
expected = self._sha1s[i]
622
progress_bar.update('checking text', version, nv)
624
for l in self.get_iter(version):
627
expected = self._sha1s[version]
978
628
if hd != expected:
979
raise errors.WeaveInvalidChecksum(
980
"mismatched sha1 for version %s: "
981
"got %s, expected %s"
982
% (version, hd, expected))
629
raise WeaveError("mismatched sha1 for version %d; "
630
"got %s, expected %s"
631
% (version, hd, expected))
984
633
# TODO: check insertions are properly nested, that there are
985
634
# no lines outside of insertion blocks, that deletions are
986
635
# properly paired, etc.
988
def _join(self, other, pb, msg, version_ids, ignore_missing):
989
"""Worker routine for join()."""
990
if not other.versions():
639
def merge(self, merge_versions):
640
"""Automerge and mark conflicts between versions.
642
This returns a sequence, each entry describing alternatives
643
for a chunk of the file. Each of the alternatives is given as
646
If there is a chunk of the file where there's no diagreement,
647
only one alternative is given.
649
# approach: find the included versions common to all the
651
raise NotImplementedError()
655
def _delta(self, included, lines):
656
"""Return changes from basis to new revision.
658
The old text for comparison is the union of included revisions.
660
This is used in inserting a new text.
662
Delta is returned as a sequence of
663
(weave1, weave2, newlines).
665
This indicates that weave1:weave2 of the old weave should be
666
replaced by the sequence of lines in newlines. Note that
667
these line numbers are positions in the total weave and don't
668
correspond to the lines in any extracted version, or even the
669
extracted union of included versions.
671
If line1=line2, this is a pure insert; if newlines=[] this is a
672
pure delete. (Similar to difflib.)
674
raise NotImplementedError()
677
def plan_merge(self, ver_a, ver_b):
678
"""Return pseudo-annotation indicating how the two versions merge.
680
This is computed between versions a and b and their common
683
Weave lines present in none of them are skipped entirely.
685
inc_a = self.inclusions([ver_a])
686
inc_b = self.inclusions([ver_b])
687
inc_c = inc_a & inc_b
689
for lineno, insert, deleteset, line in self._walk():
690
if deleteset & inc_c:
691
# killed in parent; can't be in either a or b
692
# not relevant to our work
693
yield 'killed-base', line
694
elif insert in inc_c:
695
# was inserted in base
696
killed_a = bool(deleteset & inc_a)
697
killed_b = bool(deleteset & inc_b)
698
if killed_a and killed_b:
699
yield 'killed-both', line
701
yield 'killed-a', line
703
yield 'killed-b', line
705
yield 'unchanged', line
706
elif insert in inc_a:
707
if deleteset & inc_a:
708
yield 'ghost-a', line
712
elif insert in inc_b:
713
if deleteset & inc_b:
714
yield 'ghost-b', line
718
# not in either revision
719
yield 'irrelevant', line
721
yield 'unchanged', '' # terminator
725
def weave_merge(self, plan):
730
for state, line in plan:
731
if state == 'unchanged' or state == 'killed-both':
732
# resync and flush queued conflicts changes if any
733
if not lines_a and not lines_b:
735
elif ch_a and not ch_b:
737
for l in lines_a: yield l
738
elif ch_b and not ch_a:
739
for l in lines_b: yield l
740
elif lines_a == lines_b:
741
for l in lines_a: yield l
744
for l in lines_a: yield l
746
for l in lines_b: yield l
753
if state == 'unchanged':
756
elif state == 'killed-a':
759
elif state == 'killed-b':
762
elif state == 'new-a':
765
elif state == 'new-b':
769
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
774
def join(self, other):
775
"""Integrate versions from other into this weave.
777
The resulting weave contains all the history of both weaves;
778
any version you could retrieve from either self or other can be
779
retrieved from self after this call.
781
It is illegal for the two weaves to contain different values
782
or different parents for any version. See also reweave().
784
if other.numversions() == 0:
991
785
return # nothing to update, easy
994
# versions is never none, InterWeave checks this.
997
786
# two loops so that we do not change ourselves before verifying it
999
788
# work through in index order to make sure we get all dependencies
1002
# get the selected versions only that are in other.versions.
1003
version_ids = set(other.versions()).intersection(set(version_ids))
1004
# pull in the referenced graph.
1005
version_ids = other.get_ancestry(version_ids)
1006
pending_graph = [(version, other.get_parents(version)) for
1007
version in version_ids]
1008
for name in topo_sort(pending_graph):
1009
other_idx = other._name_map[name]
1010
# returns True if we have it, False if we need it.
1011
if not self._check_version_consistent(other, other_idx, name):
1012
names_to_join.append((other_idx, name))
1021
for other_idx, name in names_to_join:
1022
# TODO: If all the parents of the other version are already
789
for other_idx, name in enumerate(other._names):
790
if self._check_version_consistent(other, other_idx, name):
792
for other_idx, name in enumerate(other._names):
793
# TODO: If all the parents of the other version are already
1023
794
# present then we can avoid some work by just taking the delta
1024
795
# and adjusting the offsets.
1025
796
new_parents = self._imported_parents(other, other_idx)
797
lines = other.get_lines(other_idx)
1026
798
sha1 = other._sha1s[other_idx]
1031
pb.update(msg, merged, len(names_to_join))
1033
lines = other.get_lines(other_idx)
1034
self._add(name, lines, new_parents, sha1)
1036
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1037
merged, processed, self._weave_name, time.time()-time0))
799
self.add(name, new_parents, lines, sha1)
1039
802
def _imported_parents(self, other, other_idx):
1040
803
"""Return list of parents in self corresponding to indexes in other."""
1041
804
new_parents = []
1042
805
for parent_idx in other._parents[other_idx]:
1043
806
parent_name = other._names[parent_idx]
1044
if parent_name not in self._name_map:
807
if parent_name not in self._names:
1045
808
# should not be possible
1046
809
raise WeaveError("missing parent {%s} of {%s} in %r"
1047
810
% (parent_name, other._name_map[other_idx], self))
1079
@deprecated_method(zero_eight)
1080
def reweave(self, other, pb=None, msg=None):
1081
"""reweave has been superseded by plain use of join."""
1082
return self.join(other, pb, msg)
1084
def _reweave(self, other, pb, msg):
1085
"""Reweave self with other - internal helper for join().
1087
:param other: The other weave to merge
1088
:param pb: An optional progress bar, indicating how far done we are
1089
:param msg: An optional message for the progress
1091
new_weave = _reweave(self, other, pb=pb, msg=msg)
1092
self._copy_weave_content(new_weave)
1094
def _copy_weave_content(self, otherweave):
1095
"""adsorb the content from otherweave."""
846
def reweave(self, other):
847
"""Reweave self with other."""
848
new_weave = reweave(self, other)
1096
849
for attr in self.__slots__:
1097
if attr != '_weave_name':
1098
setattr(self, attr, copy(getattr(otherweave, attr)))
1101
class WeaveFile(Weave):
1102
"""A WeaveFile represents a Weave on disk and writes on change."""
1104
WEAVE_SUFFIX = '.weave'
1106
def __init__(self, name, transport, filemode=None, create=False, access_mode='w'):
1107
"""Create a WeaveFile.
1109
:param create: If not True, only open an existing knit.
1111
super(WeaveFile, self).__init__(name, access_mode)
1112
self._transport = transport
1113
self._filemode = filemode
1115
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1116
except errors.NoSuchFile:
1122
def _add_lines(self, version_id, parents, lines, parent_texts):
1123
"""Add a version and save the weave."""
1124
self.check_not_reserved_id(version_id)
1125
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
1130
def _clone_text(self, new_version_id, old_version_id, parents):
1131
"""See VersionedFile.clone_text."""
1132
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
1135
def copy_to(self, name, transport):
1136
"""See VersionedFile.copy_to()."""
1137
# as we are all in memory always, just serialise to the new place.
1139
write_weave_v5(self, sio)
1141
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1143
def create_empty(self, name, transport, filemode=None):
1144
return WeaveFile(name, transport, filemode, create=True)
1147
"""Save the weave."""
1148
self._check_write_ok()
1150
write_weave_v5(self, sio)
1152
self._transport.put_file(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1158
"""See VersionedFile.get_suffixes()."""
1159
return [WeaveFile.WEAVE_SUFFIX]
1161
def join(self, other, pb=None, msg=None, version_ids=None,
1162
ignore_missing=False):
1163
"""Join other into self and save."""
1164
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
1168
@deprecated_function(zero_eight)
1169
def reweave(wa, wb, pb=None, msg=None):
1170
"""reweaving is deprecation, please just use weave.join()."""
1171
_reweave(wa, wb, pb, msg)
1173
def _reweave(wa, wb, pb=None, msg=None):
850
setattr(self, attr, getattr(new_weave, attr))
1174
854
"""Combine two weaves and return the result.
1176
856
This works even if a revision R has different parents in
1181
861
might be possible but it should only be necessary to do
1182
862
this operation rarely, when a new previously ghost version is
1185
:param pb: An optional progress bar, indicating how far done we are
1186
:param msg: An optional message for the progress
1190
queue_a = range(wa.num_versions())
1191
queue_b = range(wb.num_versions())
867
queue_a = range(wa.numversions())
868
queue_b = range(wb.numversions())
1192
869
# first determine combined parents of all versions
1193
870
# map from version name -> all parent names
1194
871
combined_parents = _reweave_parent_graphs(wa, wb)
1195
872
mutter("combined parents: %r", combined_parents)
1196
order = topo_sort(combined_parents.iteritems())
873
order = _make_reweave_order(wa._names, wb._names, combined_parents)
1197
874
mutter("order to reweave: %r", order)
1202
for idx, name in enumerate(order):
1204
pb.update(msg, idx, len(order))
1205
876
if name in wa._name_map:
1206
877
lines = wa.get_lines(name)
1207
878
if name in wb._name_map:
1208
lines_b = wb.get_lines(name)
1209
if lines != lines_b:
1210
mutter('Weaves differ on content. rev_id {%s}', name)
1211
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1213
lines = list(difflib.unified_diff(lines, lines_b,
1214
wa._weave_name, wb._weave_name))
1215
mutter('lines:\n%s', ''.join(lines))
1216
raise errors.WeaveTextDiffers(name, wa, wb)
879
assert lines == wb.get_lines(name)
1218
881
lines = wb.get_lines(name)
1219
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
882
wr.add(name, combined_parents[name], lines)
1222
886
def _reweave_parent_graphs(wa, wb):
1223
887
"""Return combined parent ancestry for two weaves.
1415
1120
print ' '.join(map(str, w._parents[int(argv[3])]))
1417
1122
elif cmd == 'plan-merge':
1418
# replaced by 'bzr weave-plan-merge'
1420
1124
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1422
1126
print '%14s | %s' % (state, line),
1423
1128
elif cmd == 'merge':
1424
# replaced by 'bzr weave-merge-text'
1426
1130
p = w.plan_merge(int(argv[3]), int(argv[4]))
1427
1131
sys.stdout.writelines(w.weave_merge(p))
1133
elif cmd == 'mash-merge':
1139
v1, v2 = map(int, argv[3:5])
1141
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
1143
base_lines = list(w.mash_iter(basis))
1144
a_lines = list(w.get(v1))
1145
b_lines = list(w.get(v2))
1147
from bzrlib.merge3 import Merge3
1148
m3 = Merge3(base_lines, a_lines, b_lines)
1150
name_a = 'version %d' % v1
1151
name_b = 'version %d' % v2
1152
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1429
1154
raise ValueError('unknown command %r' % cmd)
1158
def profile_main(argv):
1159
import tempfile, hotshot, hotshot.stats
1161
prof_f = tempfile.NamedTemporaryFile()
1163
prof = hotshot.Profile(prof_f.name)
1165
ret = prof.runcall(main, argv)
1168
stats = hotshot.stats.load(prof_f.name)
1170
stats.sort_stats('cumulative')
1171
## XXX: Might like to write to stderr or the trace file instead but
1172
## print_stats seems hardcoded to stdout
1173
stats.print_stats(20)
1432
1178
if __name__ == '__main__':
1434
sys.exit(main(sys.argv))
1437
class InterWeave(InterVersionedFile):
1438
"""Optimised code paths for weave to weave operations."""
1440
_matching_file_from_factory = staticmethod(WeaveFile)
1441
_matching_file_to_factory = staticmethod(WeaveFile)
1444
def is_compatible(source, target):
1445
"""Be compatible with weaves."""
1447
return (isinstance(source, Weave) and
1448
isinstance(target, Weave))
1449
except AttributeError:
1452
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1453
"""See InterVersionedFile.join."""
1454
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1455
if self.target.versions() == [] and version_ids is None:
1456
self.target._copy_weave_content(self.source)
1459
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1460
except errors.WeaveParentMismatch:
1461
self.target._reweave(self.source, pb, msg)
1464
InterVersionedFile.register_optimiser(InterWeave)
1180
if '--profile' in sys.argv:
1182
args.remove('--profile')
1183
sys.exit(profile_main(args))
1185
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
