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, access_mode='w'):
185
super(Weave, self).__init__(access_mode)
228
187
self._parents = []
231
190
self._name_map = {}
232
191
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
193
def __repr__(self):
245
194
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
197
"""Return a deep copy of self.
257
199
The copy can be modified without affecting the original weave."""
259
201
other._weave = self._weave[:]
270
212
return self._parents == other._parents \
271
213
and self._weave == other._weave \
272
and self._sha1s == other._sha1s
214
and self._sha1s == other._sha1s
274
216
def __ne__(self, other):
275
217
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."""
277
224
def _idx_to_name(self, version):
278
225
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
280
236
def _lookup(self, name):
281
237
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
285
239
return self._name_map[name]
287
241
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()
289
253
def versions(self):
290
254
"""See VersionedFile.versions."""
291
255
return self._names[:]
293
257
def has_version(self, version_id):
294
258
"""See VersionedFile.has_version."""
295
return (version_id in self._name_map)
259
return self._name_map.has_key(version_id)
297
261
__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:
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)])
380
267
def _check_repeated_add(self, name, parents, text, sha1):
381
268
"""Check that a duplicated add is OK.
388
275
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):
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):
393
284
"""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):
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):
399
293
"""Add a single text on top of the weave.
401
295
Returns the index number of the newly added version.
404
298
Symbolic name for this version.
405
299
(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
302
List or set of direct parent version numbers.
412
305
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)
308
assert isinstance(version_id, basestring)
419
310
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
311
if version_id in self._name_map:
425
312
return self._check_repeated_add(version_id, parents, lines, sha1)
557
465
def _compatible_parents(self, my_parents, other_parents):
558
466
"""During join check that other_parents are joinable with my_parents.
560
Joinable is defined as 'is a subset of' - supersets may require
468
Joinable is defined as 'is a subset of' - supersets may require
561
469
regeneration of diffs, but subsets do not.
563
471
return len(other_parents.difference(my_parents)) == 0
565
473
def annotate(self, version_id):
566
"""Return a list of (version-id, line) tuples for 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.
568
490
The index indicates when the line originated in the weave."""
569
491
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,
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):
575
501
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
576
502
if version_ids is None:
577
503
version_ids = self.versions()
578
504
version_ids = set(version_ids)
579
505
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
580
if inserted not in version_ids: continue
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
581
510
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)
586
520
def _walk_internal(self, version_ids=None):
587
521
"""Helper method for weave actions."""
592
526
lineno = 0 # line of weave, 0-based
594
528
for l in self._weave:
595
if l.__class__ == tuple:
529
if isinstance(l, tuple):
599
istack.append(self._names[v])
533
istack.append(self._idx_to_name(v))
603
dset.add(self._names[v])
537
assert self._idx_to_name(v) not in dset
538
dset.add(self._idx_to_name(v))
605
dset.remove(self._names[v])
540
dset.remove(self._idx_to_name(v))
607
542
raise WeaveFormatError('unexpected instruction %r' % v)
609
yield lineno, istack[-1], frozenset(dset), l
544
assert isinstance(l, basestring)
546
yield lineno, istack[-1], dset.copy(), l
756
665
return self._lookup(name_or_index)
667
def _get_iter(self, version_id):
668
"""Yield lines for the specified version."""
669
incls = [self._maybe_lookup(version_id)]
674
# We don't have sha1 sums for multiple entries
676
for origin, lineno, line in self._extract(incls):
681
expected_sha1 = self._sha1s[index]
682
measured_sha1 = cur_sha.hexdigest()
683
if measured_sha1 != expected_sha1:
684
raise errors.WeaveInvalidChecksum(
685
'file %s, revision %s, expected: %s, measured %s'
686
% (self._weave_name, self._names[index],
687
expected_sha1, measured_sha1))
689
@deprecated_method(zero_eight)
690
def get(self, version_id):
691
"""Please use either Weave.get_text or Weave.get_lines as desired."""
692
return self.get_lines(version_id)
758
694
def get_lines(self, version_id):
759
695
"""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)]
696
return list(self._get_iter(version_id))
698
def get_sha1(self, name):
699
"""Get the stored sha1 sum for the given revision.
701
:param name: The name of the version to lookup
703
return self._sha1s[self._lookup(name)]
705
@deprecated_method(zero_eight)
706
def numversions(self):
707
"""How many versions are in this weave?
709
Deprecated in favour of num_versions.
711
return self.num_versions()
778
713
def num_versions(self):
779
714
"""How many versions are in this weave?"""
780
715
l = len(self._parents)
716
assert l == len(self._sha1s)
783
719
__len__ = num_versions
785
721
def check(self, progress_bar=None):
786
722
# TODO evaluate performance hit of using string sets in this routine.
787
# TODO: check no circular inclusions
788
# TODO: create a nested progress bar
723
# check no circular inclusions
789
724
for version in range(self.num_versions()):
790
725
inclusions = list(self._parents[version])
848
781
# no lines outside of insertion blocks, that deletions are
849
782
# properly paired, etc.
784
def _join(self, other, pb, msg, version_ids, ignore_missing):
785
"""Worker routine for join()."""
786
if not other.versions():
787
return # nothing to update, easy
790
for version_id in version_ids:
791
if not other.has_version(version_id) and not ignore_missing:
792
raise RevisionNotPresent(version_id, self._weave_name)
794
version_ids = other.versions()
796
# two loops so that we do not change ourselves before verifying it
798
# work through in index order to make sure we get all dependencies
801
# get the selected versions only that are in other.versions.
802
version_ids = set(other.versions()).intersection(set(version_ids))
803
# pull in the referenced graph.
804
version_ids = other.get_ancestry(version_ids)
805
pending_graph = [(version, other.get_parents(version)) for
806
version in version_ids]
807
for name in topo_sort(pending_graph):
808
other_idx = other._name_map[name]
809
# returns True if we have it, False if we need it.
810
if not self._check_version_consistent(other, other_idx, name):
811
names_to_join.append((other_idx, name))
820
for other_idx, name in names_to_join:
821
# TODO: If all the parents of the other version are already
822
# present then we can avoid some work by just taking the delta
823
# and adjusting the offsets.
824
new_parents = self._imported_parents(other, other_idx)
825
sha1 = other._sha1s[other_idx]
830
pb.update(msg, merged, len(names_to_join))
832
lines = other.get_lines(other_idx)
833
self._add(name, lines, new_parents, sha1)
835
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
836
merged, processed, self._weave_name, time.time()-time0))
851
838
def _imported_parents(self, other, other_idx):
852
839
"""Return list of parents in self corresponding to indexes in other."""
854
841
for parent_idx in other._parents[other_idx]:
855
842
parent_name = other._names[parent_idx]
856
if parent_name not in self._name_map:
843
if parent_name not in self._names:
857
844
# should not be possible
858
raise WeaveError("missing parent {%s} of {%s} in %r"
845
raise WeaveError("missing parent {%s} of {%s} in %r"
859
846
% (parent_name, other._name_map[other_idx], self))
860
847
new_parents.append(self._name_map[parent_name])
861
848
return new_parents
927
918
# new file, save it
930
def _add_lines(self, version_id, parents, lines, parent_texts,
931
left_matching_blocks, nostore_sha, random_id, check_content):
921
def _add_lines(self, version_id, parents, lines):
932
922
"""Add a version and save the weave."""
933
self.check_not_reserved_id(version_id)
934
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
935
parent_texts, left_matching_blocks, nostore_sha, random_id,
923
super(WeaveFile, self)._add_lines(version_id, parents, lines)
926
def _clone_text(self, new_version_id, old_version_id, parents):
927
"""See VersionedFile.clone_text."""
928
super(WeaveFile, self)._clone_text(new_version_id, old_version_id, parents)
940
931
def copy_to(self, name, transport):
941
932
"""See VersionedFile.copy_to()."""
952
946
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)
948
self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
963
953
def get_suffixes():
964
954
"""See VersionedFile.get_suffixes()."""
965
955
return [WeaveFile.WEAVE_SUFFIX]
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
957
def join(self, other, pb=None, msg=None, version_ids=None,
958
ignore_missing=False):
959
"""Join other into self and save."""
960
super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
964
@deprecated_function(zero_eight)
965
def reweave(wa, wb, pb=None, msg=None):
966
"""reweaving is deprecation, please just use weave.join()."""
967
_reweave(wa, wb, pb, msg)
972
969
def _reweave(wa, wb, pb=None, msg=None):
973
970
"""Combine two weaves and return the result.
975
This works even if a revision R has different parents in
972
This works even if a revision R has different parents in
976
973
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
975
This is done by just building up a new weave, maintaining ordering
979
976
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
977
might be possible but it should only be necessary to do
978
this operation rarely, when a new previously ghost version is
984
981
:param pb: An optional progress bar, indicating how far done we are
1029
1025
p = combined.setdefault(name, set())
1030
1026
p.update(map(weave._idx_to_name, weave._parents[idx]))
1031
1027
return combined
1031
"""Show the weave's table-of-contents"""
1032
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1033
for i in (6, 50, 10, 10):
1036
for i in range(w.num_versions()):
1039
parent_str = ' '.join(map(str, w._parents[i]))
1040
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
1044
def weave_stats(weave_file, pb):
1045
from bzrlib.weavefile import read_weave
1047
wf = file(weave_file, 'rb')
1048
w = read_weave(wf, WeaveVersionedFile)
1049
# FIXME: doesn't work on pipes
1050
weave_size = wf.tell()
1054
for i in range(vers):
1055
pb.update('checking sizes', i, vers)
1056
for origin, lineno, line in w._extract([i]):
1061
print 'versions %9d' % vers
1062
print 'weave file %9d bytes' % weave_size
1063
print 'total contents %9d bytes' % total
1064
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1067
print 'average size %9d bytes' % avg
1068
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1072
print """bzr weave tool
1074
Experimental tool for weave algorithm.
1077
weave init WEAVEFILE
1078
Create an empty weave file
1079
weave get WEAVEFILE VERSION
1080
Write out specified version.
1081
weave check WEAVEFILE
1082
Check consistency of all versions.
1084
Display table of contents.
1085
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1086
Add NEWTEXT, with specified parent versions.
1087
weave annotate WEAVEFILE VERSION
1088
Display origin of each line.
1089
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1090
Auto-merge two versions and display conflicts.
1091
weave diff WEAVEFILE VERSION1 VERSION2
1092
Show differences between two versions.
1096
% weave init foo.weave
1098
% weave add foo.weave ver0 < foo.txt
1101
(create updated version)
1103
% weave get foo.weave 0 | diff -u - foo.txt
1104
% weave add foo.weave ver1 0 < foo.txt
1107
% weave get foo.weave 0 > foo.txt (create forked version)
1109
% weave add foo.weave ver2 0 < foo.txt
1112
% weave merge foo.weave 1 2 > foo.txt (merge them)
1113
% vi foo.txt (resolve conflicts)
1114
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1126
# in case we're run directly from the subdirectory
1127
sys.path.append('..')
1129
from bzrlib.weavefile import write_weave, read_weave
1130
from bzrlib.progress import ProgressBar
1145
return read_weave(file(argv[2], 'rb'))
1151
# at the moment, based on everything in the file
1153
parents = map(int, argv[4:])
1154
lines = sys.stdin.readlines()
1155
ver = w.add(name, parents, lines)
1156
write_weave(w, file(argv[2], 'wb'))
1157
print 'added version %r %d' % (name, ver)
1160
if os.path.exists(fn):
1161
raise IOError("file exists")
1163
write_weave(w, file(fn, 'wb'))
1164
elif cmd == 'get': # get one version
1166
sys.stdout.writelines(w.get_iter(int(argv[3])))
1169
from difflib import unified_diff
1172
v1, v2 = map(int, argv[3:5])
1175
diff_gen = unified_diff(lines1, lines2,
1176
'%s version %d' % (fn, v1),
1177
'%s version %d' % (fn, v2))
1178
sys.stdout.writelines(diff_gen)
1180
elif cmd == 'annotate':
1182
# newline is added to all lines regardless; too hard to get
1183
# reasonable formatting otherwise
1185
for origin, text in w.annotate(int(argv[3])):
1186
text = text.rstrip('\r\n')
1188
print ' | %s' % (text)
1190
print '%5d | %s' % (origin, text)
1196
elif cmd == 'stats':
1197
weave_stats(argv[2], ProgressBar())
1199
elif cmd == 'check':
1204
print '%d versions ok' % w.num_versions()
1206
elif cmd == 'inclusions':
1208
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1210
elif cmd == 'parents':
1212
print ' '.join(map(str, w._parents[int(argv[3])]))
1214
elif cmd == 'plan-merge':
1216
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1218
print '%14s | %s' % (state, line),
1220
elif cmd == 'merge':
1222
p = w.plan_merge(int(argv[3]), int(argv[4]))
1223
sys.stdout.writelines(w.weave_merge(p))
1226
raise ValueError('unknown command %r' % cmd)
1230
def profile_main(argv):
1231
import tempfile, hotshot, hotshot.stats
1233
prof_f = tempfile.NamedTemporaryFile()
1235
prof = hotshot.Profile(prof_f.name)
1237
ret = prof.runcall(main, argv)
1240
stats = hotshot.stats.load(prof_f.name)
1242
stats.sort_stats('cumulative')
1243
## XXX: Might like to write to stderr or the trace file instead but
1244
## print_stats seems hardcoded to stdout
1245
stats.print_stats(20)
1250
def lsprofile_main(argv):
1251
from bzrlib.lsprof import profile
1252
ret,stats = profile(main, argv)
1258
if __name__ == '__main__':
1260
if '--profile' in sys.argv:
1262
args.remove('--profile')
1263
sys.exit(profile_main(args))
1264
elif '--lsprof' in sys.argv:
1266
args.remove('--lsprof')
1267
sys.exit(lsprofile_main(args))
1269
sys.exit(main(sys.argv))
1272
class InterWeave(InterVersionedFile):
1273
"""Optimised code paths for weave to weave operations."""
1275
_matching_file_factory = staticmethod(WeaveFile)
1278
def is_compatible(source, target):
1279
"""Be compatible with weaves."""
1281
return (isinstance(source, Weave) and
1282
isinstance(target, Weave))
1283
except AttributeError:
1286
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1287
"""See InterVersionedFile.join."""
1288
if self.target.versions() == []:
1290
self.target._copy_weave_content(self.source)
1293
self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1294
except errors.WeaveParentMismatch:
1295
self.target._reweave(self.source, pb, msg)
1298
InterVersionedFile.register_optimiser(InterWeave)
added
removed
bzrlib/weave.py
