46
46
# with delta folded in and mutation of the list, 36.13s
48
# with all this and simplification of add code, 33s
48
# with all this and simplification of add code, 33s
54
51
# TODO: Perhaps have copy method for Weave instances?
62
59
# binaries, perhaps by naively splitting on \n or perhaps using
63
60
# something like a rolling checksum.
62
# TODO: Track version names as well as indexes.
65
64
# TODO: End marker for each version so we can stop reading?
67
66
# TODO: Check that no insertion occurs inside a deletion that was
76
75
# description of which revisions include it. Nice for checking all
77
76
# shas in parallel.
79
# TODO: Using a single _extract routine and then processing the output
80
# is probably inefficient. It's simple enough that we can afford to
81
# have slight specializations for different ways its used: annotate,
82
# basis for add, get, etc.
84
# TODO: Perhaps the API should work only in names to hide the integer
85
# indexes from the user?
130
118
The instruction can be '{' or '}' for an insertion block, and '['
131
119
and ']' for a deletion block respectively. The version is the
132
120
integer version index. There is no replace operator, only deletes
133
and inserts. For '}', the end of an insertion, there is no
134
version parameter because it always closes the most recently
137
123
Constraints/notes:
174
160
each version; the parent's parents are implied.
177
List of hex SHA-1 of each version.
180
List of symbolic names for each version. Each should be unique.
183
For each name, the version number.
163
List of hex SHA-1 of each version, or None if not recorded.
186
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map']
166
__slots__ = ['_weave', '_parents', '_sha1s']
188
168
def __init__(self):
190
170
self._parents = []
196
174
def __eq__(self, other):
197
175
if not isinstance(other, Weave):
199
177
return self._parents == other._parents \
200
and self._weave == other._weave \
201
and self._sha1s == other._sha1s
178
and self._weave == other._weave
204
181
def __ne__(self, other):
205
182
return not self.__eq__(other)
208
def lookup(self, name):
210
return self._name_map[name]
212
raise WeaveError("name %s not present in weave" % name)
215
def add(self, name, parents, text):
185
def add(self, parents, text):
216
186
"""Add a single text on top of the weave.
218
188
Returns the index number of the newly added version.
221
Symbolic name for this version.
222
(Typically the revision-id of the revision that added it.)
225
191
List or set of direct parent version numbers.
228
194
Sequence of lines to be added in the new version."""
230
assert isinstance(name, basestring)
231
if name in self._name_map:
232
raise WeaveError("name %r already present in weave" % name)
234
196
self._check_versions(parents)
235
197
## self._check_lines(text)
236
198
new_version = len(self._parents)
239
202
map(s.update, text)
240
203
sha1 = s.hexdigest()
243
# if we abort after here the (in-memory) weave will be corrupt because only
244
# some fields are updated
245
self._parents.append(parents[:])
206
# if we abort after here the weave will be corrupt
207
self._parents.append(frozenset(parents))
246
208
self._sha1s.append(sha1)
247
self._names.append(name)
248
self._name_map[name] = new_version
713
"""Show the weave's table-of-contents"""
714
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
715
for i in (6, 50, 10, 10):
675
"""Show some text information about the weave."""
676
print '%6s %40s %20s' % ('ver', 'sha1', 'parents')
677
for i in (6, 40, 20):
718
680
for i in range(w.numversions()):
719
681
sha1 = w._sha1s[i]
721
parent_str = ' '.join(map(str, w._parents[i]))
722
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
682
print '%6d %40s %s' % (i, sha1, ' '.join(map(str, w._parents[i])))
765
725
Write out specified version.
766
726
weave check WEAVEFILE
767
727
Check consistency of all versions.
769
729
Display table of contents.
770
weave add WEAVEFILE NAME [BASE...] < NEWTEXT
730
weave add WEAVEFILE [BASE...] < NEWTEXT
771
731
Add NEWTEXT, with specified parent versions.
772
732
weave annotate WEAVEFILE VERSION
773
733
Display origin of each line.
781
741
% weave init foo.weave
783
% weave add foo.weave ver0 < foo.txt
743
% weave add foo.weave < foo.txt
786
746
(create updated version)
788
748
% weave get foo.weave 0 | diff -u - foo.txt
789
% weave add foo.weave ver1 0 < foo.txt
749
% weave add foo.weave 0 < foo.txt
792
752
% weave get foo.weave 0 > foo.txt (create forked version)
794
% weave add foo.weave ver2 0 < foo.txt
754
% weave add foo.weave 0 < foo.txt
797
757
% weave merge foo.weave 1 2 > foo.txt (merge them)
798
758
% vi foo.txt (resolve conflicts)
799
% weave add foo.weave merged 1 2 < foo.txt (commit merged version)
759
% weave add foo.weave 1 2 < foo.txt (commit merged version)
828
781
elif cmd == 'add':
830
783
# at the moment, based on everything in the file
832
parents = map(int, argv[4:])
784
parents = map(int, argv[3:])
833
785
lines = sys.stdin.readlines()
834
ver = w.add(name, parents, lines)
786
ver = w.add(parents, lines)
835
787
write_weave(w, file(argv[2], 'wb'))
836
print 'added version %r %d' % (name, ver)
788
print 'added version %d' % ver
837
789
elif cmd == 'init':
839
791
if os.path.exists(fn):
917
869
raise ValueError('unknown command %r' % cmd)
921
def profile_main(argv):
922
import tempfile, hotshot, hotshot.stats
924
prof_f = tempfile.NamedTemporaryFile()
926
prof = hotshot.Profile(prof_f.name)
928
ret = prof.runcall(main, argv)
931
stats = hotshot.stats.load(prof_f.name)
933
stats.sort_stats('cumulative')
934
## XXX: Might like to write to stderr or the trace file instead but
935
## print_stats seems hardcoded to stdout
936
stats.print_stats(20)
941
872
if __name__ == '__main__':
943
if '--profile' in sys.argv:
945
args.remove('--profile')
946
sys.exit(profile_main(args))
948
sys.exit(main(sys.argv))
874
sys.exit(main(sys.argv))
added
removed
bzrlib/weave.py
