61
59
# where the basis and destination are unchanged.
63
61
# FIXME: Sometimes we will be given a parents list for a revision
64
# that includes some redundant parents (i.e. already a parent of
65
# something in the list.) We should eliminate them. This can
62
# that includes some redundant parents (i.e. already a parent of
63
# something in the list.) We should eliminate them. This can
66
64
# be done fairly efficiently because the sequence numbers constrain
67
65
# the possible relationships.
67
# FIXME: the conflict markers should be *7* characters
70
69
from copy import copy
71
70
from cStringIO import StringIO
72
from difflib import SequenceMatcher
77
from bzrlib.trace import mutter
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import tsort
78
81
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
79
82
RevisionAlreadyPresent,
80
83
RevisionNotPresent,
81
WeaveRevisionAlreadyPresent,
82
WeaveRevisionNotPresent,
84
UnavailableRepresentation,
84
import bzrlib.errors as errors
85
from bzrlib.osutils import sha_strings
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
import bzrlib.patiencediff
88
from bzrlib.revision import NULL_REVISION
86
89
from bzrlib.symbol_versioning import *
87
from bzrlib.tsort import topo_sort
88
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
90
from bzrlib.trace import mutter
91
from bzrlib.versionedfile import (
89
98
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')
92
126
class Weave(VersionedFile):
93
127
"""weave - versioned text file storage.
95
129
A Weave manages versions of line-based text files, keeping track
96
130
of the originating version for each line.
181
215
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
184
def __init__(self, weave_name=None, access_mode='w'):
185
super(Weave, self).__init__(access_mode)
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__()
187
228
self._parents = []
190
231
self._name_map = {}
191
232
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
193
244
def __repr__(self):
194
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)
197
255
"""Return a deep copy of self.
199
257
The copy can be modified without affecting the original weave."""
201
259
other._weave = self._weave[:]
212
270
return self._parents == other._parents \
213
271
and self._weave == other._weave \
214
and self._sha1s == other._sha1s
272
and self._sha1s == other._sha1s
216
274
def __ne__(self, other):
217
275
return not self.__eq__(other)
219
@deprecated_method(zero_eight)
220
def idx_to_name(self, index):
221
"""Old public interface, the public interface is all names now."""
224
277
def _idx_to_name(self, version):
225
278
return self._names[version]
227
@deprecated_method(zero_eight)
228
def lookup(self, name):
229
"""Backwards compatability thunk:
231
Return name, as name is valid in the api now, and spew deprecation
236
280
def _lookup(self, name):
237
281
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
239
285
return self._name_map[name]
241
287
raise RevisionNotPresent(name, self._weave_name)
243
@deprecated_method(zero_eight)
244
def iter_names(self):
245
"""Deprecated convenience function, please see VersionedFile.names()."""
246
return iter(self.names())
248
@deprecated_method(zero_eight)
250
"""See Weave.versions for the current api."""
251
return self.versions()
253
289
def versions(self):
254
290
"""See VersionedFile.versions."""
255
291
return self._names[:]
257
293
def has_version(self, version_id):
258
294
"""See VersionedFile.has_version."""
259
return self._name_map.has_key(version_id)
295
return (version_id in self._name_map)
261
297
__contains__ = has_version
263
def get_parents(self, version_id):
264
"""See VersionedFile.get_parent."""
265
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
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:
267
380
def _check_repeated_add(self, name, parents, text, sha1):
268
381
"""Check that a duplicated add is OK.
275
388
raise RevisionAlreadyPresent(name, self._weave_name)
278
@deprecated_method(zero_eight)
279
def add_identical(self, old_rev_id, new_rev_id, parents):
280
"""Please use Weave.clone_text now."""
281
return self.clone_text(new_rev_id, old_rev_id, parents)
283
def _add_lines(self, version_id, parents, lines):
391
def _add_lines(self, version_id, parents, lines, parent_texts,
392
left_matching_blocks, nostore_sha, random_id, check_content):
284
393
"""See VersionedFile.add_lines."""
285
return self._add(version_id, lines, map(self._lookup, parents))
287
@deprecated_method(zero_eight)
288
def add(self, name, parents, text, sha1=None):
289
"""See VersionedFile.add_lines for the non deprecated api."""
290
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
292
def _add(self, version_id, lines, parents, sha1=None):
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):
293
399
"""Add a single text on top of the weave.
295
401
Returns the index number of the newly added version.
298
404
Symbolic name for this version.
299
405
(Typically the revision-id of the revision that added it.)
406
If None, a name will be allocated based on the hash. (sha1:SHAHASH)
302
409
List or set of direct parent version numbers.
305
412
Sequence of lines to be added in the new version.
414
:param nostore_sha: See VersionedFile.add_lines.
308
assert isinstance(version_id, basestring)
416
self._check_lines_not_unicode(lines)
417
self._check_lines_are_lines(lines)
310
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
311
424
if version_id in self._name_map:
312
425
return self._check_repeated_add(version_id, parents, lines, sha1)
465
557
def _compatible_parents(self, my_parents, other_parents):
466
558
"""During join check that other_parents are joinable with my_parents.
468
Joinable is defined as 'is a subset of' - supersets may require
560
Joinable is defined as 'is a subset of' - supersets may require
469
561
regeneration of diffs, but subsets do not.
471
563
return len(other_parents.difference(my_parents)) == 0
473
565
def annotate(self, version_id):
474
if isinstance(version_id, int):
475
warn('Weave.annotate(int) is deprecated. Please use version names'
476
' in all circumstances as of 0.8',
481
for origin, lineno, text in self._extract([version_id]):
482
result.append((origin, text))
485
return super(Weave, self).annotate(version_id)
487
def annotate_iter(self, version_id):
488
"""Yield list of (version-id, line) pairs for the specified version.
566
"""Return a list of (version-id, line) tuples for version_id.
490
568
The index indicates when the line originated in the weave."""
491
569
incls = [self._lookup(version_id)]
492
for origin, lineno, text in self._extract(incls):
493
yield self._idx_to_name(origin), text
495
@deprecated_method(zero_eight)
497
"""_walk has become visit, a supported api."""
498
return self._walk_internal()
500
def iter_lines_added_or_present_in_versions(self, version_ids=None):
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,
501
575
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
502
576
if version_ids is None:
503
577
version_ids = self.versions()
504
578
version_ids = set(version_ids)
505
579
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
506
# if inserted not in version_ids then it was inserted before the
507
# versions we care about, but because weaves cannot represent ghosts
508
# properly, we do not filter down to that
509
# if inserted not in version_ids: continue
580
if inserted not in version_ids: continue
510
581
if line[-1] != '\n':
582
yield line + '\n', inserted
515
#@deprecated_method(zero_eight)
516
def walk(self, version_ids=None):
517
"""See VersionedFile.walk."""
518
return self._walk_internal(version_ids)
520
586
def _walk_internal(self, version_ids=None):
521
587
"""Helper method for weave actions."""
526
592
lineno = 0 # line of weave, 0-based
528
594
for l in self._weave:
529
if isinstance(l, tuple):
595
if l.__class__ == tuple:
533
istack.append(self._idx_to_name(v))
599
istack.append(self._names[v])
537
assert self._idx_to_name(v) not in dset
538
dset.add(self._idx_to_name(v))
603
dset.add(self._names[v])
540
dset.remove(self._idx_to_name(v))
605
dset.remove(self._names[v])
542
607
raise WeaveFormatError('unexpected instruction %r' % v)
544
assert isinstance(l, basestring)
546
yield lineno, istack[-1], dset.copy(), l
609
yield lineno, istack[-1], frozenset(dset), l
580
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.
582
717
for l in self._weave:
583
if isinstance(l, tuple):
718
if l.__class__ == tuple:
587
assert v not in istack
725
iset.remove(istack.pop())
592
727
if v in included:
597
730
if v in included:
733
raise AssertionError()
601
assert isinstance(l, basestring)
602
735
if isactive is None:
603
736
isactive = (not dset) and istack and (istack[-1] in included)
636
756
return self._lookup(name_or_index)
638
def _get_iter(self, version_id):
639
"""Yield lines for the specified version."""
640
incls = [self._maybe_lookup(version_id)]
645
# We don't have sha1 sums for multiple entries
647
for origin, lineno, line in self._extract(incls):
652
expected_sha1 = self._sha1s[index]
653
measured_sha1 = cur_sha.hexdigest()
654
if measured_sha1 != expected_sha1:
655
raise errors.WeaveInvalidChecksum(
656
'file %s, revision %s, expected: %s, measured %s'
657
% (self._weave_name, self._names[index],
658
expected_sha1, measured_sha1))
660
@deprecated_method(zero_eight)
661
def get(self, version_id):
662
"""Please use either Weave.get_text or Weave.get_lines as desired."""
663
return self.get_lines(version_id)
665
758
def get_lines(self, version_id):
666
759
"""See VersionedFile.get_lines()."""
667
return list(self._get_iter(version_id))
669
def get_sha1(self, name):
670
"""Get the stored sha1 sum for the given revision.
672
:param name: The name of the version to lookup
674
return self._sha1s[self._lookup(name)]
676
@deprecated_method(zero_eight)
677
def numversions(self):
678
"""How many versions are in this weave?
680
Deprecated in favour of num_versions.
682
return self.num_versions()
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)]
684
778
def num_versions(self):
685
779
"""How many versions are in this weave?"""
686
780
l = len(self._parents)
687
assert l == len(self._sha1s)
690
783
__len__ = num_versions
692
785
def check(self, progress_bar=None):
693
786
# TODO evaluate performance hit of using string sets in this routine.
694
# check no circular inclusions
787
# TODO: check no circular inclusions
788
# TODO: create a nested progress bar
695
789
for version in range(self.num_versions()):
696
790
inclusions = list(self._parents[version])
752
848
# no lines outside of insertion blocks, that deletions are
753
849
# properly paired, etc.
755
def _join(self, other, pb, msg, version_ids, ignore_missing):
756
"""Worker routine for join()."""
757
if not other.versions():
758
return # nothing to update, easy
761
for version_id in version_ids:
762
if not other.has_version(version_id) and not ignore_missing:
763
raise RevisionNotPresent(version_id, self._weave_name)
765
version_ids = other.versions()
767
# two loops so that we do not change ourselves before verifying it
769
# work through in index order to make sure we get all dependencies
772
# get the selected versions only that are in other.versions.
773
version_ids = set(other.versions()).intersection(set(version_ids))
774
# pull in the referenced graph.
775
version_ids = other.get_ancestry(version_ids)
776
pending_graph = [(version, other.get_parents(version)) for
777
version in version_ids]
778
for name in topo_sort(pending_graph):
779
other_idx = other._name_map[name]
780
self._check_version_consistent(other, other_idx, name)
781
sha1 = other._sha1s[other_idx]
785
if name in self._name_map:
786
idx = self._lookup(name)
787
n1 = set(map(other._idx_to_name, other._parents[other_idx]))
788
n2 = set(map(self._idx_to_name, self._parents[idx]))
789
if sha1 == self._sha1s[idx] and n1 == n2:
792
names_to_join.append((other_idx, name))
799
for other_idx, name in names_to_join:
800
# TODO: If all the parents of the other version are already
801
# present then we can avoid some work by just taking the delta
802
# and adjusting the offsets.
803
new_parents = self._imported_parents(other, other_idx)
804
sha1 = other._sha1s[other_idx]
809
pb.update(msg, merged, len(names_to_join))
811
lines = other.get_lines(other_idx)
812
self._add(name, lines, new_parents, sha1)
814
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
815
merged, processed, self._weave_name, time.time()-time0))
817
851
def _imported_parents(self, other, other_idx):
818
852
"""Return list of parents in self corresponding to indexes in other."""
820
854
for parent_idx in other._parents[other_idx]:
821
855
parent_name = other._names[parent_idx]
822
if parent_name not in self._names:
856
if parent_name not in self._name_map:
823
857
# should not be possible
824
raise WeaveError("missing parent {%s} of {%s} in %r"
858
raise WeaveError("missing parent {%s} of {%s} in %r"
825
859
% (parent_name, other._name_map[other_idx], self))
826
860
new_parents.append(self._name_map[parent_name])
827
861
return new_parents
897
927
# new file, save it
900
def _add_lines(self, version_id, parents, lines):
930
def _add_lines(self, version_id, parents, lines, parent_texts,
931
left_matching_blocks, nostore_sha, random_id, check_content):
901
932
"""Add a version and save the weave."""
902
super(WeaveFile, self)._add_lines(version_id, parents, lines)
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,
905
def _clone_text(self, new_version_id, old_version_id, parents):
906
"""See VersionedFile.clone_text."""
907
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
910
940
def copy_to(self, name, transport):
911
941
"""See VersionedFile.copy_to()."""
925
952
write_weave_v5(self, sio)
927
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
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)
932
963
def get_suffixes():
933
964
"""See VersionedFile.get_suffixes()."""
934
965
return [WeaveFile.WEAVE_SUFFIX]
936
def join(self, other, pb=None, msg=None, version_ids=None,
937
ignore_missing=False):
938
"""Join other into self and save."""
939
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
943
@deprecated_function(zero_eight)
944
def reweave(wa, wb, pb=None, msg=None):
945
"""reweaving is deprecation, please just use weave.join()."""
946
_reweave(wa, wb, pb, msg)
948
972
def _reweave(wa, wb, pb=None, msg=None):
949
973
"""Combine two weaves and return the result.
951
This works even if a revision R has different parents in
975
This works even if a revision R has different parents in
952
976
wa and wb. In the resulting weave all the parents are given.
954
This is done by just building up a new weave, maintaining ordering
978
This is done by just building up a new weave, maintaining ordering
955
979
of the versions in the two inputs. More efficient approaches
956
might be possible but it should only be necessary to do
957
this operation rarely, when a new previously ghost version is
980
might be possible but it should only be necessary to do
981
this operation rarely, when a new previously ghost version is
960
984
:param pb: An optional progress bar, indicating how far done we are
1004
1029
p = combined.setdefault(name, set())
1005
1030
p.update(map(weave._idx_to_name, weave._parents[idx]))
1006
1031
return combined
1010
"""Show the weave's table-of-contents"""
1011
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1012
for i in (6, 50, 10, 10):
1015
for i in range(w.num_versions()):
1018
parent_str = ' '.join(map(str, w._parents[i]))
1019
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1023
def weave_stats(weave_file, pb):
1024
from bzrlib.weavefile import read_weave
1026
wf = file(weave_file, 'rb')
1027
w = read_weave(wf, WeaveVersionedFile)
1028
# FIXME: doesn't work on pipes
1029
weave_size = wf.tell()
1033
for i in range(vers):
1034
pb.update('checking sizes', i, vers)
1035
for origin, lineno, line in w._extract([i]):
1040
print 'versions %9d' % vers
1041
print 'weave file %9d bytes' % weave_size
1042
print 'total contents %9d bytes' % total
1043
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1046
print 'average size %9d bytes' % avg
1047
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1051
print """bzr weave tool
1053
Experimental tool for weave algorithm.
1056
weave init WEAVEFILE
1057
Create an empty weave file
1058
weave get WEAVEFILE VERSION
1059
Write out specified version.
1060
weave check WEAVEFILE
1061
Check consistency of all versions.
1063
Display table of contents.
1064
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1065
Add NEWTEXT, with specified parent versions.
1066
weave annotate WEAVEFILE VERSION
1067
Display origin of each line.
1068
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1069
Auto-merge two versions and display conflicts.
1070
weave diff WEAVEFILE VERSION1 VERSION2
1071
Show differences between two versions.
1075
% weave init foo.weave
1077
% weave add foo.weave ver0 < foo.txt
1080
(create updated version)
1082
% weave get foo.weave 0 | diff -u - foo.txt
1083
% weave add foo.weave ver1 0 < foo.txt
1086
% weave get foo.weave 0 > foo.txt (create forked version)
1088
% weave add foo.weave ver2 0 < foo.txt
1091
% weave merge foo.weave 1 2 > foo.txt (merge them)
1092
% vi foo.txt (resolve conflicts)
1093
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1105
# in case we're run directly from the subdirectory
1106
sys.path.append('..')
1108
from bzrlib.weavefile import write_weave, read_weave
1109
from bzrlib.progress import ProgressBar
1124
return read_weave(file(argv[2], 'rb'))
1130
# at the moment, based on everything in the file
1132
parents = map(int, argv[4:])
1133
lines = sys.stdin.readlines()
1134
ver = w.add(name, parents, lines)
1135
write_weave(w, file(argv[2], 'wb'))
1136
print 'added version %r %d' % (name, ver)
1139
if os.path.exists(fn):
1140
raise IOError("file exists")
1142
write_weave(w, file(fn, 'wb'))
1143
elif cmd == 'get': # get one version
1145
sys.stdout.writelines(w.get_iter(int(argv[3])))
1148
from difflib import unified_diff
1151
v1, v2 = map(int, argv[3:5])
1154
diff_gen = unified_diff(lines1, lines2,
1155
'%s version %d' % (fn, v1),
1156
'%s version %d' % (fn, v2))
1157
sys.stdout.writelines(diff_gen)
1159
elif cmd == 'annotate':
1161
# newline is added to all lines regardless; too hard to get
1162
# reasonable formatting otherwise
1164
for origin, text in w.annotate(int(argv[3])):
1165
text = text.rstrip('\r\n')
1167
print ' | %s' % (text)
1169
print '%5d | %s' % (origin, text)
1175
elif cmd == 'stats':
1176
weave_stats(argv[2], ProgressBar())
1178
elif cmd == 'check':
1183
print '%d versions ok' % w.num_versions()
1185
elif cmd == 'inclusions':
1187
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1189
elif cmd == 'parents':
1191
print ' '.join(map(str, w._parents[int(argv[3])]))
1193
elif cmd == 'plan-merge':
1195
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1197
print '%14s | %s' % (state, line),
1199
elif cmd == 'merge':
1201
p = w.plan_merge(int(argv[3]), int(argv[4]))
1202
sys.stdout.writelines(w.weave_merge(p))
1205
raise ValueError('unknown command %r' % cmd)
1209
def profile_main(argv):
1210
import tempfile, hotshot, hotshot.stats
1212
prof_f = tempfile.NamedTemporaryFile()
1214
prof = hotshot.Profile(prof_f.name)
1216
ret = prof.runcall(main, argv)
1219
stats = hotshot.stats.load(prof_f.name)
1221
stats.sort_stats('cumulative')
1222
## XXX: Might like to write to stderr or the trace file instead but
1223
## print_stats seems hardcoded to stdout
1224
stats.print_stats(20)
1229
def lsprofile_main(argv):
1230
from bzrlib.lsprof import profile
1231
ret,stats = profile(main, argv)
1237
if __name__ == '__main__':
1239
if '--profile' in sys.argv:
1241
args.remove('--profile')
1242
sys.exit(profile_main(args))
1243
elif '--lsprof' in sys.argv:
1245
args.remove('--lsprof')
1246
sys.exit(lsprofile_main(args))
1248
sys.exit(main(sys.argv))
1251
class InterWeave(InterVersionedFile):
1252
"""Optimised code paths for weave to weave operations."""
1254
_matching_file_factory = staticmethod(WeaveFile)
1257
def is_compatible(source, target):
1258
"""Be compatible with weaves."""
1260
return (isinstance(source, Weave) and
1261
isinstance(target, Weave))
1262
except AttributeError:
1265
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1266
"""See InterVersionedFile.join."""
1267
if self.target.versions() == []:
1269
self.target._copy_weave_content(self.source)
1272
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1273
except errors.WeaveParentMismatch:
1274
self.target._reweave(self.source, pb, msg)
1277
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
