59
61
# where the basis and destination are unchanged.
61
63
# FIXME: Sometimes we will be given a parents list for a revision
62
# that includes some redundant parents (i.e. already a parent of
63
# something in the list.) We should eliminate them. This can
64
# that includes some redundant parents (i.e. already a parent of
65
# something in the list.) We should eliminate them. This can
64
66
# be done fairly efficiently because the sequence numbers constrain
65
67
# the possible relationships.
67
# FIXME: the conflict markers should be *7* characters
70
70
from cStringIO import StringIO
71
from difflib import SequenceMatcher
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import tsort
76
from bzrlib.trace import mutter
81
77
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
78
RevisionAlreadyPresent,
83
79
RevisionNotPresent,
84
UnavailableRepresentation,
80
WeaveRevisionAlreadyPresent,
81
WeaveRevisionNotPresent,
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
import bzrlib.patiencediff
88
from bzrlib.revision import NULL_REVISION
83
import bzrlib.errors as errors
84
from bzrlib.osutils import sha_strings
89
85
from bzrlib.symbol_versioning import *
90
from bzrlib.trace import mutter
91
from bzrlib.versionedfile import (
86
from bzrlib.tsort import topo_sort
87
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
98
88
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
101
class WeaveContentFactory(ContentFactory):
102
"""Content factory for streaming from weaves.
104
:seealso ContentFactory:
107
def __init__(self, version, weave):
108
"""Create a WeaveContentFactory for version from weave."""
109
ContentFactory.__init__(self)
110
self.sha1 = weave.get_sha1s([version])[version]
111
self.key = (version,)
112
parents = weave.get_parent_map([version])[version]
113
self.parents = tuple((parent,) for parent in parents)
114
self.storage_kind = 'fulltext'
117
def get_bytes_as(self, storage_kind):
118
if storage_kind == 'fulltext':
119
return self._weave.get_text(self.key[-1])
120
elif storage_kind == 'chunked':
121
return self._weave.get_lines(self.key[-1])
123
raise UnavailableRepresentation(self.key, storage_kind, 'fulltext')
126
91
class Weave(VersionedFile):
127
92
"""weave - versioned text file storage.
129
94
A Weave manages versions of line-based text files, keeping track
130
95
of the originating version for each line.
215
180
__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__()
183
def __init__(self, weave_name=None):
228
185
self._parents = []
231
188
self._name_map = {}
232
189
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
244
191
def __repr__(self):
245
192
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
195
"""Return a deep copy of self.
257
197
The copy can be modified without affecting the original weave."""
259
199
other._weave = self._weave[:]
270
210
return self._parents == other._parents \
271
211
and self._weave == other._weave \
272
and self._sha1s == other._sha1s
212
and self._sha1s == other._sha1s
274
214
def __ne__(self, other):
275
215
return not self.__eq__(other)
217
@deprecated_method(zero_eight)
218
def idx_to_name(self, index):
219
"""Old public interface, the public interface is all names now."""
277
222
def _idx_to_name(self, version):
278
223
return self._names[version]
225
@deprecated_method(zero_eight)
226
def lookup(self, name):
227
"""Backwards compatability thunk:
229
Return name, as name is valid in the api now, and spew deprecation
280
234
def _lookup(self, name):
281
235
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
285
237
return self._name_map[name]
287
239
raise RevisionNotPresent(name, self._weave_name)
241
@deprecated_method(zero_eight)
242
def iter_names(self):
243
"""Deprecated convenience function, please see VersionedFile.names()."""
244
return iter(self.names())
246
@deprecated_method(zero_eight)
248
"""See Weave.versions for the current api."""
249
return self.versions()
289
251
def versions(self):
290
252
"""See VersionedFile.versions."""
291
253
return self._names[:]
293
255
def has_version(self, version_id):
294
256
"""See VersionedFile.has_version."""
295
return (version_id in self._name_map)
257
return self._name_map.has_key(version_id)
297
259
__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:
261
def get_parents(self, version_id):
262
"""See VersionedFile.get_parent."""
263
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
380
265
def _check_repeated_add(self, name, parents, text, sha1):
381
266
"""Check that a duplicated add is OK.
388
273
raise RevisionAlreadyPresent(name, self._weave_name)
391
def _add_lines(self, version_id, parents, lines, parent_texts,
392
left_matching_blocks, nostore_sha, random_id, check_content):
276
@deprecated_method(zero_eight)
277
def add_identical(self, old_rev_id, new_rev_id, parents):
278
"""Please use Weave.clone_text now."""
279
return self.clone_text(new_rev_id, old_rev_id, parents)
281
def add_lines(self, version_id, parents, lines):
393
282
"""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):
283
return self._add(version_id, lines, map(self._lookup, parents))
285
@deprecated_method(zero_eight)
286
def add(self, name, parents, text, sha1=None):
287
"""See VersionedFile.add_lines for the non deprecated api."""
288
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
290
def _add(self, version_id, lines, parents, sha1=None):
399
291
"""Add a single text on top of the weave.
401
293
Returns the index number of the newly added version.
404
296
Symbolic name for this version.
405
297
(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
300
List or set of direct parent version numbers.
412
303
Sequence of lines to be added in the new version.
414
:param nostore_sha: See VersionedFile.add_lines.
416
self._check_lines_not_unicode(lines)
417
self._check_lines_are_lines(lines)
306
assert isinstance(version_id, basestring)
419
308
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
309
if version_id in self._name_map:
425
310
return self._check_repeated_add(version_id, parents, lines, sha1)
557
463
def _compatible_parents(self, my_parents, other_parents):
558
464
"""During join check that other_parents are joinable with my_parents.
560
Joinable is defined as 'is a subset of' - supersets may require
466
Joinable is defined as 'is a subset of' - supersets may require
561
467
regeneration of diffs, but subsets do not.
563
469
return len(other_parents.difference(my_parents)) == 0
565
471
def annotate(self, version_id):
566
"""Return a list of (version-id, line) tuples for version_id.
472
if isinstance(version_id, int):
473
warn('Weave.annotate(int) is deprecated. Please use version names'
474
' in all circumstances as of 0.8',
479
for origin, lineno, text in self._extract([version_id]):
480
result.append((origin, text))
483
return super(Weave, self).annotate(version_id)
485
def annotate_iter(self, version_id):
486
"""Yield list of (version-id, line) pairs for the specified version.
568
488
The index indicates when the line originated in the weave."""
569
489
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."""
490
for origin, lineno, text in self._extract(incls):
491
yield self._idx_to_name(origin), text
493
@deprecated_method(zero_eight)
495
"""_walk has become walk, a supported api."""
498
def walk(self, version_ids=None):
499
"""See VersionedFile.walk."""
592
504
lineno = 0 # line of weave, 0-based
594
506
for l in self._weave:
595
if l.__class__ == tuple:
507
if isinstance(l, tuple):
599
istack.append(self._names[v])
511
istack.append(self._idx_to_name(v))
603
dset.add(self._names[v])
515
assert self._idx_to_name(v) not in dset
516
dset.add(self._idx_to_name(v))
605
dset.remove(self._names[v])
518
dset.remove(self._idx_to_name(v))
607
520
raise WeaveFormatError('unexpected instruction %r' % v)
609
yield lineno, istack[-1], frozenset(dset), l
522
assert isinstance(l, basestring)
524
yield lineno, istack[-1], dset.copy(), l
688
558
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
560
for l in self._weave:
718
if l.__class__ == tuple:
561
if isinstance(l, tuple):
565
assert v not in istack
725
iset.remove(istack.pop())
727
570
if v in included:
730
575
if v in included:
733
raise AssertionError()
579
assert isinstance(l, basestring)
735
580
if isactive is None:
736
581
isactive = (not dset) and istack and (istack[-1] in included)
756
614
return self._lookup(name_or_index)
616
def _get_iter(self, version_id):
617
"""Yield lines for the specified version."""
618
incls = [self._maybe_lookup(version_id)]
623
# We don't have sha1 sums for multiple entries
625
for origin, lineno, line in self._extract(incls):
630
expected_sha1 = self._sha1s[index]
631
measured_sha1 = cur_sha.hexdigest()
632
if measured_sha1 != expected_sha1:
633
raise errors.WeaveInvalidChecksum(
634
'file %s, revision %s, expected: %s, measured %s'
635
% (self._weave_name, self._names[index],
636
expected_sha1, measured_sha1))
638
@deprecated_method(zero_eight)
639
def get(self, version_id):
640
"""Please use either Weave.get_text or Weave.get_lines as desired."""
641
return self.get_lines(version_id)
758
643
def get_lines(self, version_id):
759
644
"""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)]
645
return list(self._get_iter(version_id))
647
def get_sha1(self, name):
648
"""Get the stored sha1 sum for the given revision.
650
:param name: The name of the version to lookup
652
return self._sha1s[self._lookup(name)]
654
@deprecated_method(zero_eight)
655
def numversions(self):
656
"""How many versions are in this weave?
658
Deprecated in favour of num_versions.
660
return self.num_versions()
778
662
def num_versions(self):
779
663
"""How many versions are in this weave?"""
780
664
l = len(self._parents)
665
assert l == len(self._sha1s)
783
668
__len__ = num_versions
785
670
def check(self, progress_bar=None):
786
671
# TODO evaluate performance hit of using string sets in this routine.
787
# TODO: check no circular inclusions
788
# TODO: create a nested progress bar
672
# check no circular inclusions
789
673
for version in range(self.num_versions()):
790
674
inclusions = list(self._parents[version])
848
730
# no lines outside of insertion blocks, that deletions are
849
731
# properly paired, etc.
733
def _join(self, other, pb, msg, version_ids, ignore_missing):
734
"""Worker routine for join()."""
735
if not other.versions():
736
return # nothing to update, easy
739
for version_id in version_ids:
740
if not self.has_version(version_id) and not ignore_missing:
741
raise RevisionNotPresent(version_id, self._weave_name)
743
version_ids = other.versions()
745
# two loops so that we do not change ourselves before verifying it
747
# work through in index order to make sure we get all dependencies
750
version_ids = set(other.versions()).intersection(set(version_ids))
751
pending_graph = [(version, other.get_parents(version)) for
752
version in version_ids]
753
for name in topo_sort(pending_graph):
754
other_idx = other._name_map[name]
755
self._check_version_consistent(other, other_idx, name)
756
sha1 = other._sha1s[other_idx]
760
if name in self._name_map:
761
idx = self._lookup(name)
762
n1 = set(map(other._idx_to_name, other._parents[other_idx]))
763
n2 = set(map(self._idx_to_name, self._parents[idx]))
764
if sha1 == self._sha1s[idx] and n1 == n2:
767
names_to_join.append((other_idx, name))
774
for other_idx, name in names_to_join:
775
# TODO: If all the parents of the other version are already
776
# present then we can avoid some work by just taking the delta
777
# and adjusting the offsets.
778
new_parents = self._imported_parents(other, other_idx)
779
sha1 = other._sha1s[other_idx]
784
pb.update(msg, merged, len(names_to_join))
786
lines = other.get_lines(other_idx)
787
self._add(name, lines, new_parents, sha1)
789
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
790
merged, processed, self._weave_name, time.time()-time0))
851
792
def _imported_parents(self, other, other_idx):
852
793
"""Return list of parents in self corresponding to indexes in other."""
854
795
for parent_idx in other._parents[other_idx]:
855
796
parent_name = other._names[parent_idx]
856
if parent_name not in self._name_map:
797
if parent_name not in self._names:
857
798
# should not be possible
858
raise WeaveError("missing parent {%s} of {%s} in %r"
799
raise WeaveError("missing parent {%s} of {%s} in %r"
859
800
% (parent_name, other._name_map[other_idx], self))
860
801
new_parents.append(self._name_map[parent_name])
861
802
return new_parents
896
842
:param msg: An optional message for the progress
898
844
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
845
for attr in self.__slots__:
904
846
if attr != '_weave_name':
905
setattr(self, attr, copy(getattr(otherweave, attr)))
847
setattr(self, attr, getattr(new_weave, attr))
908
850
class WeaveFile(Weave):
909
851
"""A WeaveFile represents a Weave on disk and writes on change."""
911
853
WEAVE_SUFFIX = '.weave'
913
def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
855
def __init__(self, name, transport, mode=None, create=False):
914
856
"""Create a WeaveFile.
916
858
: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)
860
super(WeaveFile, self).__init__(name)
920
861
self._transport = transport
921
self._filemode = filemode
923
864
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
924
865
except errors.NoSuchFile:
944
880
write_weave_v5(self, sio)
946
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
882
transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._mode)
884
def create_empty(self, name, transport, mode=None):
885
return WeaveFile(name, transport, mode, create=True)
949
888
"""Save the weave."""
950
self._check_write_ok()
952
890
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)
892
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
963
897
def get_suffixes():
964
898
"""See VersionedFile.get_suffixes()."""
965
899
return [WeaveFile.WEAVE_SUFFIX]
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
901
def join(self, other, pb=None, msg=None, version_ids=None,
902
ignore_missing=False):
903
"""Join other into self and save."""
904
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
908
@deprecated_function(zero_eight)
909
def reweave(wa, wb, pb=None, msg=None):
910
"""reweaving is deprecation, please just use weave.join()."""
911
_reweave(wa, wb, pb, msg)
972
913
def _reweave(wa, wb, pb=None, msg=None):
973
914
"""Combine two weaves and return the result.
975
This works even if a revision R has different parents in
916
This works even if a revision R has different parents in
976
917
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
919
This is done by just building up a new weave, maintaining ordering
979
920
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
921
might be possible but it should only be necessary to do
922
this operation rarely, when a new previously ghost version is
984
925
:param pb: An optional progress bar, indicating how far done we are
1029
969
p = combined.setdefault(name, set())
1030
970
p.update(map(weave._idx_to_name, weave._parents[idx]))
975
"""Show the weave's table-of-contents"""
976
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
977
for i in (6, 50, 10, 10):
980
for i in range(w.num_versions()):
983
parent_str = ' '.join(map(str, w._parents[i]))
984
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
988
def weave_stats(weave_file, pb):
989
from bzrlib.weavefile import read_weave
991
wf = file(weave_file, 'rb')
992
w = read_weave(wf, WeaveVersionedFile)
993
# FIXME: doesn't work on pipes
994
weave_size = wf.tell()
998
for i in range(vers):
999
pb.update('checking sizes', i, vers)
1000
for origin, lineno, line in w._extract([i]):
1005
print 'versions %9d' % vers
1006
print 'weave file %9d bytes' % weave_size
1007
print 'total contents %9d bytes' % total
1008
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1011
print 'average size %9d bytes' % avg
1012
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1016
print """bzr weave tool
1018
Experimental tool for weave algorithm.
1021
weave init WEAVEFILE
1022
Create an empty weave file
1023
weave get WEAVEFILE VERSION
1024
Write out specified version.
1025
weave check WEAVEFILE
1026
Check consistency of all versions.
1028
Display table of contents.
1029
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1030
Add NEWTEXT, with specified parent versions.
1031
weave annotate WEAVEFILE VERSION
1032
Display origin of each line.
1033
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1034
Auto-merge two versions and display conflicts.
1035
weave diff WEAVEFILE VERSION1 VERSION2
1036
Show differences between two versions.
1040
% weave init foo.weave
1042
% weave add foo.weave ver0 < foo.txt
1045
(create updated version)
1047
% weave get foo.weave 0 | diff -u - foo.txt
1048
% weave add foo.weave ver1 0 < foo.txt
1051
% weave get foo.weave 0 > foo.txt (create forked version)
1053
% weave add foo.weave ver2 0 < foo.txt
1056
% weave merge foo.weave 1 2 > foo.txt (merge them)
1057
% vi foo.txt (resolve conflicts)
1058
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1070
# in case we're run directly from the subdirectory
1071
sys.path.append('..')
1073
from bzrlib.weavefile import write_weave, read_weave
1074
from bzrlib.progress import ProgressBar
1089
return read_weave(file(argv[2], 'rb'))
1095
# at the moment, based on everything in the file
1097
parents = map(int, argv[4:])
1098
lines = sys.stdin.readlines()
1099
ver = w.add(name, parents, lines)
1100
write_weave(w, file(argv[2], 'wb'))
1101
print 'added version %r %d' % (name, ver)
1104
if os.path.exists(fn):
1105
raise IOError("file exists")
1107
write_weave(w, file(fn, 'wb'))
1108
elif cmd == 'get': # get one version
1110
sys.stdout.writelines(w.get_iter(int(argv[3])))
1113
from difflib import unified_diff
1116
v1, v2 = map(int, argv[3:5])
1119
diff_gen = unified_diff(lines1, lines2,
1120
'%s version %d' % (fn, v1),
1121
'%s version %d' % (fn, v2))
1122
sys.stdout.writelines(diff_gen)
1124
elif cmd == 'annotate':
1126
# newline is added to all lines regardless; too hard to get
1127
# reasonable formatting otherwise
1129
for origin, text in w.annotate(int(argv[3])):
1130
text = text.rstrip('\r\n')
1132
print ' | %s' % (text)
1134
print '%5d | %s' % (origin, text)
1140
elif cmd == 'stats':
1141
weave_stats(argv[2], ProgressBar())
1143
elif cmd == 'check':
1148
print '%d versions ok' % w.num_versions()
1150
elif cmd == 'inclusions':
1152
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1154
elif cmd == 'parents':
1156
print ' '.join(map(str, w._parents[int(argv[3])]))
1158
elif cmd == 'plan-merge':
1160
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1162
print '%14s | %s' % (state, line),
1164
elif cmd == 'merge':
1166
p = w.plan_merge(int(argv[3]), int(argv[4]))
1167
sys.stdout.writelines(w.weave_merge(p))
1170
raise ValueError('unknown command %r' % cmd)
1174
def profile_main(argv):
1175
import tempfile, hotshot, hotshot.stats
1177
prof_f = tempfile.NamedTemporaryFile()
1179
prof = hotshot.Profile(prof_f.name)
1181
ret = prof.runcall(main, argv)
1184
stats = hotshot.stats.load(prof_f.name)
1186
stats.sort_stats('cumulative')
1187
## XXX: Might like to write to stderr or the trace file instead but
1188
## print_stats seems hardcoded to stdout
1189
stats.print_stats(20)
1194
def lsprofile_main(argv):
1195
from bzrlib.lsprof import profile
1196
ret,stats = profile(main, argv)
1202
if __name__ == '__main__':
1204
if '--profile' in sys.argv:
1206
args.remove('--profile')
1207
sys.exit(profile_main(args))
1208
elif '--lsprof' in sys.argv:
1210
args.remove('--lsprof')
1211
sys.exit(lsprofile_main(args))
1213
sys.exit(main(sys.argv))
1216
class InterWeave(InterVersionedFile):
1217
"""Optimised code paths for weave to weave operations."""
1219
_matching_file_factory = staticmethod(WeaveFile)
1222
def is_compatible(source, target):
1223
"""Be compatible with weaves."""
1225
return (isinstance(source, Weave) and
1226
isinstance(target, Weave))
1227
except AttributeError:
1230
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1231
"""See InterVersionedFile.join."""
1233
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1234
except errors.WeaveParentMismatch:
1235
self.target._reweave(self.source, pb, msg)
1238
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
