213
183
For each name, the version number.
216
Descriptive name of this weave; typically the filename if known.
220
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
221
'_weave_name', '_matcher', '_allow_reserved']
223
def __init__(self, weave_name=None, access_mode='w', matcher=None,
224
get_scope=None, allow_reserved=False):
227
:param get_scope: A callable that returns an opaque object to be used
228
for detecting when this weave goes out of scope (should stop
229
answering requests or allowing mutation).
231
super(Weave, self).__init__()
186
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map']
233
190
self._parents = []
236
193
self._name_map = {}
237
self._weave_name = weave_name
239
self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
241
self._matcher = matcher
242
if get_scope is None:
243
get_scope = lambda:None
244
self._get_scope = get_scope
245
self._scope = get_scope()
246
self._access_mode = access_mode
247
self._allow_reserved = allow_reserved
250
return "Weave(%r)" % self._weave_name
252
def _check_write_ok(self):
253
"""Is the versioned file marked as 'finished' ? Raise if it is."""
254
if self._get_scope() != self._scope:
255
raise errors.OutSideTransaction()
256
if self._access_mode != 'w':
257
raise errors.ReadOnlyObjectDirtiedError(self)
260
"""Return a deep copy of self.
262
The copy can be modified without affecting the original weave."""
264
other._weave = self._weave[:]
265
other._parents = self._parents[:]
266
other._sha1s = self._sha1s[:]
267
other._names = self._names[:]
268
other._name_map = self._name_map.copy()
269
other._weave_name = self._weave_name
272
196
def __eq__(self, other):
273
197
if not isinstance(other, Weave):
275
199
return self._parents == other._parents \
276
200
and self._weave == other._weave \
277
and self._sha1s == other._sha1s
201
and self._sha1s == other._sha1s
279
204
def __ne__(self, other):
280
205
return not self.__eq__(other)
282
def _idx_to_name(self, version):
283
return self._names[version]
285
def _lookup(self, name):
286
"""Convert symbolic version name to index."""
287
if not self._allow_reserved:
288
self.check_not_reserved_id(name)
208
def lookup(self, name):
290
210
return self._name_map[name]
292
raise RevisionNotPresent(name, self._weave_name)
295
"""See VersionedFile.versions."""
296
return self._names[:]
298
def has_version(self, version_id):
299
"""See VersionedFile.has_version."""
300
return (version_id in self._name_map)
302
__contains__ = has_version
304
def get_record_stream(self, versions, ordering, include_delta_closure):
305
"""Get a stream of records for versions.
307
:param versions: The versions to include. Each version is a tuple
309
:param ordering: Either 'unordered' or 'topological'. A topologically
310
sorted stream has compression parents strictly before their
312
:param include_delta_closure: If True then the closure across any
313
compression parents will be included (in the opaque data).
314
:return: An iterator of ContentFactory objects, each of which is only
315
valid until the iterator is advanced.
317
versions = [version[-1] for version in versions]
318
if ordering == 'topological':
319
parents = self.get_parent_map(versions)
320
new_versions = tsort.topo_sort(parents)
321
new_versions.extend(set(versions).difference(set(parents)))
322
versions = new_versions
323
elif ordering == 'groupcompress':
324
parents = self.get_parent_map(versions)
325
new_versions = sort_groupcompress(parents)
326
new_versions.extend(set(versions).difference(set(parents)))
327
versions = new_versions
328
for version in versions:
330
yield WeaveContentFactory(version, self)
332
yield AbsentContentFactory((version,))
334
def get_parent_map(self, version_ids):
335
"""See VersionedFile.get_parent_map."""
337
for version_id in version_ids:
338
if version_id == NULL_REVISION:
343
map(self._idx_to_name,
344
self._parents[self._lookup(version_id)]))
345
except RevisionNotPresent:
347
result[version_id] = parents
350
def get_parents_with_ghosts(self, version_id):
351
raise NotImplementedError(self.get_parents_with_ghosts)
353
def insert_record_stream(self, stream):
354
"""Insert a record stream into this versioned file.
356
:param stream: A stream of records to insert.
358
:seealso VersionedFile.get_record_stream:
361
for record in stream:
362
# Raise an error when a record is missing.
363
if record.storage_kind == 'absent':
364
raise RevisionNotPresent([record.key[0]], self)
365
# adapt to non-tuple interface
366
parents = [parent[0] for parent in record.parents]
367
if (record.storage_kind == 'fulltext'
368
or record.storage_kind == 'chunked'):
369
self.add_lines(record.key[0], parents,
370
osutils.chunks_to_lines(record.get_bytes_as('chunked')))
372
adapter_key = record.storage_kind, 'fulltext'
374
adapter = adapters[adapter_key]
376
adapter_factory = adapter_registry.get(adapter_key)
377
adapter = adapter_factory(self)
378
adapters[adapter_key] = adapter
379
lines = split_lines(adapter.get_bytes(record))
381
self.add_lines(record.key[0], parents, lines)
382
except RevisionAlreadyPresent:
385
def _check_repeated_add(self, name, parents, text, sha1):
386
"""Check that a duplicated add is OK.
388
If it is, return the (old) index; otherwise raise an exception.
390
idx = self._lookup(name)
391
if sorted(self._parents[idx]) != sorted(parents) \
392
or sha1 != self._sha1s[idx]:
393
raise RevisionAlreadyPresent(name, self._weave_name)
396
def _add_lines(self, version_id, parents, lines, parent_texts,
397
left_matching_blocks, nostore_sha, random_id, check_content):
398
"""See VersionedFile.add_lines."""
399
idx = self._add(version_id, lines, map(self._lookup, parents),
400
nostore_sha=nostore_sha)
401
return sha_strings(lines), sum(map(len, lines)), idx
403
def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
212
raise WeaveError("name %s not present in weave" % name)
215
def add(self, name, parents, text):
404
216
"""Add a single text on top of the weave.
406
218
Returns the index number of the newly added version.
409
221
Symbolic name for this version.
410
222
(Typically the revision-id of the revision that added it.)
411
If None, a name will be allocated based on the hash. (sha1:SHAHASH)
414
225
List or set of direct parent version numbers.
417
Sequence of lines to be added in the new version.
419
:param nostore_sha: See VersionedFile.add_lines.
421
self._check_lines_not_unicode(lines)
422
self._check_lines_are_lines(lines)
424
sha1 = sha_strings(lines)
425
if sha1 == nostore_sha:
426
raise errors.ExistingContent
427
if version_id is None:
428
version_id = "sha1:" + sha1
429
if version_id in self._name_map:
430
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)
432
234
self._check_versions(parents)
433
## self._check_lines(lines)
235
## self._check_lines(text)
434
236
new_version = len(self._parents)
436
243
# if we abort after here the (in-memory) weave will be corrupt because only
437
244
# some fields are updated
438
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
439
# - Robert Collins 20060226
440
245
self._parents.append(parents[:])
441
246
self._sha1s.append(sha1)
442
self._names.append(version_id)
443
self._name_map[version_id] = new_version
247
self._names.append(name)
248
self._name_map[name] = new_version
447
252
# special case; adding with no parents revision; can do
448
253
# this more quickly by just appending unconditionally.
449
254
# even more specially, if we're adding an empty text we
450
255
# need do nothing at all.
452
257
self._weave.append(('{', new_version))
453
self._weave.extend(lines)
258
self._weave.extend(text)
454
259
self._weave.append(('}', None))
455
261
return new_version
457
263
if len(parents) == 1:
559
392
except IndexError:
560
393
raise IndexError("invalid version number %r" % i)
562
def _compatible_parents(self, my_parents, other_parents):
563
"""During join check that other_parents are joinable with my_parents.
565
Joinable is defined as 'is a subset of' - supersets may require
566
regeneration of diffs, but subsets do not.
568
return len(other_parents.difference(my_parents)) == 0
570
def annotate(self, version_id):
571
"""Return a list of (version-id, line) tuples for version_id.
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.
573
403
The index indicates when the line originated in the weave."""
574
incls = [self._lookup(version_id)]
575
return [(self._idx_to_name(origin), text) for origin, lineno, text in
576
self._extract(incls)]
578
def iter_lines_added_or_present_in_versions(self, version_ids=None,
580
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
581
if version_ids is None:
582
version_ids = self.versions()
583
version_ids = set(version_ids)
584
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
585
if inserted not in version_ids: continue
587
yield line + '\n', inserted
591
def _walk_internal(self, version_ids=None):
592
"""Helper method for weave actions."""
404
for origin, lineno, text in self._extract([version]):
412
(lineno, insert, deletes, text)
413
for each literal line.
597
419
lineno = 0 # line of weave, 0-based
599
421
for l in self._weave:
600
if l.__class__ == tuple:
422
if isinstance(l, tuple):
604
istack.append(self._names[v])
608
dset.add(self._names[v])
610
dset.remove(self._names[v])
612
raise WeaveFormatError('unexpected instruction %r' % v)
614
yield lineno, istack[-1], frozenset(dset), l
435
raise WeaveFormatError('unexpected instruction %r'
438
assert isinstance(l, basestring)
440
yield lineno, istack[-1], dset, l
445
def _extract(self, versions):
446
"""Yield annotation of lines in included set.
448
Yields a sequence of tuples (origin, lineno, text), where
449
origin is the origin version, lineno the index in the weave,
450
and text the text of the line.
452
The set typically but not necessarily corresponds to a version.
454
included = self.inclusions(versions)
459
lineno = 0 # line of weave, 0-based
465
WFE = WeaveFormatError
467
for l in self._weave:
468
if isinstance(l, tuple):
472
assert v not in istack
486
assert isinstance(l, basestring)
488
isactive = (not dset) and istack and (istack[-1] in included)
490
result.append((istack[-1], lineno, l))
618
raise WeaveFormatError("unclosed insertion blocks "
619
"at end of weave: %s" % istack)
494
raise WFE("unclosed insertion blocks at end of weave",
621
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
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)
529
def numversions(self):
530
l = len(self._parents)
531
assert l == len(self._sha1s)
536
return self.numversions()
539
def check(self, progress_bar=None):
540
# check no circular inclusions
541
for version in range(self.numversions()):
542
inclusions = list(self._parents[version])
545
if inclusions[-1] >= version:
546
raise WeaveFormatError("invalid included version %d for index %d"
547
% (inclusions[-1], version))
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):
554
progress_bar.update('checking text', version, nv)
556
for l in self.get_iter(version):
559
expected = self._sha1s[version]
561
raise WeaveError("mismatched sha1 for version %d; "
562
"got %s, expected %s"
563
% (version, hd, expected))
565
# TODO: check insertions are properly nested, that there are
566
# no lines outside of insertion blocks, that deletions are
567
# properly paired, etc.
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.)
624
610
def plan_merge(self, ver_a, ver_b):
625
611
"""Return pseudo-annotation indicating how the two versions merge.
665
651
# not in either revision
666
652
yield 'irrelevant', line
668
def _extract(self, versions):
669
"""Yield annotation of lines in included set.
671
Yields a sequence of tuples (origin, lineno, text), where
672
origin is the origin version, lineno the index in the weave,
673
and text the text of the line.
675
The set typically but not necessarily corresponds to a version.
678
if not isinstance(i, int):
681
included = self._inclusions(versions)
687
lineno = 0 # line of weave, 0-based
693
WFE = WeaveFormatError
696
# 449 0 4474.6820 2356.5590 bzrlib.weave:556(_extract)
697
# +285282 0 1676.8040 1676.8040 +<isinstance>
698
# 1.6 seconds in 'isinstance'.
699
# changing the first isinstance:
700
# 449 0 2814.2660 1577.1760 bzrlib.weave:556(_extract)
701
# +140414 0 762.8050 762.8050 +<isinstance>
702
# note that the inline time actually dropped (less function calls)
703
# and total processing time was halved.
704
# we're still spending ~1/4 of the method in isinstance though.
705
# so lets hard code the acceptable string classes we expect:
706
# 449 0 1202.9420 786.2930 bzrlib.weave:556(_extract)
707
# +71352 0 377.5560 377.5560 +<method 'append' of 'list'
709
# yay, down to ~1/4 the initial extract time, and our inline time
710
# has shrunk again, with isinstance no longer dominating.
711
# tweaking the stack inclusion test to use a set gives:
712
# 449 0 1122.8030 713.0080 bzrlib.weave:556(_extract)
713
# +71352 0 354.9980 354.9980 +<method 'append' of 'list'
715
# - a 5% win, or possibly just noise. However with large istacks that
716
# 'in' test could dominate, so I'm leaving this change in place -
717
# when its fast enough to consider profiling big datasets we can review.
722
for l in self._weave:
723
if l.__class__ == tuple:
730
iset.remove(istack.pop())
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
738
raise AssertionError()
741
isactive = (not dset) and istack and (istack[-1] in included)
743
result.append((istack[-1], lineno, l))
746
raise WeaveFormatError("unclosed insertion blocks "
747
"at end of weave: %s" % istack)
749
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
753
def _maybe_lookup(self, name_or_index):
754
"""Convert possible symbolic name to index, or pass through indexes.
758
if isinstance(name_or_index, (int, long)):
761
return self._lookup(name_or_index)
763
def get_lines(self, version_id):
764
"""See VersionedFile.get_lines()."""
765
int_index = self._maybe_lookup(version_id)
766
result = [line for (origin, lineno, line) in self._extract([int_index])]
767
expected_sha1 = self._sha1s[int_index]
768
measured_sha1 = sha_strings(result)
769
if measured_sha1 != expected_sha1:
770
raise errors.WeaveInvalidChecksum(
771
'file %s, revision %s, expected: %s, measured %s'
772
% (self._weave_name, version_id,
773
expected_sha1, measured_sha1))
776
def get_sha1s(self, version_ids):
777
"""See VersionedFile.get_sha1s()."""
779
for v in version_ids:
780
result[v] = self._sha1s[self._lookup(v)]
783
def num_versions(self):
784
"""How many versions are in this weave?"""
785
l = len(self._parents)
788
__len__ = num_versions
790
def check(self, progress_bar=None):
791
# TODO evaluate performance hit of using string sets in this routine.
792
# TODO: check no circular inclusions
793
# TODO: create a nested progress bar
794
for version in range(self.num_versions()):
795
inclusions = list(self._parents[version])
798
if inclusions[-1] >= version:
799
raise WeaveFormatError("invalid included version %d for index %d"
800
% (inclusions[-1], version))
802
# try extracting all versions; parallel extraction is used
803
nv = self.num_versions()
808
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
809
# The problem is that set membership is much more expensive
810
name = self._idx_to_name(i)
813
new_inc = set([name])
814
for p in self._parents[i]:
815
new_inc.update(inclusions[self._idx_to_name(p)])
817
if set(new_inc) != set(self.get_ancestry(name)):
818
raise AssertionError(
820
% (set(new_inc), set(self.get_ancestry(name))))
821
inclusions[name] = new_inc
823
nlines = len(self._weave)
825
update_text = 'checking weave'
827
short_name = os.path.basename(self._weave_name)
828
update_text = 'checking %s' % (short_name,)
829
update_text = update_text[:25]
831
for lineno, insert, deleteset, line in self._walk_internal():
833
progress_bar.update(update_text, lineno, nlines)
835
for name, name_inclusions in inclusions.items():
836
# The active inclusion must be an ancestor,
837
# and no ancestors must have deleted this line,
838
# because we don't support resurrection.
839
if (insert in name_inclusions) and not (deleteset & name_inclusions):
840
sha1s[name].update(line)
843
version = self._idx_to_name(i)
844
hd = sha1s[version].hexdigest()
845
expected = self._sha1s[i]
847
raise errors.WeaveInvalidChecksum(
848
"mismatched sha1 for version %s: "
849
"got %s, expected %s"
850
% (version, hd, expected))
852
# TODO: check insertions are properly nested, that there are
853
# no lines outside of insertion blocks, that deletions are
854
# properly paired, etc.
856
def _imported_parents(self, other, other_idx):
857
"""Return list of parents in self corresponding to indexes in other."""
859
for parent_idx in other._parents[other_idx]:
860
parent_name = other._names[parent_idx]
861
if parent_name not in self._name_map:
862
# should not be possible
863
raise WeaveError("missing parent {%s} of {%s} in %r"
864
% (parent_name, other._name_map[other_idx], self))
865
new_parents.append(self._name_map[parent_name])
868
def _check_version_consistent(self, other, other_idx, name):
869
"""Check if a version in consistent in this and other.
871
To be consistent it must have:
874
* the same direct parents (by name, not index, and disregarding
877
If present & correct return True;
878
if not present in self return False;
879
if inconsistent raise error."""
880
this_idx = self._name_map.get(name, -1)
882
if self._sha1s[this_idx] != other._sha1s[other_idx]:
883
raise errors.WeaveTextDiffers(name, self, other)
884
self_parents = self._parents[this_idx]
885
other_parents = other._parents[other_idx]
886
n1 = set([self._names[i] for i in self_parents])
887
n2 = set([other._names[i] for i in other_parents])
888
if not self._compatible_parents(n1, n2):
889
raise WeaveParentMismatch("inconsistent parents "
890
"for version {%s}: %s vs %s" % (name, n1, n2))
896
def _reweave(self, other, pb, msg):
897
"""Reweave self with other - internal helper for join().
899
:param other: The other weave to merge
900
:param pb: An optional progress bar, indicating how far done we are
901
:param msg: An optional message for the progress
903
new_weave = _reweave(self, other, pb=pb, msg=msg)
904
self._copy_weave_content(new_weave)
906
def _copy_weave_content(self, otherweave):
907
"""adsorb the content from otherweave."""
908
for attr in self.__slots__:
909
if attr != '_weave_name':
910
setattr(self, attr, copy(getattr(otherweave, attr)))
913
class WeaveFile(Weave):
914
"""A WeaveFile represents a Weave on disk and writes on change."""
916
WEAVE_SUFFIX = '.weave'
918
def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
919
"""Create a WeaveFile.
921
:param create: If not True, only open an existing knit.
923
super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
924
allow_reserved=False)
925
self._transport = transport
926
self._filemode = filemode
928
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
929
except errors.NoSuchFile:
935
def _add_lines(self, version_id, parents, lines, parent_texts,
936
left_matching_blocks, nostore_sha, random_id, check_content):
937
"""Add a version and save the weave."""
938
self.check_not_reserved_id(version_id)
939
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
940
parent_texts, left_matching_blocks, nostore_sha, random_id,
945
def copy_to(self, name, transport):
946
"""See VersionedFile.copy_to()."""
947
# as we are all in memory always, just serialise to the new place.
949
write_weave_v5(self, sio)
951
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
954
"""Save the weave."""
955
self._check_write_ok()
957
write_weave_v5(self, sio)
959
bytes = sio.getvalue()
960
path = self._weave_name + WeaveFile.WEAVE_SUFFIX
962
self._transport.put_bytes(path, bytes, self._filemode)
963
except errors.NoSuchFile:
964
self._transport.mkdir(dirname(path))
965
self._transport.put_bytes(path, bytes, self._filemode)
969
"""See VersionedFile.get_suffixes()."""
970
return [WeaveFile.WEAVE_SUFFIX]
972
def insert_record_stream(self, stream):
973
super(WeaveFile, self).insert_record_stream(stream)
977
def _reweave(wa, wb, pb=None, msg=None):
978
"""Combine two weaves and return the result.
980
This works even if a revision R has different parents in
981
wa and wb. In the resulting weave all the parents are given.
983
This is done by just building up a new weave, maintaining ordering
984
of the versions in the two inputs. More efficient approaches
985
might be possible but it should only be necessary to do
986
this operation rarely, when a new previously ghost version is
989
:param pb: An optional progress bar, indicating how far done we are
990
:param msg: An optional message for the progress
994
queue_a = range(wa.num_versions())
995
queue_b = range(wb.num_versions())
996
# first determine combined parents of all versions
997
# map from version name -> all parent names
998
combined_parents = _reweave_parent_graphs(wa, wb)
999
mutter("combined parents: %r", combined_parents)
1000
order = tsort.topo_sort(combined_parents.iteritems())
1001
mutter("order to reweave: %r", order)
1006
for idx, name in enumerate(order):
1008
pb.update(msg, idx, len(order))
1009
if name in wa._name_map:
1010
lines = wa.get_lines(name)
1011
if name in wb._name_map:
1012
lines_b = wb.get_lines(name)
1013
if lines != lines_b:
1014
mutter('Weaves differ on content. rev_id {%s}', name)
1015
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1017
lines = list(difflib.unified_diff(lines, lines_b,
1018
wa._weave_name, wb._weave_name))
1019
mutter('lines:\n%s', ''.join(lines))
1020
raise errors.WeaveTextDiffers(name, wa, wb)
1022
lines = wb.get_lines(name)
1023
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1027
def _reweave_parent_graphs(wa, wb):
1028
"""Return combined parent ancestry for two weaves.
1030
Returned as a list of (version_name, set(parent_names))"""
1032
for weave in [wa, wb]:
1033
for idx, name in enumerate(weave._names):
1034
p = combined.setdefault(name, set())
1035
p.update(map(weave._idx_to_name, weave._parents[idx]))
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',
713
"""Show the weave's table-of-contents"""
714
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
715
for i in (6, 50, 10, 10):
718
for i in range(w.numversions()):
721
parent_str = ' '.join(map(str, w._parents[i]))
722
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
726
def weave_stats(weave_file):
727
from bzrlib.progress import ProgressBar
728
from bzrlib.weavefile import read_weave
732
wf = file(weave_file, 'rb')
734
# FIXME: doesn't work on pipes
735
weave_size = wf.tell()
739
for i in range(vers):
740
pb.update('checking sizes', i, vers)
741
for line in w.get_iter(i):
746
print 'versions %9d' % vers
747
print 'weave file %9d bytes' % weave_size
748
print 'total contents %9d bytes' % total
749
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
752
print 'average size %9d bytes' % avg
753
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
757
print """bzr weave tool
759
Experimental tool for weave algorithm.
763
Create an empty weave file
764
weave get WEAVEFILE VERSION
765
Write out specified version.
766
weave check WEAVEFILE
767
Check consistency of all versions.
769
Display table of contents.
770
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
771
Add NEWTEXT, with specified parent versions.
772
weave annotate WEAVEFILE VERSION
773
Display origin of each line.
774
weave mash WEAVEFILE VERSION...
775
Display composite of all selected versions.
776
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
777
Auto-merge two versions and display conflicts.
781
% weave init foo.weave
783
% weave add foo.weave ver0 < foo.txt
786
(create updated version)
788
% weave get foo.weave 0 | diff -u - foo.txt
789
% weave add foo.weave ver1 0 < foo.txt
792
% weave get foo.weave 0 > foo.txt (create forked version)
794
% weave add foo.weave ver2 0 < foo.txt
797
% weave merge foo.weave 1 2 > foo.txt (merge them)
798
% vi foo.txt (resolve conflicts)
799
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
808
from weavefile import write_weave, read_weave
809
from bzrlib.progress import ProgressBar
824
return read_weave(file(argv[2], 'rb'))
830
# at the moment, based on everything in the file
832
parents = map(int, argv[4:])
833
lines = sys.stdin.readlines()
834
ver = w.add(name, parents, lines)
835
write_weave(w, file(argv[2], 'wb'))
836
print 'added version %r %d' % (name, ver)
839
if os.path.exists(fn):
840
raise IOError("file exists")
842
write_weave(w, file(fn, 'wb'))
843
elif cmd == 'get': # get one version
845
sys.stdout.writelines(w.get_iter(int(argv[3])))
847
elif cmd == 'mash': # get composite
849
sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))
851
elif cmd == 'annotate':
853
# newline is added to all lines regardless; too hard to get
854
# reasonable formatting otherwise
856
for origin, text in w.annotate(int(argv[3])):
857
text = text.rstrip('\r\n')
859
print ' | %s' % (text)
861
print '%5d | %s' % (origin, text)
875
print '%d versions ok' % w.numversions()
877
elif cmd == 'inclusions':
879
print ' '.join(map(str, w.inclusions([int(argv[3])])))
881
elif cmd == 'parents':
883
print ' '.join(map(str, w._parents[int(argv[3])]))
885
elif cmd == 'plan-merge':
887
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
889
print '%14s | %s' % (state, line),
893
p = w.plan_merge(int(argv[3]), int(argv[4]))
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))
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)
941
if __name__ == '__main__':
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
