215
198
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
216
'_weave_name', '_matcher', '_allow_reserved']
218
def __init__(self, weave_name=None, access_mode='w', matcher=None,
219
get_scope=None, allow_reserved=False):
222
:param get_scope: A callable that returns an opaque object to be used
223
for detecting when this weave goes out of scope (should stop
224
answering requests or allowing mutation).
226
super(Weave, self).__init__()
201
def __init__(self, weave_name=None):
228
203
self._parents = []
231
206
self._name_map = {}
232
207
self._weave_name = weave_name
234
self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
236
self._matcher = matcher
237
if get_scope is None:
238
get_scope = lambda:None
239
self._get_scope = get_scope
240
self._scope = get_scope()
241
self._access_mode = access_mode
242
self._allow_reserved = allow_reserved
245
return "Weave(%r)" % self._weave_name
247
def _check_write_ok(self):
248
"""Is the versioned file marked as 'finished' ? Raise if it is."""
249
if self._get_scope() != self._scope:
250
raise errors.OutSideTransaction()
251
if self._access_mode != 'w':
252
raise errors.ReadOnlyObjectDirtiedError(self)
255
"""Return a deep copy of self.
257
The copy can be modified without affecting the original weave."""
259
other._weave = self._weave[:]
260
other._parents = self._parents[:]
261
other._sha1s = self._sha1s[:]
262
other._names = self._names[:]
263
other._name_map = self._name_map.copy()
264
other._weave_name = self._weave_name
267
210
def __eq__(self, other):
268
211
if not isinstance(other, Weave):
270
213
return self._parents == other._parents \
271
214
and self._weave == other._weave \
272
and self._sha1s == other._sha1s
215
and self._sha1s == other._sha1s
274
218
def __ne__(self, other):
275
219
return not self.__eq__(other)
277
def _idx_to_name(self, version):
278
return self._names[version]
280
def _lookup(self, name):
222
def maybe_lookup(self, name_or_index):
223
"""Convert possible symbolic name to index, or pass through indexes."""
224
if isinstance(name_or_index, (int, long)):
227
return self.lookup(name_or_index)
230
def lookup(self, name):
281
231
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
285
233
return self._name_map[name]
287
raise RevisionNotPresent(name, self._weave_name)
290
"""See VersionedFile.versions."""
291
return self._names[:]
293
def has_version(self, version_id):
294
"""See VersionedFile.has_version."""
295
return (version_id in self._name_map)
297
__contains__ = has_version
299
def get_record_stream(self, versions, ordering, include_delta_closure):
300
"""Get a stream of records for versions.
302
:param versions: The versions to include. Each version is a tuple
304
:param ordering: Either 'unordered' or 'topological'. A topologically
305
sorted stream has compression parents strictly before their
307
:param include_delta_closure: If True then the closure across any
308
compression parents will be included (in the opaque data).
309
:return: An iterator of ContentFactory objects, each of which is only
310
valid until the iterator is advanced.
312
versions = [version[-1] for version in versions]
313
if ordering == 'topological':
314
parents = self.get_parent_map(versions)
315
new_versions = tsort.topo_sort(parents)
316
new_versions.extend(set(versions).difference(set(parents)))
317
versions = new_versions
318
elif ordering == 'groupcompress':
319
parents = self.get_parent_map(versions)
320
new_versions = sort_groupcompress(parents)
321
new_versions.extend(set(versions).difference(set(parents)))
322
versions = new_versions
323
for version in versions:
325
yield WeaveContentFactory(version, self)
327
yield AbsentContentFactory((version,))
329
def get_parent_map(self, version_ids):
330
"""See VersionedFile.get_parent_map."""
332
for version_id in version_ids:
333
if version_id == NULL_REVISION:
338
map(self._idx_to_name,
339
self._parents[self._lookup(version_id)]))
340
except RevisionNotPresent:
342
result[version_id] = parents
345
def get_parents_with_ghosts(self, version_id):
346
raise NotImplementedError(self.get_parents_with_ghosts)
348
def insert_record_stream(self, stream):
349
"""Insert a record stream into this versioned file.
351
:param stream: A stream of records to insert.
353
:seealso VersionedFile.get_record_stream:
356
for record in stream:
357
# Raise an error when a record is missing.
358
if record.storage_kind == 'absent':
359
raise RevisionNotPresent([record.key[0]], self)
360
# adapt to non-tuple interface
361
parents = [parent[0] for parent in record.parents]
362
if (record.storage_kind == 'fulltext'
363
or record.storage_kind == 'chunked'):
364
self.add_lines(record.key[0], parents,
365
osutils.chunks_to_lines(record.get_bytes_as('chunked')))
367
adapter_key = record.storage_kind, 'fulltext'
369
adapter = adapters[adapter_key]
371
adapter_factory = adapter_registry.get(adapter_key)
372
adapter = adapter_factory(self)
373
adapters[adapter_key] = adapter
374
lines = split_lines(adapter.get_bytes(record))
376
self.add_lines(record.key[0], parents, lines)
377
except RevisionAlreadyPresent:
235
raise WeaveError("name %r not present in weave %r" %
236
(name, self._weave_name))
239
def idx_to_name(self, version):
240
return self._names[version]
380
243
def _check_repeated_add(self, name, parents, text, sha1):
381
244
"""Check that a duplicated add is OK.
383
246
If it is, return the (old) index; otherwise raise an exception.
385
idx = self._lookup(name)
386
if sorted(self._parents[idx]) != sorted(parents) \
387
or sha1 != self._sha1s[idx]:
388
raise RevisionAlreadyPresent(name, self._weave_name)
248
idx = self.lookup(name)
249
if sorted(self._parents[idx]) != sorted(parents):
250
raise WeaveError("name \"%s\" already present in weave "
251
"with different parents" % name)
252
if sha1 != self._sha1s[idx]:
253
raise WeaveError("name \"%s\" already present in weave "
254
"with different text" % name)
391
def _add_lines(self, version_id, parents, lines, parent_texts,
392
left_matching_blocks, nostore_sha, random_id, check_content):
393
"""See VersionedFile.add_lines."""
394
idx = self._add(version_id, lines, map(self._lookup, parents),
395
nostore_sha=nostore_sha)
396
return sha_strings(lines), sum(map(len, lines)), idx
398
def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
259
def add(self, name, parents, text, sha1=None):
399
260
"""Add a single text on top of the weave.
401
262
Returns the index number of the newly added version.
404
265
Symbolic name for this version.
405
266
(Typically the revision-id of the revision that added it.)
406
If None, a name will be allocated based on the hash. (sha1:SHAHASH)
409
269
List or set of direct parent version numbers.
412
272
Sequence of lines to be added in the new version.
414
:param nostore_sha: See VersionedFile.add_lines.
274
sha -- SHA-1 of the file, if known. This is trusted to be
416
self._check_lines_not_unicode(lines)
417
self._check_lines_are_lines(lines)
419
sha1 = sha_strings(lines)
420
if sha1 == nostore_sha:
421
raise errors.ExistingContent
422
if version_id is None:
423
version_id = "sha1:" + sha1
424
if version_id in self._name_map:
425
return self._check_repeated_add(version_id, parents, lines, sha1)
278
assert isinstance(name, basestring)
280
sha1 = sha_strings(text)
281
if name in self._name_map:
282
return self._check_repeated_add(name, parents, text, sha1)
284
parents = map(self.maybe_lookup, parents)
427
285
self._check_versions(parents)
428
## self._check_lines(lines)
286
## self._check_lines(text)
429
287
new_version = len(self._parents)
431
290
# if we abort after here the (in-memory) weave will be corrupt because only
432
291
# some fields are updated
433
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
434
# - Robert Collins 20060226
435
292
self._parents.append(parents[:])
436
293
self._sha1s.append(sha1)
437
self._names.append(version_id)
438
self._name_map[version_id] = new_version
294
self._names.append(name)
295
self._name_map[name] = new_version
442
299
# special case; adding with no parents revision; can do
443
300
# this more quickly by just appending unconditionally.
444
301
# even more specially, if we're adding an empty text we
445
302
# need do nothing at all.
447
304
self._weave.append(('{', new_version))
448
self._weave.extend(lines)
305
self._weave.extend(text)
449
306
self._weave.append(('}', None))
450
308
return new_version
452
310
if len(parents) == 1:
554
439
except IndexError:
555
440
raise IndexError("invalid version number %r" % i)
557
def _compatible_parents(self, my_parents, other_parents):
558
"""During join check that other_parents are joinable with my_parents.
560
Joinable is defined as 'is a subset of' - supersets may require
561
regeneration of diffs, but subsets do not.
563
return len(other_parents.difference(my_parents)) == 0
565
def annotate(self, version_id):
566
"""Return a list of (version-id, line) tuples for version_id.
443
def annotate(self, name_or_index):
444
return list(self.annotate_iter(name_or_index))
447
def annotate_iter(self, name_or_index):
448
"""Yield list of (index-id, line) pairs for the specified version.
568
450
The index indicates when the line originated in the weave."""
569
incls = [self._lookup(version_id)]
570
return [(self._idx_to_name(origin), text) for origin, lineno, text in
571
self._extract(incls)]
573
def iter_lines_added_or_present_in_versions(self, version_ids=None,
575
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
576
if version_ids is None:
577
version_ids = self.versions()
578
version_ids = set(version_ids)
579
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
580
if inserted not in version_ids: continue
582
yield line + '\n', inserted
586
def _walk_internal(self, version_ids=None):
587
"""Helper method for weave actions."""
451
incls = [self.maybe_lookup(name_or_index)]
452
for origin, lineno, text in self._extract(incls):
460
(lineno, insert, deletes, text)
461
for each literal line.
592
467
lineno = 0 # line of weave, 0-based
594
469
for l in self._weave:
595
if l.__class__ == tuple:
470
if isinstance(l, tuple):
599
istack.append(self._names[v])
603
dset.add(self._names[v])
605
dset.remove(self._names[v])
607
raise WeaveFormatError('unexpected instruction %r' % v)
609
yield lineno, istack[-1], frozenset(dset), l
483
raise WeaveFormatError('unexpected instruction %r'
486
assert isinstance(l, basestring)
488
yield lineno, istack[-1], dset, l
493
def _extract(self, versions):
494
"""Yield annotation of lines in included set.
496
Yields a sequence of tuples (origin, lineno, text), where
497
origin is the origin version, lineno the index in the weave,
498
and text the text of the line.
500
The set typically but not necessarily corresponds to a version.
503
if not isinstance(i, int):
506
included = self.inclusions(versions)
511
lineno = 0 # line of weave, 0-based
517
WFE = WeaveFormatError
519
for l in self._weave:
520
if isinstance(l, tuple):
524
assert v not in istack
538
assert isinstance(l, basestring)
540
isactive = (not dset) and istack and (istack[-1] in included)
542
result.append((istack[-1], lineno, l))
613
raise WeaveFormatError("unclosed insertion blocks "
614
"at end of weave: %s" % istack)
546
raise WFE("unclosed insertion blocks at end of weave",
616
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
549
raise WFE("unclosed deletion blocks at end of weave",
556
def get_iter(self, name_or_index):
557
"""Yield lines for the specified version."""
558
incls = [self.maybe_lookup(name_or_index)]
559
for origin, lineno, line in self._extract(incls):
563
def get_text(self, version):
564
assert isinstance(version, int)
566
s.writelines(self.get_iter(version))
570
def get(self, name_or_index):
571
return list(self.get_iter(name_or_index))
574
def mash_iter(self, included):
575
"""Return composed version of multiple included versions."""
576
included = map(self.maybe_lookup, included)
577
for origin, lineno, text in self._extract(included):
581
def dump(self, to_file):
582
from pprint import pprint
583
print >>to_file, "Weave._weave = ",
584
pprint(self._weave, to_file)
585
print >>to_file, "Weave._parents = ",
586
pprint(self._parents, to_file)
590
def numversions(self):
591
l = len(self._parents)
592
assert l == len(self._sha1s)
597
return self.numversions()
600
def check(self, progress_bar=None):
601
# check no circular inclusions
602
for version in range(self.numversions()):
603
inclusions = list(self._parents[version])
606
if inclusions[-1] >= version:
607
raise WeaveFormatError("invalid included version %d for index %d"
608
% (inclusions[-1], version))
610
# try extracting all versions; this is a bit slow and parallel
611
# extraction could be used
612
nv = self.numversions()
613
for version in range(nv):
615
progress_bar.update('checking text', version, nv)
617
for l in self.get_iter(version):
620
expected = self._sha1s[version]
622
raise WeaveError("mismatched sha1 for version %d; "
623
"got %s, expected %s"
624
% (version, hd, expected))
626
# TODO: check insertions are properly nested, that there are
627
# no lines outside of insertion blocks, that deletions are
628
# properly paired, etc.
632
def merge(self, merge_versions):
633
"""Automerge and mark conflicts between versions.
635
This returns a sequence, each entry describing alternatives
636
for a chunk of the file. Each of the alternatives is given as
639
If there is a chunk of the file where there's no diagreement,
640
only one alternative is given.
643
# approach: find the included versions common to all the
645
raise NotImplementedError()
649
def _delta(self, included, lines):
650
"""Return changes from basis to new revision.
652
The old text for comparison is the union of included revisions.
654
This is used in inserting a new text.
656
Delta is returned as a sequence of
657
(weave1, weave2, newlines).
659
This indicates that weave1:weave2 of the old weave should be
660
replaced by the sequence of lines in newlines. Note that
661
these line numbers are positions in the total weave and don't
662
correspond to the lines in any extracted version, or even the
663
extracted union of included versions.
665
If line1=line2, this is a pure insert; if newlines=[] this is a
666
pure delete. (Similar to difflib.)
619
671
def plan_merge(self, ver_a, ver_b):
620
672
"""Return pseudo-annotation indicating how the two versions merge.
660
712
# not in either revision
661
713
yield 'irrelevant', line
663
def _extract(self, versions):
664
"""Yield annotation of lines in included set.
666
Yields a sequence of tuples (origin, lineno, text), where
667
origin is the origin version, lineno the index in the weave,
668
and text the text of the line.
670
The set typically but not necessarily corresponds to a version.
673
if not isinstance(i, int):
676
included = self._inclusions(versions)
682
lineno = 0 # line of weave, 0-based
688
WFE = WeaveFormatError
691
# 449 0 4474.6820 2356.5590 bzrlib.weave:556(_extract)
692
# +285282 0 1676.8040 1676.8040 +<isinstance>
693
# 1.6 seconds in 'isinstance'.
694
# changing the first isinstance:
695
# 449 0 2814.2660 1577.1760 bzrlib.weave:556(_extract)
696
# +140414 0 762.8050 762.8050 +<isinstance>
697
# note that the inline time actually dropped (less function calls)
698
# and total processing time was halved.
699
# we're still spending ~1/4 of the method in isinstance though.
700
# so lets hard code the acceptable string classes we expect:
701
# 449 0 1202.9420 786.2930 bzrlib.weave:556(_extract)
702
# +71352 0 377.5560 377.5560 +<method 'append' of 'list'
704
# yay, down to ~1/4 the initial extract time, and our inline time
705
# has shrunk again, with isinstance no longer dominating.
706
# tweaking the stack inclusion test to use a set gives:
707
# 449 0 1122.8030 713.0080 bzrlib.weave:556(_extract)
708
# +71352 0 354.9980 354.9980 +<method 'append' of 'list'
710
# - a 5% win, or possibly just noise. However with large istacks that
711
# 'in' test could dominate, so I'm leaving this change in place -
712
# when its fast enough to consider profiling big datasets we can review.
717
for l in self._weave:
718
if l.__class__ == tuple:
725
iset.remove(istack.pop())
715
yield 'unchanged', '' # terminator
719
def weave_merge(self, plan):
724
for state, line in plan:
725
if state == 'unchanged' or state == 'killed-both':
726
# resync and flush queued conflicts changes if any
727
if not lines_a and not lines_b:
729
elif ch_a and not ch_b:
731
for l in lines_a: yield l
732
elif ch_b and not ch_a:
733
for l in lines_b: yield l
734
elif lines_a == lines_b:
735
for l in lines_a: yield l
733
raise AssertionError()
736
isactive = (not dset) and istack and (istack[-1] in included)
738
result.append((istack[-1], lineno, l))
741
raise WeaveFormatError("unclosed insertion blocks "
742
"at end of weave: %s" % istack)
744
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
748
def _maybe_lookup(self, name_or_index):
749
"""Convert possible symbolic name to index, or pass through indexes.
753
if isinstance(name_or_index, (int, long)):
756
return self._lookup(name_or_index)
758
def get_lines(self, version_id):
759
"""See VersionedFile.get_lines()."""
760
int_index = self._maybe_lookup(version_id)
761
result = [line for (origin, lineno, line) in self._extract([int_index])]
762
expected_sha1 = self._sha1s[int_index]
763
measured_sha1 = sha_strings(result)
764
if measured_sha1 != expected_sha1:
765
raise errors.WeaveInvalidChecksum(
766
'file %s, revision %s, expected: %s, measured %s'
767
% (self._weave_name, version_id,
768
expected_sha1, measured_sha1))
771
def get_sha1s(self, version_ids):
772
"""See VersionedFile.get_sha1s()."""
774
for v in version_ids:
775
result[v] = self._sha1s[self._lookup(v)]
778
def num_versions(self):
779
"""How many versions are in this weave?"""
780
l = len(self._parents)
783
__len__ = num_versions
785
def check(self, progress_bar=None):
786
# TODO evaluate performance hit of using string sets in this routine.
787
# TODO: check no circular inclusions
788
# TODO: create a nested progress bar
789
for version in range(self.num_versions()):
790
inclusions = list(self._parents[version])
793
if inclusions[-1] >= version:
794
raise WeaveFormatError("invalid included version %d for index %d"
795
% (inclusions[-1], version))
797
# try extracting all versions; parallel extraction is used
798
nv = self.num_versions()
803
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
804
# The problem is that set membership is much more expensive
805
name = self._idx_to_name(i)
808
new_inc = set([name])
809
for p in self._parents[i]:
810
new_inc.update(inclusions[self._idx_to_name(p)])
812
if set(new_inc) != set(self.get_ancestry(name)):
813
raise AssertionError(
815
% (set(new_inc), set(self.get_ancestry(name))))
816
inclusions[name] = new_inc
818
nlines = len(self._weave)
820
update_text = 'checking weave'
822
short_name = os.path.basename(self._weave_name)
823
update_text = 'checking %s' % (short_name,)
824
update_text = update_text[:25]
826
for lineno, insert, deleteset, line in self._walk_internal():
828
progress_bar.update(update_text, lineno, nlines)
830
for name, name_inclusions in inclusions.items():
831
# The active inclusion must be an ancestor,
832
# and no ancestors must have deleted this line,
833
# because we don't support resurrection.
834
if (insert in name_inclusions) and not (deleteset & name_inclusions):
835
sha1s[name].update(line)
838
version = self._idx_to_name(i)
839
hd = sha1s[version].hexdigest()
840
expected = self._sha1s[i]
842
raise errors.WeaveInvalidChecksum(
843
"mismatched sha1 for version %s: "
844
"got %s, expected %s"
845
% (version, hd, expected))
847
# TODO: check insertions are properly nested, that there are
848
# no lines outside of insertion blocks, that deletions are
849
# properly paired, etc.
851
def _imported_parents(self, other, other_idx):
852
"""Return list of parents in self corresponding to indexes in other."""
854
for parent_idx in other._parents[other_idx]:
855
parent_name = other._names[parent_idx]
856
if parent_name not in self._name_map:
857
# should not be possible
858
raise WeaveError("missing parent {%s} of {%s} in %r"
859
% (parent_name, other._name_map[other_idx], self))
860
new_parents.append(self._name_map[parent_name])
863
def _check_version_consistent(self, other, other_idx, name):
864
"""Check if a version in consistent in this and other.
866
To be consistent it must have:
869
* the same direct parents (by name, not index, and disregarding
872
If present & correct return True;
873
if not present in self return False;
874
if inconsistent raise error."""
875
this_idx = self._name_map.get(name, -1)
877
if self._sha1s[this_idx] != other._sha1s[other_idx]:
878
raise errors.WeaveTextDiffers(name, self, other)
879
self_parents = self._parents[this_idx]
880
other_parents = other._parents[other_idx]
881
n1 = set([self._names[i] for i in self_parents])
882
n2 = set([other._names[i] for i in other_parents])
883
if not self._compatible_parents(n1, n2):
884
raise WeaveParentMismatch("inconsistent parents "
885
"for version {%s}: %s vs %s" % (name, n1, n2))
891
def _reweave(self, other, pb, msg):
892
"""Reweave self with other - internal helper for join().
894
:param other: The other weave to merge
895
:param pb: An optional progress bar, indicating how far done we are
896
:param msg: An optional message for the progress
898
new_weave = _reweave(self, other, pb=pb, msg=msg)
899
self._copy_weave_content(new_weave)
901
def _copy_weave_content(self, otherweave):
902
"""adsorb the content from otherweave."""
903
for attr in self.__slots__:
904
if attr != '_weave_name':
905
setattr(self, attr, copy(getattr(otherweave, attr)))
908
class WeaveFile(Weave):
909
"""A WeaveFile represents a Weave on disk and writes on change."""
911
WEAVE_SUFFIX = '.weave'
913
def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
914
"""Create a WeaveFile.
916
:param create: If not True, only open an existing knit.
918
super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
919
allow_reserved=False)
920
self._transport = transport
921
self._filemode = filemode
923
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
924
except errors.NoSuchFile:
930
def _add_lines(self, version_id, parents, lines, parent_texts,
931
left_matching_blocks, nostore_sha, random_id, check_content):
932
"""Add a version and save the weave."""
933
self.check_not_reserved_id(version_id)
934
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
935
parent_texts, left_matching_blocks, nostore_sha, random_id,
940
def copy_to(self, name, transport):
941
"""See VersionedFile.copy_to()."""
942
# as we are all in memory always, just serialise to the new place.
944
write_weave_v5(self, sio)
946
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
949
"""Save the weave."""
950
self._check_write_ok()
952
write_weave_v5(self, sio)
954
bytes = sio.getvalue()
955
path = self._weave_name + WeaveFile.WEAVE_SUFFIX
957
self._transport.put_bytes(path, bytes, self._filemode)
958
except errors.NoSuchFile:
959
self._transport.mkdir(dirname(path))
960
self._transport.put_bytes(path, bytes, self._filemode)
964
"""See VersionedFile.get_suffixes()."""
965
return [WeaveFile.WEAVE_SUFFIX]
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
972
def _reweave(wa, wb, pb=None, msg=None):
973
"""Combine two weaves and return the result.
975
This works even if a revision R has different parents in
976
wa and wb. In the resulting weave all the parents are given.
978
This is done by just building up a new weave, maintaining ordering
979
of the versions in the two inputs. More efficient approaches
980
might be possible but it should only be necessary to do
981
this operation rarely, when a new previously ghost version is
984
:param pb: An optional progress bar, indicating how far done we are
985
:param msg: An optional message for the progress
989
queue_a = range(wa.num_versions())
990
queue_b = range(wb.num_versions())
991
# first determine combined parents of all versions
992
# map from version name -> all parent names
993
combined_parents = _reweave_parent_graphs(wa, wb)
994
mutter("combined parents: %r", combined_parents)
995
order = tsort.topo_sort(combined_parents.iteritems())
996
mutter("order to reweave: %r", order)
1001
for idx, name in enumerate(order):
1003
pb.update(msg, idx, len(order))
1004
if name in wa._name_map:
1005
lines = wa.get_lines(name)
1006
if name in wb._name_map:
1007
lines_b = wb.get_lines(name)
1008
if lines != lines_b:
1009
mutter('Weaves differ on content. rev_id {%s}', name)
1010
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1012
lines = list(difflib.unified_diff(lines, lines_b,
1013
wa._weave_name, wb._weave_name))
1014
mutter('lines:\n%s', ''.join(lines))
1015
raise errors.WeaveTextDiffers(name, wa, wb)
1017
lines = wb.get_lines(name)
1018
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1022
def _reweave_parent_graphs(wa, wb):
1023
"""Return combined parent ancestry for two weaves.
1025
Returned as a list of (version_name, set(parent_names))"""
1027
for weave in [wa, wb]:
1028
for idx, name in enumerate(weave._names):
1029
p = combined.setdefault(name, set())
1030
p.update(map(weave._idx_to_name, weave._parents[idx]))
738
for l in lines_a: yield l
740
for l in lines_b: yield l
747
if state == 'unchanged':
750
elif state == 'killed-a':
753
elif state == 'killed-b':
756
elif state == 'new-a':
759
elif state == 'new-b':
763
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
774
"""Show the weave's table-of-contents"""
775
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
776
for i in (6, 50, 10, 10):
779
for i in range(w.numversions()):
782
parent_str = ' '.join(map(str, w._parents[i]))
783
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
787
def weave_stats(weave_file):
788
from bzrlib.progress import ProgressBar
789
from bzrlib.weavefile import read_weave
793
wf = file(weave_file, 'rb')
795
# FIXME: doesn't work on pipes
796
weave_size = wf.tell()
800
for i in range(vers):
801
pb.update('checking sizes', i, vers)
802
for line in w.get_iter(i):
807
print 'versions %9d' % vers
808
print 'weave file %9d bytes' % weave_size
809
print 'total contents %9d bytes' % total
810
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
813
print 'average size %9d bytes' % avg
814
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
818
print """bzr weave tool
820
Experimental tool for weave algorithm.
824
Create an empty weave file
825
weave get WEAVEFILE VERSION
826
Write out specified version.
827
weave check WEAVEFILE
828
Check consistency of all versions.
830
Display table of contents.
831
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
832
Add NEWTEXT, with specified parent versions.
833
weave annotate WEAVEFILE VERSION
834
Display origin of each line.
835
weave mash WEAVEFILE VERSION...
836
Display composite of all selected versions.
837
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
838
Auto-merge two versions and display conflicts.
839
weave diff WEAVEFILE VERSION1 VERSION2
840
Show differences between two versions.
844
% weave init foo.weave
846
% weave add foo.weave ver0 < foo.txt
849
(create updated version)
851
% weave get foo.weave 0 | diff -u - foo.txt
852
% weave add foo.weave ver1 0 < foo.txt
855
% weave get foo.weave 0 > foo.txt (create forked version)
857
% weave add foo.weave ver2 0 < foo.txt
860
% weave merge foo.weave 1 2 > foo.txt (merge them)
861
% vi foo.txt (resolve conflicts)
862
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
871
from bzrlib.weavefile import write_weave, read_weave
872
from bzrlib.progress import ProgressBar
887
return read_weave(file(argv[2], 'rb'))
893
# at the moment, based on everything in the file
895
parents = map(int, argv[4:])
896
lines = sys.stdin.readlines()
897
ver = w.add(name, parents, lines)
898
write_weave(w, file(argv[2], 'wb'))
899
print 'added version %r %d' % (name, ver)
902
if os.path.exists(fn):
903
raise IOError("file exists")
905
write_weave(w, file(fn, 'wb'))
906
elif cmd == 'get': # get one version
908
sys.stdout.writelines(w.get_iter(int(argv[3])))
910
elif cmd == 'mash': # get composite
912
sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))
915
from difflib import unified_diff
918
v1, v2 = map(int, argv[3:5])
921
diff_gen = unified_diff(lines1, lines2,
922
'%s version %d' % (fn, v1),
923
'%s version %d' % (fn, v2))
924
sys.stdout.writelines(diff_gen)
926
elif cmd == 'annotate':
928
# newline is added to all lines regardless; too hard to get
929
# reasonable formatting otherwise
931
for origin, text in w.annotate(int(argv[3])):
932
text = text.rstrip('\r\n')
934
print ' | %s' % (text)
936
print '%5d | %s' % (origin, text)
950
print '%d versions ok' % w.numversions()
952
elif cmd == 'inclusions':
954
print ' '.join(map(str, w.inclusions([int(argv[3])])))
956
elif cmd == 'parents':
958
print ' '.join(map(str, w._parents[int(argv[3])]))
960
elif cmd == 'plan-merge':
962
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
964
print '%14s | %s' % (state, line),
968
p = w.plan_merge(int(argv[3]), int(argv[4]))
969
sys.stdout.writelines(w.weave_merge(p))
971
elif cmd == 'mash-merge':
977
v1, v2 = map(int, argv[3:5])
979
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
981
base_lines = list(w.mash_iter(basis))
982
a_lines = list(w.get(v1))
983
b_lines = list(w.get(v2))
985
from bzrlib.merge3 import Merge3
986
m3 = Merge3(base_lines, a_lines, b_lines)
988
name_a = 'version %d' % v1
989
name_b = 'version %d' % v2
990
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
992
raise ValueError('unknown command %r' % cmd)
996
def profile_main(argv):
997
import tempfile, hotshot, hotshot.stats
999
prof_f = tempfile.NamedTemporaryFile()
1001
prof = hotshot.Profile(prof_f.name)
1003
ret = prof.runcall(main, argv)
1006
stats = hotshot.stats.load(prof_f.name)
1008
stats.sort_stats('cumulative')
1009
## XXX: Might like to write to stderr or the trace file instead but
1010
## print_stats seems hardcoded to stdout
1011
stats.print_stats(20)
1016
if __name__ == '__main__':
1018
if '--profile' in sys.argv:
1020
args.remove('--profile')
1021
sys.exit(profile_main(args))
1023
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
