190
215
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
193
def __init__(self, weave_name=None):
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__()
195
228
self._parents = []
198
231
self._name_map = {}
199
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
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)
255
"""Return a deep copy of self.
257
The copy can be modified without affecting the original weave."""
259
other._weave = self._weave[:]
260
other._parents = self._parents[:]
261
other._sha1s = self._sha1s[:]
262
other._names = self._names[:]
263
other._name_map = self._name_map.copy()
264
other._weave_name = self._weave_name
202
267
def __eq__(self, other):
203
268
if not isinstance(other, Weave):
205
270
return self._parents == other._parents \
206
271
and self._weave == other._weave \
207
and self._sha1s == other._sha1s
272
and self._sha1s == other._sha1s
210
274
def __ne__(self, other):
211
275
return not self.__eq__(other)
277
def _idx_to_name(self, version):
278
return self._names[version]
214
def lookup(self, name):
280
def _lookup(self, name):
281
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
216
285
return self._name_map[name]
218
raise WeaveError("name %s not present in weave %s" %
219
(name, self._weave_name))
222
def add(self, name, parents, text):
287
raise RevisionNotPresent(name, self._weave_name)
290
"""See VersionedFile.versions."""
291
return self._names[:]
293
def has_version(self, version_id):
294
"""See VersionedFile.has_version."""
295
return (version_id in self._name_map)
297
__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:
380
def _check_repeated_add(self, name, parents, text, sha1):
381
"""Check that a duplicated add is OK.
383
If it is, return the (old) index; otherwise raise an exception.
385
idx = self._lookup(name)
386
if sorted(self._parents[idx]) != sorted(parents) \
387
or sha1 != self._sha1s[idx]:
388
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):
393
"""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):
223
399
"""Add a single text on top of the weave.
225
401
Returns the index number of the newly added version.
228
404
Symbolic name for this version.
229
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)
232
409
List or set of direct parent version numbers.
235
Sequence of lines to be added in the new version."""
237
assert isinstance(name, basestring)
238
if name in self._name_map:
239
raise WeaveError("name %r already present in weave" % name)
412
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)
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
424
if version_id in self._name_map:
425
return self._check_repeated_add(version_id, parents, lines, sha1)
241
427
self._check_versions(parents)
242
## self._check_lines(text)
428
## self._check_lines(lines)
243
429
new_version = len(self._parents)
250
431
# if we abort after here the (in-memory) weave will be corrupt because only
251
432
# some fields are updated
433
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
434
# - Robert Collins 20060226
252
435
self._parents.append(parents[:])
253
436
self._sha1s.append(sha1)
254
self._names.append(name)
255
self._name_map[name] = new_version
437
self._names.append(version_id)
438
self._name_map[version_id] = new_version
259
442
# special case; adding with no parents revision; can do
260
443
# this more quickly by just appending unconditionally.
261
444
# even more specially, if we're adding an empty text we
262
445
# need do nothing at all.
264
447
self._weave.append(('{', new_version))
265
self._weave.extend(text)
448
self._weave.extend(lines)
266
449
self._weave.append(('}', None))
268
450
return new_version
270
452
if len(parents) == 1:
399
554
except IndexError:
400
555
raise IndexError("invalid version number %r" % i)
403
def annotate(self, index):
404
return list(self.annotate_iter(index))
407
def annotate_iter(self, version):
408
"""Yield list of (index-id, line) pairs for the specified version.
557
def _compatible_parents(self, my_parents, other_parents):
558
"""During join check that other_parents are joinable with my_parents.
560
Joinable is defined as 'is a subset of' - supersets may require
561
regeneration of diffs, but subsets do not.
563
return len(other_parents.difference(my_parents)) == 0
565
def annotate(self, version_id):
566
"""Return a list of (version-id, line) tuples for version_id.
410
568
The index indicates when the line originated in the weave."""
411
for origin, lineno, text in self._extract([version]):
419
(lineno, insert, deletes, text)
420
for each literal line.
569
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."""
426
592
lineno = 0 # line of weave, 0-based
428
594
for l in self._weave:
429
if isinstance(l, tuple):
595
if l.__class__ == tuple:
599
istack.append(self._names[v])
603
dset.add(self._names[v])
605
dset.remove(self._names[v])
442
raise WeaveFormatError('unexpected instruction %r'
607
raise WeaveFormatError('unexpected instruction %r' % v)
445
assert isinstance(l, basestring)
447
yield lineno, istack[-1], dset, l
609
yield lineno, istack[-1], frozenset(dset), l
613
raise WeaveFormatError("unclosed insertion blocks "
614
"at end of weave: %s" % istack)
616
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
619
def plan_merge(self, ver_a, ver_b):
620
"""Return pseudo-annotation indicating how the two versions merge.
622
This is computed between versions a and b and their common
625
Weave lines present in none of them are skipped entirely.
627
inc_a = set(self.get_ancestry([ver_a]))
628
inc_b = set(self.get_ancestry([ver_b]))
629
inc_c = inc_a & inc_b
631
for lineno, insert, deleteset, line in self._walk_internal([ver_a, ver_b]):
632
if deleteset & inc_c:
633
# killed in parent; can't be in either a or b
634
# not relevant to our work
635
yield 'killed-base', line
636
elif insert in inc_c:
637
# was inserted in base
638
killed_a = bool(deleteset & inc_a)
639
killed_b = bool(deleteset & inc_b)
640
if killed_a and killed_b:
641
yield 'killed-both', line
643
yield 'killed-a', line
645
yield 'killed-b', line
647
yield 'unchanged', line
648
elif insert in inc_a:
649
if deleteset & inc_a:
650
yield 'ghost-a', line
654
elif insert in inc_b:
655
if deleteset & inc_b:
656
yield 'ghost-b', line
660
# not in either revision
661
yield 'irrelevant', line
452
663
def _extract(self, versions):
453
664
"""Yield annotation of lines in included set.
476
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.
478
717
for l in self._weave:
479
if isinstance(l, tuple):
718
if l.__class__ == tuple:
483
assert v not in istack
725
iset.remove(istack.pop())
488
727
if v in included:
493
730
if v in included:
733
raise AssertionError()
497
assert isinstance(l, basestring)
498
735
if isactive is None:
499
736
isactive = (not dset) and istack and (istack[-1] in included)
501
738
result.append((istack[-1], lineno, l))
505
raise WFE("unclosed insertion blocks at end of weave",
741
raise WeaveFormatError("unclosed insertion blocks "
742
"at end of weave: %s" % istack)
508
raise WFE("unclosed deletion blocks at end of weave",
515
def get_iter(self, version):
516
"""Yield lines for the specified version."""
517
for origin, lineno, line in self._extract([version]):
521
def get_text(self, version):
522
assert isinstance(version, int)
524
s.writelines(self.get_iter(version))
528
def get(self, index):
529
return list(self.get_iter(index))
532
def mash_iter(self, included):
533
"""Return composed version of multiple included versions."""
534
for origin, lineno, text in self._extract(included):
538
def dump(self, to_file):
539
from pprint import pprint
540
print >>to_file, "Weave._weave = ",
541
pprint(self._weave, to_file)
542
print >>to_file, "Weave._parents = ",
543
pprint(self._parents, to_file)
547
def numversions(self):
744
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
748
def _maybe_lookup(self, name_or_index):
749
"""Convert possible symbolic name to index, or pass through indexes.
753
if isinstance(name_or_index, (int, long)):
756
return self._lookup(name_or_index)
758
def get_lines(self, version_id):
759
"""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)]
778
def num_versions(self):
779
"""How many versions are in this weave?"""
548
780
l = len(self._parents)
549
assert l == len(self._sha1s)
554
return self.numversions()
783
__len__ = num_versions
557
785
def check(self, progress_bar=None):
558
# check no circular inclusions
559
for version in range(self.numversions()):
786
# TODO evaluate performance hit of using string sets in this routine.
787
# TODO: check no circular inclusions
788
# TODO: create a nested progress bar
789
for version in range(self.num_versions()):
560
790
inclusions = list(self._parents[version])
562
792
inclusions.sort()
564
794
raise WeaveFormatError("invalid included version %d for index %d"
565
795
% (inclusions[-1], version))
567
# try extracting all versions; this is a bit slow and parallel
568
# extraction could be used
569
nv = self.numversions()
570
for version in range(nv):
797
# try extracting all versions; parallel extraction is used
798
nv = self.num_versions()
803
# For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
804
# The problem is that set membership is much more expensive
805
name = self._idx_to_name(i)
808
new_inc = set([name])
809
for p in self._parents[i]:
810
new_inc.update(inclusions[self._idx_to_name(p)])
812
if set(new_inc) != set(self.get_ancestry(name)):
813
raise AssertionError(
815
% (set(new_inc), set(self.get_ancestry(name))))
816
inclusions[name] = new_inc
818
nlines = len(self._weave)
820
update_text = 'checking weave'
822
short_name = os.path.basename(self._weave_name)
823
update_text = 'checking %s' % (short_name,)
824
update_text = update_text[:25]
826
for lineno, insert, deleteset, line in self._walk_internal():
572
progress_bar.update('checking text', version, nv)
574
for l in self.get_iter(version):
577
expected = self._sha1s[version]
828
progress_bar.update(update_text, lineno, nlines)
830
for name, name_inclusions in inclusions.items():
831
# The active inclusion must be an ancestor,
832
# and no ancestors must have deleted this line,
833
# because we don't support resurrection.
834
if (insert in name_inclusions) and not (deleteset & name_inclusions):
835
sha1s[name].update(line)
838
version = self._idx_to_name(i)
839
hd = sha1s[version].hexdigest()
840
expected = self._sha1s[i]
578
841
if hd != expected:
579
raise WeaveError("mismatched sha1 for version %d; "
580
"got %s, expected %s"
581
% (version, hd, expected))
842
raise errors.WeaveInvalidChecksum(
843
"mismatched sha1 for version %s: "
844
"got %s, expected %s"
845
% (version, hd, expected))
583
847
# TODO: check insertions are properly nested, that there are
584
848
# no lines outside of insertion blocks, that deletions are
585
849
# properly paired, etc.
589
def merge(self, merge_versions):
590
"""Automerge and mark conflicts between versions.
592
This returns a sequence, each entry describing alternatives
593
for a chunk of the file. Each of the alternatives is given as
596
If there is a chunk of the file where there's no diagreement,
597
only one alternative is given.
600
# approach: find the included versions common to all the
602
raise NotImplementedError()
606
def _delta(self, included, lines):
607
"""Return changes from basis to new revision.
609
The old text for comparison is the union of included revisions.
611
This is used in inserting a new text.
613
Delta is returned as a sequence of
614
(weave1, weave2, newlines).
616
This indicates that weave1:weave2 of the old weave should be
617
replaced by the sequence of lines in newlines. Note that
618
these line numbers are positions in the total weave and don't
619
correspond to the lines in any extracted version, or even the
620
extracted union of included versions.
622
If line1=line2, this is a pure insert; if newlines=[] this is a
623
pure delete. (Similar to difflib.)
628
def plan_merge(self, ver_a, ver_b):
629
"""Return pseudo-annotation indicating how the two versions merge.
631
This is computed between versions a and b and their common
634
Weave lines present in none of them are skipped entirely.
636
inc_a = self.inclusions([ver_a])
637
inc_b = self.inclusions([ver_b])
638
inc_c = inc_a & inc_b
640
for lineno, insert, deleteset, line in self._walk():
641
if deleteset & inc_c:
642
# killed in parent; can't be in either a or b
643
# not relevant to our work
644
yield 'killed-base', line
645
elif insert in inc_c:
646
# was inserted in base
647
killed_a = bool(deleteset & inc_a)
648
killed_b = bool(deleteset & inc_b)
649
if killed_a and killed_b:
650
yield 'killed-both', line
652
yield 'killed-a', line
654
yield 'killed-b', line
656
yield 'unchanged', line
657
elif insert in inc_a:
658
if deleteset & inc_a:
659
yield 'ghost-a', line
663
elif insert in inc_b:
664
if deleteset & inc_b:
665
yield 'ghost-b', line
669
# not in either revision
670
yield 'irrelevant', line
672
yield 'unchanged', '' # terminator
676
def weave_merge(self, plan):
681
for state, line in plan:
682
if state == 'unchanged' or state == 'killed-both':
683
# resync and flush queued conflicts changes if any
684
if not lines_a and not lines_b:
686
elif ch_a and not ch_b:
688
for l in lines_a: yield l
689
elif ch_b and not ch_a:
690
for l in lines_b: yield l
691
elif lines_a == lines_b:
692
for l in lines_a: yield l
695
for l in lines_a: yield l
697
for l in lines_b: yield l
704
if state == 'unchanged':
707
elif state == 'killed-a':
710
elif state == 'killed-b':
713
elif state == 'new-a':
716
elif state == 'new-b':
720
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
731
"""Show the weave's table-of-contents"""
732
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
733
for i in (6, 50, 10, 10):
736
for i in range(w.numversions()):
739
parent_str = ' '.join(map(str, w._parents[i]))
740
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
744
def weave_stats(weave_file):
745
from bzrlib.progress import ProgressBar
746
from bzrlib.weavefile import read_weave
750
wf = file(weave_file, 'rb')
752
# FIXME: doesn't work on pipes
753
weave_size = wf.tell()
757
for i in range(vers):
758
pb.update('checking sizes', i, vers)
759
for line in w.get_iter(i):
764
print 'versions %9d' % vers
765
print 'weave file %9d bytes' % weave_size
766
print 'total contents %9d bytes' % total
767
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
770
print 'average size %9d bytes' % avg
771
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
775
print """bzr weave tool
777
Experimental tool for weave algorithm.
781
Create an empty weave file
782
weave get WEAVEFILE VERSION
783
Write out specified version.
784
weave check WEAVEFILE
785
Check consistency of all versions.
787
Display table of contents.
788
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
789
Add NEWTEXT, with specified parent versions.
790
weave annotate WEAVEFILE VERSION
791
Display origin of each line.
792
weave mash WEAVEFILE VERSION...
793
Display composite of all selected versions.
794
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
795
Auto-merge two versions and display conflicts.
799
% weave init foo.weave
801
% weave add foo.weave ver0 < foo.txt
804
(create updated version)
806
% weave get foo.weave 0 | diff -u - foo.txt
807
% weave add foo.weave ver1 0 < foo.txt
810
% weave get foo.weave 0 > foo.txt (create forked version)
812
% weave add foo.weave ver2 0 < foo.txt
815
% weave merge foo.weave 1 2 > foo.txt (merge them)
816
% vi foo.txt (resolve conflicts)
817
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
826
from weavefile import write_weave, read_weave
827
from bzrlib.progress import ProgressBar
842
return read_weave(file(argv[2], 'rb'))
848
# at the moment, based on everything in the file
850
parents = map(int, argv[4:])
851
lines = sys.stdin.readlines()
852
ver = w.add(name, parents, lines)
853
write_weave(w, file(argv[2], 'wb'))
854
print 'added version %r %d' % (name, ver)
857
if os.path.exists(fn):
858
raise IOError("file exists")
860
write_weave(w, file(fn, 'wb'))
861
elif cmd == 'get': # get one version
863
sys.stdout.writelines(w.get_iter(int(argv[3])))
865
elif cmd == 'mash': # get composite
867
sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))
869
elif cmd == 'annotate':
871
# newline is added to all lines regardless; too hard to get
872
# reasonable formatting otherwise
874
for origin, text in w.annotate(int(argv[3])):
875
text = text.rstrip('\r\n')
877
print ' | %s' % (text)
879
print '%5d | %s' % (origin, text)
893
print '%d versions ok' % w.numversions()
895
elif cmd == 'inclusions':
897
print ' '.join(map(str, w.inclusions([int(argv[3])])))
899
elif cmd == 'parents':
901
print ' '.join(map(str, w._parents[int(argv[3])]))
903
elif cmd == 'plan-merge':
905
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
907
print '%14s | %s' % (state, line),
911
p = w.plan_merge(int(argv[3]), int(argv[4]))
912
sys.stdout.writelines(w.weave_merge(p))
914
elif cmd == 'mash-merge':
920
v1, v2 = map(int, argv[3:5])
922
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
924
base_lines = list(w.mash_iter(basis))
925
a_lines = list(w.get(v1))
926
b_lines = list(w.get(v2))
928
from bzrlib.merge3 import Merge3
929
m3 = Merge3(base_lines, a_lines, b_lines)
931
name_a = 'version %d' % v1
932
name_b = 'version %d' % v2
933
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
935
raise ValueError('unknown command %r' % cmd)
939
def profile_main(argv):
940
import tempfile, hotshot, hotshot.stats
942
prof_f = tempfile.NamedTemporaryFile()
944
prof = hotshot.Profile(prof_f.name)
946
ret = prof.runcall(main, argv)
949
stats = hotshot.stats.load(prof_f.name)
951
stats.sort_stats('cumulative')
952
## XXX: Might like to write to stderr or the trace file instead but
953
## print_stats seems hardcoded to stdout
954
stats.print_stats(20)
959
if __name__ == '__main__':
961
if '--profile' in sys.argv:
963
args.remove('--profile')
964
sys.exit(profile_main(args))
966
sys.exit(main(sys.argv))
851
def _imported_parents(self, other, other_idx):
852
"""Return list of parents in self corresponding to indexes in other."""
854
for parent_idx in other._parents[other_idx]:
855
parent_name = other._names[parent_idx]
856
if parent_name not in self._name_map:
857
# should not be possible
858
raise WeaveError("missing parent {%s} of {%s} in %r"
859
% (parent_name, other._name_map[other_idx], self))
860
new_parents.append(self._name_map[parent_name])
863
def _check_version_consistent(self, other, other_idx, name):
864
"""Check if a version in consistent in this and other.
866
To be consistent it must have:
869
* the same direct parents (by name, not index, and disregarding
872
If present & correct return True;
873
if not present in self return False;
874
if inconsistent raise error."""
875
this_idx = self._name_map.get(name, -1)
877
if self._sha1s[this_idx] != other._sha1s[other_idx]:
878
raise errors.WeaveTextDiffers(name, self, other)
879
self_parents = self._parents[this_idx]
880
other_parents = other._parents[other_idx]
881
n1 = set([self._names[i] for i in self_parents])
882
n2 = set([other._names[i] for i in other_parents])
883
if not self._compatible_parents(n1, n2):
884
raise WeaveParentMismatch("inconsistent parents "
885
"for version {%s}: %s vs %s" % (name, n1, n2))
891
def _reweave(self, other, pb, msg):
892
"""Reweave self with other - internal helper for join().
894
:param other: The other weave to merge
895
:param pb: An optional progress bar, indicating how far done we are
896
:param msg: An optional message for the progress
898
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
for attr in self.__slots__:
904
if attr != '_weave_name':
905
setattr(self, attr, copy(getattr(otherweave, attr)))
908
class WeaveFile(Weave):
909
"""A WeaveFile represents a Weave on disk and writes on change."""
911
WEAVE_SUFFIX = '.weave'
913
def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
914
"""Create a WeaveFile.
916
: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)
920
self._transport = transport
921
self._filemode = filemode
923
f = self._transport.get(name + WeaveFile.WEAVE_SUFFIX)
924
_read_weave_v5(StringIO(f.read()), self)
925
except errors.NoSuchFile:
931
def _add_lines(self, version_id, parents, lines, parent_texts,
932
left_matching_blocks, nostore_sha, random_id, check_content):
933
"""Add a version and save the weave."""
934
self.check_not_reserved_id(version_id)
935
result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
936
parent_texts, left_matching_blocks, nostore_sha, random_id,
941
def copy_to(self, name, transport):
942
"""See VersionedFile.copy_to()."""
943
# as we are all in memory always, just serialise to the new place.
945
write_weave_v5(self, sio)
947
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
950
"""Save the weave."""
951
self._check_write_ok()
953
write_weave_v5(self, sio)
955
bytes = sio.getvalue()
956
path = self._weave_name + WeaveFile.WEAVE_SUFFIX
958
self._transport.put_bytes(path, bytes, self._filemode)
959
except errors.NoSuchFile:
960
self._transport.mkdir(dirname(path))
961
self._transport.put_bytes(path, bytes, self._filemode)
965
"""See VersionedFile.get_suffixes()."""
966
return [WeaveFile.WEAVE_SUFFIX]
968
def insert_record_stream(self, stream):
969
super(WeaveFile, self).insert_record_stream(stream)
973
def _reweave(wa, wb, pb=None, msg=None):
974
"""Combine two weaves and return the result.
976
This works even if a revision R has different parents in
977
wa and wb. In the resulting weave all the parents are given.
979
This is done by just building up a new weave, maintaining ordering
980
of the versions in the two inputs. More efficient approaches
981
might be possible but it should only be necessary to do
982
this operation rarely, when a new previously ghost version is
985
:param pb: An optional progress bar, indicating how far done we are
986
:param msg: An optional message for the progress
990
queue_a = range(wa.num_versions())
991
queue_b = range(wb.num_versions())
992
# first determine combined parents of all versions
993
# map from version name -> all parent names
994
combined_parents = _reweave_parent_graphs(wa, wb)
995
mutter("combined parents: %r", combined_parents)
996
order = tsort.topo_sort(combined_parents.iteritems())
997
mutter("order to reweave: %r", order)
1002
for idx, name in enumerate(order):
1004
pb.update(msg, idx, len(order))
1005
if name in wa._name_map:
1006
lines = wa.get_lines(name)
1007
if name in wb._name_map:
1008
lines_b = wb.get_lines(name)
1009
if lines != lines_b:
1010
mutter('Weaves differ on content. rev_id {%s}', name)
1011
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1013
lines = list(difflib.unified_diff(lines, lines_b,
1014
wa._weave_name, wb._weave_name))
1015
mutter('lines:\n%s', ''.join(lines))
1016
raise errors.WeaveTextDiffers(name, wa, wb)
1018
lines = wb.get_lines(name)
1019
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1023
def _reweave_parent_graphs(wa, wb):
1024
"""Return combined parent ancestry for two weaves.
1026
Returned as a list of (version_name, set(parent_names))"""
1028
for weave in [wa, wb]:
1029
for idx, name in enumerate(weave._names):
1030
p = combined.setdefault(name, set())
1031
p.update(map(weave._idx_to_name, weave._parents[idx]))
added
removed
bzrlib/weave.py
