59
61
# where the basis and destination are unchanged.
61
63
# FIXME: Sometimes we will be given a parents list for a revision
62
# that includes some redundant parents (i.e. already a parent of
63
# something in the list.) We should eliminate them. This can
64
# that includes some redundant parents (i.e. already a parent of
65
# something in the list.) We should eliminate them. This can
64
66
# be done fairly efficiently because the sequence numbers constrain
65
67
# the possible relationships.
67
# FIXME: the conflict markers should be *7* characters
70
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
74
from bzrlib.trace import mutter
81
75
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
RevisionAlreadyPresent,
84
UnavailableRepresentation,
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
import bzrlib.patiencediff
88
from bzrlib.revision import NULL_REVISION
89
from bzrlib.symbol_versioning import *
90
from bzrlib.trace import mutter
91
from bzrlib.versionedfile import (
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')
126
class Weave(VersionedFile):
76
WeaveRevisionNotPresent, WeaveRevisionAlreadyPresent)
77
import bzrlib.errors as errors
78
from bzrlib.tsort import topo_sort
127
82
"""weave - versioned text file storage.
129
84
A Weave manages versions of line-based text files, keeping track
130
85
of the originating version for each line.
215
170
__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__()
173
def __init__(self, weave_name=None):
228
175
self._parents = []
231
178
self._name_map = {}
232
179
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
181
def __repr__(self):
245
182
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
186
"""Return a deep copy of self.
257
188
The copy can be modified without affecting the original weave."""
259
190
other._weave = self._weave[:]
270
201
return self._parents == other._parents \
271
202
and self._weave == other._weave \
272
and self._sha1s == other._sha1s
203
and self._sha1s == other._sha1s
274
206
def __ne__(self, other):
275
207
return not self.__eq__(other)
277
def _idx_to_name(self, version):
278
return self._names[version]
280
def _lookup(self, name):
209
def __contains__(self, name):
210
return self._name_map.has_key(name)
212
def maybe_lookup(self, name_or_index):
213
"""Convert possible symbolic name to index, or pass through indexes."""
214
if isinstance(name_or_index, (int, long)):
217
return self.lookup(name_or_index)
220
def lookup(self, name):
281
221
"""Convert symbolic version name to index."""
282
if not self._allow_reserved:
283
self.check_not_reserved_id(name)
285
223
return self._name_map[name]
287
raise RevisionNotPresent(name, self._weave_name)
225
raise WeaveRevisionNotPresent(name, self)
290
"""See VersionedFile.versions."""
291
228
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:
230
def iter_names(self):
231
"""Yield a list of all names in this weave."""
232
return iter(self._names)
234
def idx_to_name(self, version):
235
return self._names[version]
380
237
def _check_repeated_add(self, name, parents, text, sha1):
381
238
"""Check that a duplicated add is OK.
383
240
If it is, return the (old) index; otherwise raise an exception.
385
idx = self._lookup(name)
242
idx = self.lookup(name)
386
243
if sorted(self._parents[idx]) != sorted(parents) \
387
244
or sha1 != self._sha1s[idx]:
388
raise RevisionAlreadyPresent(name, self._weave_name)
245
raise WeaveRevisionAlreadyPresent(name, self)
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):
248
def add(self, name, parents, text, sha1=None):
399
249
"""Add a single text on top of the weave.
401
251
Returns the index number of the newly added version.
404
254
Symbolic name for this version.
405
255
(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
258
List or set of direct parent version numbers.
412
261
Sequence of lines to be added in the new version.
414
:param nostore_sha: See VersionedFile.add_lines.
263
sha -- SHA-1 of the file, if known. This is trusted to be
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)
266
from bzrlib.osutils import sha_strings
268
assert isinstance(name, basestring)
270
sha1 = sha_strings(text)
271
if name in self._name_map:
272
return self._check_repeated_add(name, parents, text, sha1)
274
parents = map(self.maybe_lookup, parents)
427
275
self._check_versions(parents)
428
## self._check_lines(lines)
276
## self._check_lines(text)
429
277
new_version = len(self._parents)
431
280
# if we abort after here the (in-memory) weave will be corrupt because only
432
281
# some fields are updated
433
282
# XXX: FIXME implement a succeed-or-fail of the rest of this routine.
434
283
# - Robert Collins 20060226
435
284
self._parents.append(parents[:])
436
285
self._sha1s.append(sha1)
437
self._names.append(version_id)
438
self._name_map[version_id] = new_version
286
self._names.append(name)
287
self._name_map[name] = new_version
442
291
# special case; adding with no parents revision; can do
443
292
# this more quickly by just appending unconditionally.
444
293
# even more specially, if we're adding an empty text we
445
294
# need do nothing at all.
447
296
self._weave.append(('{', new_version))
448
self._weave.extend(lines)
297
self._weave.extend(text)
449
298
self._weave.append(('}', None))
450
300
return new_version
452
302
if len(parents) == 1:
554
440
except IndexError:
555
441
raise IndexError("invalid version number %r" % i)
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.
444
def annotate(self, name_or_index):
445
return list(self.annotate_iter(name_or_index))
448
def annotate_iter(self, name_or_index):
449
"""Yield list of (index-id, line) pairs for the specified version.
568
451
The index indicates when the line originated in the weave."""
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."""
452
incls = [self.maybe_lookup(name_or_index)]
453
for origin, lineno, text in self._extract(incls):
460
(lineno, insert, deletes, text)
461
for each literal line.
592
467
lineno = 0 # line of weave, 0-based
594
469
for l in self._weave:
595
if l.__class__ == tuple:
470
if isinstance(l, tuple):
599
istack.append(self._names[v])
603
dset.add(self._names[v])
605
dset.remove(self._names[v])
607
483
raise WeaveFormatError('unexpected instruction %r' % v)
609
yield lineno, istack[-1], frozenset(dset), l
485
assert isinstance(l, basestring)
487
yield lineno, istack[-1], dset, l
748
def _maybe_lookup(self, name_or_index):
749
"""Convert possible symbolic name to index, or pass through indexes.
557
def get_iter(self, name_or_index):
558
"""Yield lines for the specified version."""
559
incls = [self.maybe_lookup(name_or_index)]
564
# We don't have sha1 sums for multiple entries
566
for origin, lineno, line in self._extract(incls):
571
expected_sha1 = self._sha1s[index]
572
measured_sha1 = cur_sha.hexdigest()
573
if measured_sha1 != expected_sha1:
574
raise errors.WeaveInvalidChecksum(
575
'file %s, revision %s, expected: %s, measured %s'
576
% (self._weave_name, self._names[index],
577
expected_sha1, measured_sha1))
580
def get_text(self, name_or_index):
581
return ''.join(self.get_iter(name_or_index))
582
assert isinstance(version, int)
585
def get_lines(self, name_or_index):
586
return list(self.get_iter(name_or_index))
592
def get_sha1(self, name):
593
"""Get the stored sha1 sum for the given revision.
595
:param name: The name of the version to lookup
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?"""
597
return self._sha1s[self.lookup(name)]
599
def mash_iter(self, included):
600
"""Return composed version of multiple included versions."""
601
included = map(self.maybe_lookup, included)
602
for origin, lineno, text in self._extract(included):
606
def dump(self, to_file):
607
from pprint import pprint
608
print >>to_file, "Weave._weave = ",
609
pprint(self._weave, to_file)
610
print >>to_file, "Weave._parents = ",
611
pprint(self._parents, to_file)
615
def numversions(self):
780
616
l = len(self._parents)
617
assert l == len(self._sha1s)
783
__len__ = num_versions
622
return self.numversions()
785
624
def check(self, progress_bar=None):
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()):
625
# check no circular inclusions
626
for version in range(self.numversions()):
790
627
inclusions = list(self._parents[version])
792
629
inclusions.sort()
823
654
update_text = 'checking %s' % (short_name,)
824
655
update_text = update_text[:25]
826
for lineno, insert, deleteset, line in self._walk_internal():
657
for lineno, insert, deleteset, line in self._walk():
828
659
progress_bar.update(update_text, lineno, nlines)
830
for name, name_inclusions in inclusions.items():
661
for j, j_inc in enumerate(inclusions):
831
662
# The active inclusion must be an ancestor,
832
663
# and no ancestors must have deleted this line,
833
664
# because we don't support resurrection.
834
if (insert in name_inclusions) and not (deleteset & name_inclusions):
835
sha1s[name].update(line)
665
if (insert in j_inc) and not (deleteset & j_inc):
666
sha1s[j].update(line)
838
version = self._idx_to_name(i)
668
for version in range(nv):
839
669
hd = sha1s[version].hexdigest()
840
expected = self._sha1s[i]
670
expected = self._sha1s[version]
841
671
if hd != expected:
842
672
raise errors.WeaveInvalidChecksum(
843
673
"mismatched sha1 for version %s: "
844
674
"got %s, expected %s"
845
% (version, hd, expected))
675
% (self._names[version], hd, expected))
847
677
# TODO: check insertions are properly nested, that there are
848
678
# no lines outside of insertion blocks, that deletions are
849
679
# properly paired, etc.
681
def _delta(self, included, lines):
682
"""Return changes from basis to new revision.
684
The old text for comparison is the union of included revisions.
686
This is used in inserting a new text.
688
Delta is returned as a sequence of
689
(weave1, weave2, newlines).
691
This indicates that weave1:weave2 of the old weave should be
692
replaced by the sequence of lines in newlines. Note that
693
these line numbers are positions in the total weave and don't
694
correspond to the lines in any extracted version, or even the
695
extracted union of included versions.
697
If line1=line2, this is a pure insert; if newlines=[] this is a
698
pure delete. (Similar to difflib.)
700
raise NotImplementedError()
703
def plan_merge(self, ver_a, ver_b):
704
"""Return pseudo-annotation indicating how the two versions merge.
706
This is computed between versions a and b and their common
709
Weave lines present in none of them are skipped entirely.
711
inc_a = self.inclusions([ver_a])
712
inc_b = self.inclusions([ver_b])
713
inc_c = inc_a & inc_b
715
for lineno, insert, deleteset, line in self._walk():
716
if deleteset & inc_c:
717
# killed in parent; can't be in either a or b
718
# not relevant to our work
719
yield 'killed-base', line
720
elif insert in inc_c:
721
# was inserted in base
722
killed_a = bool(deleteset & inc_a)
723
killed_b = bool(deleteset & inc_b)
724
if killed_a and killed_b:
725
yield 'killed-both', line
727
yield 'killed-a', line
729
yield 'killed-b', line
731
yield 'unchanged', line
732
elif insert in inc_a:
733
if deleteset & inc_a:
734
yield 'ghost-a', line
738
elif insert in inc_b:
739
if deleteset & inc_b:
740
yield 'ghost-b', line
744
# not in either revision
745
yield 'irrelevant', line
747
yield 'unchanged', '' # terminator
751
def weave_merge(self, plan, a_marker='<<<<<<< \n', b_marker='>>>>>>> \n'):
755
# TODO: Return a structured form of the conflicts (e.g. 2-tuples for
756
# conflicted regions), rather than just inserting the markers.
758
# TODO: Show some version information (e.g. author, date) on
759
# conflicted regions.
760
for state, line in plan:
761
if state == 'unchanged' or state == 'killed-both':
762
# resync and flush queued conflicts changes if any
763
if not lines_a and not lines_b:
765
elif ch_a and not ch_b:
767
for l in lines_a: yield l
768
elif ch_b and not ch_a:
769
for l in lines_b: yield l
770
elif lines_a == lines_b:
771
for l in lines_a: yield l
774
for l in lines_a: yield l
776
for l in lines_b: yield l
783
if state == 'unchanged':
786
elif state == 'killed-a':
789
elif state == 'killed-b':
792
elif state == 'new-a':
795
elif state == 'new-b':
799
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
804
def join(self, other, pb=None, msg=None):
806
"""Integrate versions from other into this weave.
808
The resulting weave contains all the history of both weaves;
809
any version you could retrieve from either self or other can be
810
retrieved from self after this call.
812
It is illegal for the two weaves to contain different values
813
or different parents for any version. See also reweave().
815
:param other: The other weave to pull into this one
816
:param pb: An optional progress bar
817
:param msg: An optional message to display for progress
819
if other.numversions() == 0:
820
return # nothing to update, easy
821
# two loops so that we do not change ourselves before verifying it
823
# work through in index order to make sure we get all dependencies
826
for other_idx, name in enumerate(other._names):
827
self._check_version_consistent(other, other_idx, name)
828
sha1 = other._sha1s[other_idx]
832
if name in self._name_map:
833
idx = self.lookup(name)
834
n1 = set(map(other.idx_to_name, other._parents[other_idx]))
835
n2 = set(map(self.idx_to_name, self._parents[idx]))
836
if sha1 == self._sha1s[idx] and n1 == n2:
839
names_to_join.append((other_idx, name))
846
for other_idx, name in names_to_join:
847
# TODO: If all the parents of the other version are already
848
# present then we can avoid some work by just taking the delta
849
# and adjusting the offsets.
850
new_parents = self._imported_parents(other, other_idx)
851
sha1 = other._sha1s[other_idx]
856
pb.update(msg, merged, len(names_to_join))
858
lines = other.get_lines(other_idx)
859
self.add(name, new_parents, lines, sha1)
861
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
862
merged, processed, self._weave_name, time.time( )-time0))
851
864
def _imported_parents(self, other, other_idx):
852
865
"""Return list of parents in self corresponding to indexes in other."""
854
867
for parent_idx in other._parents[other_idx]:
855
868
parent_name = other._names[parent_idx]
856
if parent_name not in self._name_map:
869
if parent_name not in self._names:
857
870
# should not be possible
858
raise WeaveError("missing parent {%s} of {%s} in %r"
871
raise WeaveError("missing parent {%s} of {%s} in %r"
859
872
% (parent_name, other._name_map[other_idx], self))
860
873
new_parents.append(self._name_map[parent_name])
861
874
return new_parents
891
def _reweave(self, other, pb, msg):
892
"""Reweave self with other - internal helper for join().
906
def reweave(self, other, pb=None, msg=None):
907
"""Reweave self with other.
894
909
:param other: The other weave to merge
895
910
:param pb: An optional progress bar, indicating how far done we are
896
911
: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."""
913
new_weave = reweave(self, other, pb=pb, msg=msg)
903
914
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
_read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
924
except errors.NoSuchFile:
930
def _add_lines(self, version_id, parents, lines, parent_texts,
931
left_matching_blocks, nostore_sha, random_id, check_content):
932
"""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,
940
def copy_to(self, name, transport):
941
"""See VersionedFile.copy_to()."""
942
# as we are all in memory always, just serialise to the new place.
944
write_weave_v5(self, sio)
946
transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
949
"""Save the weave."""
950
self._check_write_ok()
952
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)
964
"""See VersionedFile.get_suffixes()."""
965
return [WeaveFile.WEAVE_SUFFIX]
967
def insert_record_stream(self, stream):
968
super(WeaveFile, self).insert_record_stream(stream)
972
def _reweave(wa, wb, pb=None, msg=None):
915
setattr(self, attr, getattr(new_weave, attr))
918
def reweave(wa, wb, pb=None, msg=None):
973
919
"""Combine two weaves and return the result.
975
This works even if a revision R has different parents in
921
This works even if a revision R has different parents in
976
922
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
924
This is done by just building up a new weave, maintaining ordering
979
925
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
926
might be possible but it should only be necessary to do
927
this operation rarely, when a new previously ghost version is
984
930
:param pb: An optional progress bar, indicating how far done we are
1015
961
raise errors.WeaveTextDiffers(name, wa, wb)
1017
963
lines = wb.get_lines(name)
1018
wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
964
wr.add(name, combined_parents[name], lines)
1022
968
def _reweave_parent_graphs(wa, wb):
1023
969
"""Return combined parent ancestry for two weaves.
1025
971
Returned as a list of (version_name, set(parent_names))"""
1027
973
for weave in [wa, wb]:
1028
974
for idx, name in enumerate(weave._names):
1029
975
p = combined.setdefault(name, set())
1030
p.update(map(weave._idx_to_name, weave._parents[idx]))
976
p.update(map(weave.idx_to_name, weave._parents[idx]))
981
"""Show the weave's table-of-contents"""
982
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
983
for i in (6, 50, 10, 10):
986
for i in range(w.numversions()):
989
parent_str = ' '.join(map(str, w._parents[i]))
990
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
994
def weave_stats(weave_file, pb):
995
from bzrlib.weavefile import read_weave
997
wf = file(weave_file, 'rb')
999
# FIXME: doesn't work on pipes
1000
weave_size = wf.tell()
1004
for i in range(vers):
1005
pb.update('checking sizes', i, vers)
1006
for origin, lineno, line in w._extract([i]):
1011
print 'versions %9d' % vers
1012
print 'weave file %9d bytes' % weave_size
1013
print 'total contents %9d bytes' % total
1014
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
1017
print 'average size %9d bytes' % avg
1018
print 'relative size %9.2fx' % (float(weave_size) / float(avg))
1022
print """bzr weave tool
1024
Experimental tool for weave algorithm.
1027
weave init WEAVEFILE
1028
Create an empty weave file
1029
weave get WEAVEFILE VERSION
1030
Write out specified version.
1031
weave check WEAVEFILE
1032
Check consistency of all versions.
1034
Display table of contents.
1035
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
1036
Add NEWTEXT, with specified parent versions.
1037
weave annotate WEAVEFILE VERSION
1038
Display origin of each line.
1039
weave mash WEAVEFILE VERSION...
1040
Display composite of all selected versions.
1041
weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1042
Auto-merge two versions and display conflicts.
1043
weave diff WEAVEFILE VERSION1 VERSION2
1044
Show differences between two versions.
1048
% weave init foo.weave
1050
% weave add foo.weave ver0 < foo.txt
1053
(create updated version)
1055
% weave get foo.weave 0 | diff -u - foo.txt
1056
% weave add foo.weave ver1 0 < foo.txt
1059
% weave get foo.weave 0 > foo.txt (create forked version)
1061
% weave add foo.weave ver2 0 < foo.txt
1064
% weave merge foo.weave 1 2 > foo.txt (merge them)
1065
% vi foo.txt (resolve conflicts)
1066
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
1078
# in case we're run directly from the subdirectory
1079
sys.path.append('..')
1081
from bzrlib.weavefile import write_weave, read_weave
1082
from bzrlib.progress import ProgressBar
1097
return read_weave(file(argv[2], 'rb'))
1103
# at the moment, based on everything in the file
1105
parents = map(int, argv[4:])
1106
lines = sys.stdin.readlines()
1107
ver = w.add(name, parents, lines)
1108
write_weave(w, file(argv[2], 'wb'))
1109
print 'added version %r %d' % (name, ver)
1112
if os.path.exists(fn):
1113
raise IOError("file exists")
1115
write_weave(w, file(fn, 'wb'))
1116
elif cmd == 'get': # get one version
1118
sys.stdout.writelines(w.get_iter(int(argv[3])))
1120
elif cmd == 'mash': # get composite
1122
sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))
1125
from difflib import unified_diff
1128
v1, v2 = map(int, argv[3:5])
1131
diff_gen = unified_diff(lines1, lines2,
1132
'%s version %d' % (fn, v1),
1133
'%s version %d' % (fn, v2))
1134
sys.stdout.writelines(diff_gen)
1136
elif cmd == 'annotate':
1138
# newline is added to all lines regardless; too hard to get
1139
# reasonable formatting otherwise
1141
for origin, text in w.annotate(int(argv[3])):
1142
text = text.rstrip('\r\n')
1144
print ' | %s' % (text)
1146
print '%5d | %s' % (origin, text)
1152
elif cmd == 'stats':
1153
weave_stats(argv[2], ProgressBar())
1155
elif cmd == 'check':
1160
print '%d versions ok' % w.numversions()
1162
elif cmd == 'inclusions':
1164
print ' '.join(map(str, w.inclusions([int(argv[3])])))
1166
elif cmd == 'parents':
1168
print ' '.join(map(str, w._parents[int(argv[3])]))
1170
elif cmd == 'plan-merge':
1172
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1174
print '%14s | %s' % (state, line),
1176
elif cmd == 'merge':
1178
p = w.plan_merge(int(argv[3]), int(argv[4]))
1179
sys.stdout.writelines(w.weave_merge(p))
1181
elif cmd == 'mash-merge':
1187
v1, v2 = map(int, argv[3:5])
1189
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
1191
base_lines = list(w.mash_iter(basis))
1192
a_lines = list(w.get(v1))
1193
b_lines = list(w.get(v2))
1195
from bzrlib.merge3 import Merge3
1196
m3 = Merge3(base_lines, a_lines, b_lines)
1198
name_a = 'version %d' % v1
1199
name_b = 'version %d' % v2
1200
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
1202
raise ValueError('unknown command %r' % cmd)
1206
def profile_main(argv):
1207
import tempfile, hotshot, hotshot.stats
1209
prof_f = tempfile.NamedTemporaryFile()
1211
prof = hotshot.Profile(prof_f.name)
1213
ret = prof.runcall(main, argv)
1216
stats = hotshot.stats.load(prof_f.name)
1218
stats.sort_stats('cumulative')
1219
## XXX: Might like to write to stderr or the trace file instead but
1220
## print_stats seems hardcoded to stdout
1221
stats.print_stats(20)
1226
def lsprofile_main(argv):
1227
from bzrlib.lsprof import profile
1228
ret,stats = profile(main, argv)
1234
if __name__ == '__main__':
1236
if '--profile' in sys.argv:
1238
args.remove('--profile')
1239
sys.exit(profile_main(args))
1240
elif '--lsprof' in sys.argv:
1242
args.remove('--lsprof')
1243
sys.exit(lsprofile_main(args))
1245
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
