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
69
70
from copy import copy
70
71
from cStringIO import StringIO
72
from difflib import SequenceMatcher
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import tsort
77
from bzrlib.trace import mutter
81
78
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
79
RevisionAlreadyPresent,
83
80
RevisionNotPresent,
84
UnavailableRepresentation,
81
WeaveRevisionAlreadyPresent,
82
WeaveRevisionNotPresent,
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
import bzrlib.patiencediff
88
from bzrlib.revision import NULL_REVISION
84
import bzrlib.errors as errors
85
from bzrlib.osutils import sha_strings
89
86
from bzrlib.symbol_versioning import *
90
from bzrlib.trace import mutter
91
from bzrlib.versionedfile import (
87
from bzrlib.tsort import topo_sort
88
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
98
89
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
92
class Weave(VersionedFile):
127
93
"""weave - versioned text file storage.
129
95
A Weave manages versions of line-based text files, keeping track
130
96
of the originating version for each line.
215
181
__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__()
184
def __init__(self, weave_name=None):
228
186
self._parents = []
231
189
self._name_map = {}
232
190
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
192
def __repr__(self):
245
193
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
196
"""Return a deep copy of self.
257
198
The copy can be modified without affecting the original weave."""
259
200
other._weave = self._weave[:]
270
211
return self._parents == other._parents \
271
212
and self._weave == other._weave \
272
and self._sha1s == other._sha1s
213
and self._sha1s == other._sha1s
274
215
def __ne__(self, other):
275
216
return not self.__eq__(other)
218
@deprecated_method(zero_eight)
219
def idx_to_name(self, index):
220
"""Old public interface, the public interface is all names now."""
277
223
def _idx_to_name(self, version):
278
224
return self._names[version]
226
@deprecated_method(zero_eight)
227
def lookup(self, name):
228
"""Backwards compatability thunk:
230
Return name, as name is valid in the api now, and spew deprecation
280
235
def _lookup(self, name):
281
236
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
285
238
return self._name_map[name]
287
240
raise RevisionNotPresent(name, self._weave_name)
242
@deprecated_method(zero_eight)
243
def iter_names(self):
244
"""Deprecated convenience function, please see VersionedFile.names()."""
245
return iter(self.names())
247
@deprecated_method(zero_eight)
249
"""See Weave.versions for the current api."""
250
return self.versions()
289
252
def versions(self):
290
253
"""See VersionedFile.versions."""
291
254
return self._names[:]
293
256
def has_version(self, version_id):
294
257
"""See VersionedFile.has_version."""
295
return (version_id in self._name_map)
258
return self._name_map.has_key(version_id)
297
260
__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:
262
def get_parents(self, version_id):
263
"""See VersionedFile.get_parent."""
264
return map(self._idx_to_name, self._parents[self._lookup(version_id)])
380
266
def _check_repeated_add(self, name, parents, text, sha1):
381
267
"""Check that a duplicated add is OK.
388
274
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):
277
@deprecated_method(zero_eight)
278
def add_identical(self, old_rev_id, new_rev_id, parents):
279
"""Please use Weave.clone_text now."""
280
return self.clone_text(new_rev_id, old_rev_id, parents)
282
def add_lines(self, version_id, parents, lines):
393
283
"""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):
284
return self._add(version_id, lines, map(self._lookup, parents))
286
@deprecated_method(zero_eight)
287
def add(self, name, parents, text, sha1=None):
288
"""See VersionedFile.add_lines for the non deprecated api."""
289
return self._add(name, text, map(self._maybe_lookup, parents), sha1)
291
def _add(self, version_id, lines, parents, sha1=None):
399
292
"""Add a single text on top of the weave.
401
294
Returns the index number of the newly added version.
404
297
Symbolic name for this version.
405
298
(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
301
List or set of direct parent version numbers.
412
304
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)
307
assert isinstance(version_id, basestring)
419
309
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
310
if version_id in self._name_map:
425
311
return self._check_repeated_add(version_id, parents, lines, sha1)
557
464
def _compatible_parents(self, my_parents, other_parents):
558
465
"""During join check that other_parents are joinable with my_parents.
560
Joinable is defined as 'is a subset of' - supersets may require
467
Joinable is defined as 'is a subset of' - supersets may require
561
468
regeneration of diffs, but subsets do not.
563
470
return len(other_parents.difference(my_parents)) == 0
565
472
def annotate(self, version_id):
566
"""Return a list of (version-id, line) tuples for version_id.
473
if isinstance(version_id, int):
474
warn('Weave.annotate(int) is deprecated. Please use version names'
475
' in all circumstances as of 0.8',
480
for origin, lineno, text in self._extract([version_id]):
481
result.append((origin, text))
484
return super(Weave, self).annotate(version_id)
486
def annotate_iter(self, version_id):
487
"""Yield list of (version-id, line) pairs for the specified version.
568
489
The index indicates when the line originated in the weave."""
569
490
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,
491
for origin, lineno, text in self._extract(incls):
492
yield self._idx_to_name(origin), text
494
@deprecated_method(zero_eight)
496
"""_walk has become visit, a supported api."""
497
return self._walk_internal()
499
def iter_lines_added_or_present_in_versions(self, version_ids=None):
575
500
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
576
501
if version_ids is None:
577
502
version_ids = self.versions()
578
503
version_ids = set(version_ids)
579
504
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
580
if inserted not in version_ids: continue
505
# if inserted not in version_ids then it was inserted before the
506
# versions we care about, but because weaves cannot represent ghosts
507
# properly, we do not filter down to that
508
# if inserted not in version_ids: continue
581
509
if line[-1] != '\n':
582
yield line + '\n', inserted
514
#@deprecated_method(zero_eight)
515
def walk(self, version_ids=None):
516
"""See VersionedFile.walk."""
517
return self._walk_internal(version_ids)
586
519
def _walk_internal(self, version_ids=None):
587
520
"""Helper method for weave actions."""
592
525
lineno = 0 # line of weave, 0-based
594
527
for l in self._weave:
595
if l.__class__ == tuple:
528
if isinstance(l, tuple):
599
istack.append(self._names[v])
532
istack.append(self._idx_to_name(v))
603
dset.add(self._names[v])
536
assert self._idx_to_name(v) not in dset
537
dset.add(self._idx_to_name(v))
605
dset.remove(self._names[v])
539
dset.remove(self._idx_to_name(v))
607
541
raise WeaveFormatError('unexpected instruction %r' % v)
609
yield lineno, istack[-1], frozenset(dset), l
543
assert isinstance(l, basestring)
545
yield lineno, istack[-1], dset.copy(), l
688
579
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
581
for l in self._weave:
718
if l.__class__ == tuple:
582
if isinstance(l, tuple):
586
assert v not in istack
725
iset.remove(istack.pop())
727
591
if v in included:
730
596
if v in included:
733
raise AssertionError()
600
assert isinstance(l, basestring)
735
601
if isactive is None:
736
602
isactive = (not dset) and istack and (istack[-1] in included)
756
635
return self._lookup(name_or_index)
637
def _get_iter(self, version_id):
638
"""Yield lines for the specified version."""
639
incls = [self._maybe_lookup(version_id)]
644
# We don't have sha1 sums for multiple entries
646
for origin, lineno, line in self._extract(incls):
651
expected_sha1 = self._sha1s[index]
652
measured_sha1 = cur_sha.hexdigest()
653
if measured_sha1 != expected_sha1:
654
raise errors.WeaveInvalidChecksum(
655
'file %s, revision %s, expected: %s, measured %s'
656
% (self._weave_name, self._names[index],
657
expected_sha1, measured_sha1))
659
@deprecated_method(zero_eight)
660
def get(self, version_id):
661
"""Please use either Weave.get_text or Weave.get_lines as desired."""
662
return self.get_lines(version_id)
758
664
def get_lines(self, version_id):
759
665
"""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)]
666
return list(self._get_iter(version_id))
668
def get_sha1(self, name):
669
"""Get the stored sha1 sum for the given revision.
671
:param name: The name of the version to lookup
673
return self._sha1s[self._lookup(name)]
675
@deprecated_method(zero_eight)
676
def numversions(self):
677
"""How many versions are in this weave?
679
Deprecated in favour of num_versions.
681
return self.num_versions()
778
683
def num_versions(self):
779
684
"""How many versions are in this weave?"""
780
685
l = len(self._parents)
686
assert l == len(self._sha1s)
783
689
__len__ = num_versions
785
691
def check(self, progress_bar=None):
786
692
# TODO evaluate performance hit of using string sets in this routine.
787
# TODO: check no circular inclusions
788
# TODO: create a nested progress bar
693
# check no circular inclusions
789
694
for version in range(self.num_versions()):
790
695
inclusions = list(self._parents[version])
848
751
# no lines outside of insertion blocks, that deletions are
849
752
# properly paired, etc.
754
def _join(self, other, pb, msg, version_ids, ignore_missing):
755
"""Worker routine for join()."""
756
if not other.versions():
757
return # nothing to update, easy
760
for version_id in version_ids:
761
if not other.has_version(version_id) and not ignore_missing:
762
raise RevisionNotPresent(version_id, self._weave_name)
764
version_ids = other.versions()
766
# two loops so that we do not change ourselves before verifying it
768
# work through in index order to make sure we get all dependencies
771
# get the selected versions only that are in other.versions.
772
version_ids = set(other.versions()).intersection(set(version_ids))
773
# pull in the referenced graph.
774
version_ids = other.get_ancestry(version_ids)
775
pending_graph = [(version, other.get_parents(version)) for
776
version in version_ids]
777
for name in topo_sort(pending_graph):
778
other_idx = other._name_map[name]
779
self._check_version_consistent(other, other_idx, name)
780
sha1 = other._sha1s[other_idx]
784
if name in self._name_map:
785
idx = self._lookup(name)
786
n1 = set(map(other._idx_to_name, other._parents[other_idx]))
787
n2 = set(map(self._idx_to_name, self._parents[idx]))
788
if sha1 == self._sha1s[idx] and n1 == n2:
791
names_to_join.append((other_idx, name))
798
for other_idx, name in names_to_join:
799
# TODO: If all the parents of the other version are already
800
# present then we can avoid some work by just taking the delta
801
# and adjusting the offsets.
802
new_parents = self._imported_parents(other, other_idx)
803
sha1 = other._sha1s[other_idx]
808
pb.update(msg, merged, len(names_to_join))
810
lines = other.get_lines(other_idx)
811
self._add(name, lines, new_parents, sha1)
813
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
814
merged, processed, self._weave_name, time.time()-time0))
851
816
def _imported_parents(self, other, other_idx):
852
817
"""Return list of parents in self corresponding to indexes in other."""
854
819
for parent_idx in other._parents[other_idx]:
855
820
parent_name = other._names[parent_idx]
856
if parent_name not in self._name_map:
821
if parent_name not in self._names:
857
822
# should not be possible
858
raise WeaveError("missing parent {%s} of {%s} in %r"
823
raise WeaveError("missing parent {%s} of {%s} in %r"
859
824
% (parent_name, other._name_map[other_idx], self))
860
825
new_parents.append(self._name_map[parent_name])
861
826
return new_parents
944
908
write_weave_v5(self, sio)
946
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
910
transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._mode)
912
def create_empty(self, name, transport, mode=None):
913
return WeaveFile(name, transport, mode, create=True)
949
916
"""Save the weave."""
950
self._check_write_ok()
952
918
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)
920
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
963
925
def get_suffixes():
964
926
"""See VersionedFile.get_suffixes()."""
965
927
return [WeaveFile.WEAVE_SUFFIX]
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
929
def join(self, other, pb=None, msg=None, version_ids=None,
930
ignore_missing=False):
931
"""Join other into self and save."""
932
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
936
@deprecated_function(zero_eight)
937
def reweave(wa, wb, pb=None, msg=None):
938
"""reweaving is deprecation, please just use weave.join()."""
939
_reweave(wa, wb, pb, msg)
972
941
def _reweave(wa, wb, pb=None, msg=None):
973
942
"""Combine two weaves and return the result.
975
This works even if a revision R has different parents in
944
This works even if a revision R has different parents in
976
945
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
947
This is done by just building up a new weave, maintaining ordering
979
948
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
949
might be possible but it should only be necessary to do
950
this operation rarely, when a new previously ghost version is
984
953
:param pb: An optional progress bar, indicating how far done we are
1029
997
p = combined.setdefault(name, set())
1030
998
p.update(map(weave._idx_to_name, weave._parents[idx]))
1003
"""Show the weave's table-of-contents"""
1004
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1005
for i in (6, 50, 10, 10):
1008
for i in range(w.num_versions()):
1011
parent_str = ' '.join(map(str, w._parents[i]))
1012
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1016
def weave_stats(weave_file, pb):
1017
from bzrlib.weavefile import read_weave
1019
wf = file(weave_file, 'rb')
1020
w = read_weave(wf, WeaveVersionedFile)
1021
# FIXME: doesn't work on pipes
1022
weave_size = wf.tell()
1026
for i in range(vers):
1027
pb.update('checking sizes', i, vers)
1028
for origin, lineno, line in w._extract([i]):
1033
print 'versions %9d' % vers
1034
print 'weave file %9d bytes' % weave_size
1035
print 'total contents %9d bytes' % total
1036
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1039
print 'average size %9d bytes' % avg
1040
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1044
print """bzr weave tool
1046
Experimental tool for weave algorithm.
1049
weave init WEAVEFILE
1050
Create an empty weave file
1051
weave get WEAVEFILE VERSION
1052
Write out specified version.
1053
weave check WEAVEFILE
1054
Check consistency of all versions.
1056
Display table of contents.
1057
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1058
Add NEWTEXT, with specified parent versions.
1059
weave annotate WEAVEFILE VERSION
1060
Display origin of each line.
1061
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1062
Auto-merge two versions and display conflicts.
1063
weave diff WEAVEFILE VERSION1 VERSION2
1064
Show differences between two versions.
1068
% weave init foo.weave
1070
% weave add foo.weave ver0 < foo.txt
1073
(create updated version)
1075
% weave get foo.weave 0 | diff -u - foo.txt
1076
% weave add foo.weave ver1 0 < foo.txt
1079
% weave get foo.weave 0 > foo.txt (create forked version)
1081
% weave add foo.weave ver2 0 < foo.txt
1084
% weave merge foo.weave 1 2 > foo.txt (merge them)
1085
% vi foo.txt (resolve conflicts)
1086
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1098
# in case we're run directly from the subdirectory
1099
sys.path.append('..')
1101
from bzrlib.weavefile import write_weave, read_weave
1102
from bzrlib.progress import ProgressBar
1117
return read_weave(file(argv[2], 'rb'))
1123
# at the moment, based on everything in the file
1125
parents = map(int, argv[4:])
1126
lines = sys.stdin.readlines()
1127
ver = w.add(name, parents, lines)
1128
write_weave(w, file(argv[2], 'wb'))
1129
print 'added version %r %d' % (name, ver)
1132
if os.path.exists(fn):
1133
raise IOError("file exists")
1135
write_weave(w, file(fn, 'wb'))
1136
elif cmd == 'get': # get one version
1138
sys.stdout.writelines(w.get_iter(int(argv[3])))
1141
from difflib import unified_diff
1144
v1, v2 = map(int, argv[3:5])
1147
diff_gen = unified_diff(lines1, lines2,
1148
'%s version %d' % (fn, v1),
1149
'%s version %d' % (fn, v2))
1150
sys.stdout.writelines(diff_gen)
1152
elif cmd == 'annotate':
1154
# newline is added to all lines regardless; too hard to get
1155
# reasonable formatting otherwise
1157
for origin, text in w.annotate(int(argv[3])):
1158
text = text.rstrip('\r\n')
1160
print ' | %s' % (text)
1162
print '%5d | %s' % (origin, text)
1168
elif cmd == 'stats':
1169
weave_stats(argv[2], ProgressBar())
1171
elif cmd == 'check':
1176
print '%d versions ok' % w.num_versions()
1178
elif cmd == 'inclusions':
1180
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1182
elif cmd == 'parents':
1184
print ' '.join(map(str, w._parents[int(argv[3])]))
1186
elif cmd == 'plan-merge':
1188
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1190
print '%14s | %s' % (state, line),
1192
elif cmd == 'merge':
1194
p = w.plan_merge(int(argv[3]), int(argv[4]))
1195
sys.stdout.writelines(w.weave_merge(p))
1198
raise ValueError('unknown command %r' % cmd)
1202
def profile_main(argv):
1203
import tempfile, hotshot, hotshot.stats
1205
prof_f = tempfile.NamedTemporaryFile()
1207
prof = hotshot.Profile(prof_f.name)
1209
ret = prof.runcall(main, argv)
1212
stats = hotshot.stats.load(prof_f.name)
1214
stats.sort_stats('cumulative')
1215
## XXX: Might like to write to stderr or the trace file instead but
1216
## print_stats seems hardcoded to stdout
1217
stats.print_stats(20)
1222
def lsprofile_main(argv):
1223
from bzrlib.lsprof import profile
1224
ret,stats = profile(main, argv)
1230
if __name__ == '__main__':
1232
if '--profile' in sys.argv:
1234
args.remove('--profile')
1235
sys.exit(profile_main(args))
1236
elif '--lsprof' in sys.argv:
1238
args.remove('--lsprof')
1239
sys.exit(lsprofile_main(args))
1241
sys.exit(main(sys.argv))
1244
class InterWeave(InterVersionedFile):
1245
"""Optimised code paths for weave to weave operations."""
1247
_matching_file_factory = staticmethod(WeaveFile)
1250
def is_compatible(source, target):
1251
"""Be compatible with weaves."""
1253
return (isinstance(source, Weave) and
1254
isinstance(target, Weave))
1255
except AttributeError:
1258
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1259
"""See InterVersionedFile.join."""
1260
if self.target.versions() == []:
1262
self.target._copy_weave_content(self.source)
1265
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1266
except errors.WeaveParentMismatch:
1267
self.target._reweave(self.source, pb, msg)
1270
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
