22
22
"""Weave - storage of related text file versions"""
24
# before intset (r923) 2000 versions in 41.5s
25
# with intset (r926) 2000 versions in 93s !!!
26
# better to just use plain sets.
28
# making _extract build and return a list, rather than being a generator
31
# with python -O, r923 does 2000 versions in 36.87s
33
# with optimizations to avoid mutating lists - 35.75! I guess copying
34
# all the elements every time costs more than the small manipulations.
35
# a surprisingly small change.
37
# r931, which avoids using a generator for extract, does 36.98s
39
# with memoized inclusions, takes 41.49s; not very good
41
# with slots, takes 37.35s; without takes 39.16, a bit surprising
43
# with the delta calculation mixed in with the add method, rather than
44
# separated, takes 36.78s
46
# with delta folded in and mutation of the list, 36.13s
48
# with all this and simplification of add code, 33s
54
# TODO: Perhaps have copy method for Weave instances?
56
25
# XXX: If we do weaves this way, will a merge still behave the same
57
26
# way if it's done in a different order? That's a pretty desirable
75
44
# TODO: Parallel-extract that passes back each line along with a
76
45
# description of which revisions include it. Nice for checking all
46
# shas or calculating stats in parallel.
79
48
# TODO: Using a single _extract routine and then processing the output
80
49
# is probably inefficient. It's simple enough that we can afford to
81
50
# have slight specializations for different ways its used: annotate,
82
51
# basis for add, get, etc.
84
# TODO: Perhaps the API should work only in names to hide the integer
85
# indexes from the user?
53
# TODO: Probably the API should work only in names to hide the integer
54
# indexes from the user.
56
# TODO: Is there any potential performance win by having an add()
57
# variant that is passed a pre-cooked version of the single basis
60
# TODO: Reweave can possibly be made faster by remembering diffs
61
# where the basis and destination are unchanged.
63
# FIXME: Sometimes we will be given a parents list for a revision
64
# that includes some redundant parents (i.e. already a parent of
65
# something in the list.) We should eliminate them. This can
66
# be done fairly efficiently because the sequence numbers constrain
67
# the possible relationships.
90
from cStringIO import StringIO
93
class WeaveError(Exception):
94
"""Exception in processing weave"""
97
class WeaveFormatError(WeaveError):
98
"""Weave invariant violated"""
71
from difflib import SequenceMatcher
73
from bzrlib.trace import mutter
74
from bzrlib.errors import WeaveError, WeaveFormatError, WeaveParentMismatch, \
75
WeaveRevisionNotPresent, WeaveRevisionAlreadyPresent
76
from bzrlib.tsort import topo_sort
101
79
class Weave(object):
102
80
"""weave - versioned text file storage.
210
201
def __ne__(self, other):
211
202
return not self.__eq__(other)
204
def __contains__(self, name):
205
return self._name_map.has_key(name)
207
def maybe_lookup(self, name_or_index):
208
"""Convert possible symbolic name to index, or pass through indexes."""
209
if isinstance(name_or_index, (int, long)):
212
return self.lookup(name_or_index)
214
215
def lookup(self, name):
216
"""Convert symbolic version name to index."""
216
218
return self._name_map[name]
218
raise WeaveError("name %s not present in weave %s" %
219
(name, self._weave_name))
220
raise WeaveRevisionNotPresent(name, self)
223
return self._names[:]
225
def iter_names(self):
226
"""Yield a list of all names in this weave."""
227
return iter(self._names)
229
def idx_to_name(self, version):
230
return self._names[version]
232
def _check_repeated_add(self, name, parents, text, sha1):
233
"""Check that a duplicated add is OK.
235
If it is, return the (old) index; otherwise raise an exception.
237
idx = self.lookup(name)
238
if sorted(self._parents[idx]) != sorted(parents) \
239
or sha1 != self._sha1s[idx]:
240
raise WeaveRevisionAlreadyPresent(name, self)
222
def add(self, name, parents, text):
243
def add(self, name, parents, text, sha1=None):
223
244
"""Add a single text on top of the weave.
225
246
Returns the index number of the newly added version.
232
253
List or set of direct parent version numbers.
235
Sequence of lines to be added in the new version."""
256
Sequence of lines to be added in the new version.
258
sha -- SHA-1 of the file, if known. This is trusted to be
261
from bzrlib.osutils import sha_strings
237
263
assert isinstance(name, basestring)
265
sha1 = sha_strings(text)
238
266
if name in self._name_map:
239
raise WeaveError("name %r already present in weave" % name)
267
return self._check_repeated_add(name, parents, text, sha1)
269
parents = map(self.maybe_lookup, parents)
241
270
self._check_versions(parents)
242
271
## self._check_lines(text)
243
272
new_version = len(self._parents)
250
275
# if we abort after here the (in-memory) weave will be corrupt because only
251
276
# some fields are updated
342
366
return new_version
368
def add_identical(self, old_rev_id, new_rev_id, parents):
369
"""Add an identical text to old_rev_id as new_rev_id."""
370
old_lines = self.get(self.lookup(old_rev_id))
371
self.add(new_rev_id, parents, old_lines)
345
373
def inclusions(self, versions):
346
374
"""Return set of all ancestors of given version(s)."""
347
375
i = set(versions)
352
# include all its parents
353
i.update(self._parents[v])
357
raise ValueError("version %d not present in weave" % v)
376
for v in xrange(max(versions), 0, -1):
378
# include all its parents
379
i.update(self._parents[v])
381
## except IndexError:
382
## raise ValueError("version %d not present in weave" % v)
385
def parents(self, version):
386
return self._parents[version]
389
def parent_names(self, version):
390
"""Return version names for parents of a version."""
391
return map(self.idx_to_name, self._parents[self.lookup(version)])
360
394
def minimal_parents(self, version):
400
434
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):
437
def annotate(self, name_or_index):
438
return list(self.annotate_iter(name_or_index))
441
def annotate_iter(self, name_or_index):
408
442
"""Yield list of (index-id, line) pairs for the specified version.
410
444
The index indicates when the line originated in the weave."""
411
for origin, lineno, text in self._extract([version]):
445
incls = [self.maybe_lookup(name_or_index)]
446
for origin, lineno, text in self._extract(incls):
412
447
yield origin, text
416
450
"""Walk the weave.
501
534
result.append((istack[-1], lineno, l))
505
raise WFE("unclosed insertion blocks at end of weave",
537
raise WeaveFormatError("unclosed insertion blocks "
538
"at end of weave: %s" % istack)
508
raise WFE("unclosed deletion blocks at end of weave",
540
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
515
def get_iter(self, version):
545
def get_iter(self, name_or_index):
516
546
"""Yield lines for the specified version."""
517
for origin, lineno, line in self._extract([version]):
547
incls = [self.maybe_lookup(name_or_index)]
548
for origin, lineno, line in self._extract(incls):
521
def get_text(self, version):
552
def get_text(self, name_or_index):
553
return ''.join(self.get_iter(name_or_index))
522
554
assert isinstance(version, int)
524
s.writelines(self.get_iter(version))
528
def get(self, index):
529
return list(self.get_iter(index))
557
def get_lines(self, name_or_index):
558
return list(self.get_iter(name_or_index))
532
564
def mash_iter(self, included):
533
565
"""Return composed version of multiple included versions."""
566
included = map(self.maybe_lookup, included)
534
567
for origin, lineno, text in self._extract(included):
757
def join(self, other):
758
"""Integrate versions from other into this weave.
760
The resulting weave contains all the history of both weaves;
761
any version you could retrieve from either self or other can be
762
retrieved from self after this call.
764
It is illegal for the two weaves to contain different values
765
or different parents for any version. See also reweave().
767
if other.numversions() == 0:
768
return # nothing to update, easy
769
# two loops so that we do not change ourselves before verifying it
771
# work through in index order to make sure we get all dependencies
772
for other_idx, name in enumerate(other._names):
773
if self._check_version_consistent(other, other_idx, name):
775
for other_idx, name in enumerate(other._names):
776
# TODO: If all the parents of the other version are already
777
# present then we can avoid some work by just taking the delta
778
# and adjusting the offsets.
779
new_parents = self._imported_parents(other, other_idx)
780
lines = other.get_lines(other_idx)
781
sha1 = other._sha1s[other_idx]
782
self.add(name, new_parents, lines, sha1)
785
def _imported_parents(self, other, other_idx):
786
"""Return list of parents in self corresponding to indexes in other."""
788
for parent_idx in other._parents[other_idx]:
789
parent_name = other._names[parent_idx]
790
if parent_name not in self._names:
791
# should not be possible
792
raise WeaveError("missing parent {%s} of {%s} in %r"
793
% (parent_name, other._name_map[other_idx], self))
794
new_parents.append(self._name_map[parent_name])
797
def _check_version_consistent(self, other, other_idx, name):
798
"""Check if a version in consistent in this and other.
800
To be consistent it must have:
803
* the same direct parents (by name, not index, and disregarding
806
If present & correct return True;
807
if not present in self return False;
808
if inconsistent raise error."""
809
this_idx = self._name_map.get(name, -1)
811
if self._sha1s[this_idx] != other._sha1s[other_idx]:
812
raise WeaveError("inconsistent texts for version {%s} "
813
"when joining weaves"
815
self_parents = self._parents[this_idx]
816
other_parents = other._parents[other_idx]
817
n1 = [self._names[i] for i in self_parents]
818
n2 = [other._names[i] for i in other_parents]
822
raise WeaveParentMismatch("inconsistent parents "
823
"for version {%s}: %s vs %s" % (name, n1, n2))
829
def reweave(self, other):
830
"""Reweave self with other."""
831
new_weave = reweave(self, other)
832
for attr in self.__slots__:
833
setattr(self, attr, getattr(new_weave, attr))
837
"""Combine two weaves and return the result.
839
This works even if a revision R has different parents in
840
wa and wb. In the resulting weave all the parents are given.
842
This is done by just building up a new weave, maintaining ordering
843
of the versions in the two inputs. More efficient approaches
844
might be possible but it should only be necessary to do
845
this operation rarely, when a new previously ghost version is
850
queue_a = range(wa.numversions())
851
queue_b = range(wb.numversions())
852
# first determine combined parents of all versions
853
# map from version name -> all parent names
854
combined_parents = _reweave_parent_graphs(wa, wb)
855
mutter("combined parents: %r", combined_parents)
856
order = topo_sort(combined_parents.iteritems())
857
mutter("order to reweave: %r", order)
859
if name in wa._name_map:
860
lines = wa.get_lines(name)
861
if name in wb._name_map:
862
assert lines == wb.get_lines(name)
864
lines = wb.get_lines(name)
865
wr.add(name, combined_parents[name], lines)
869
def _reweave_parent_graphs(wa, wb):
870
"""Return combined parent ancestry for two weaves.
872
Returned as a list of (version_name, set(parent_names))"""
874
for weave in [wa, wb]:
875
for idx, name in enumerate(weave._names):
876
p = combined.setdefault(name, set())
877
p.update(map(weave.idx_to_name, weave._parents[idx]))
730
881
def weave_toc(w):
added
removed
bzrlib/weave.py
