/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.1.1 by Martin Pool
Check in old existing knit code.
1
#! /usr/bin/python
2
3
# Copyright (C) 2005 Canonical Ltd
4
0.1.33 by Martin Pool
add gpl text
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
0.1.1 by Martin Pool
Check in old existing knit code.
18
19
# Author: Martin Pool <mbp@canonical.com>
20
21
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
22
"""Weave - storage of related text file versions"""
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
23
938 by Martin Pool
- various optimizations to weave add code
24
0.1.58 by Martin Pool
doc
25
# XXX: If we do weaves this way, will a merge still behave the same
26
# way if it's done in a different order?  That's a pretty desirable
27
# property.
28
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
29
# TODO: Nothing here so far assumes the lines are really \n newlines,
30
# rather than being split up in some other way.  We could accomodate
31
# binaries, perhaps by naively splitting on \n or perhaps using
32
# something like a rolling checksum.
33
0.1.85 by Martin Pool
doc
34
# TODO: End marker for each version so we can stop reading?
0.1.69 by Martin Pool
Simple text-based format for storing weaves, cleaner than
35
36
# TODO: Check that no insertion occurs inside a deletion that was
37
# active in the version of the insertion.
38
912 by Martin Pool
- update todos for weave
39
# TODO: In addition to the SHA-1 check, perhaps have some code that
40
# checks structural constraints of the weave: ie that insertions are
41
# properly nested, that there is no text outside of an insertion, that
42
# insertions or deletions are not repeated, etc.
0.1.85 by Martin Pool
doc
43
918 by Martin Pool
- start doing new weave-merge algorithm
44
# TODO: Parallel-extract that passes back each line along with a
45
# description of which revisions include it.  Nice for checking all
1393.1.25 by Martin Pool
- comments in weave code
46
# shas or calculating stats in parallel.
918 by Martin Pool
- start doing new weave-merge algorithm
47
1082 by Martin Pool
- lift imports
48
# TODO: Using a single _extract routine and then processing the output
49
# is probably inefficient.  It's simple enough that we can afford to
50
# have slight specializations for different ways its used: annotate,
51
# basis for add, get, etc.
52
1185.16.13 by Martin Pool
todo
53
# TODO: Probably the API should work only in names to hide the integer
54
# indexes from the user.
1083 by Martin Pool
- add space to store revision-id in weave files
55
1328 by Martin Pool
- slight refactoring of weave code
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
58
# version?
59
1185.16.13 by Martin Pool
todo
60
# TODO: Reweave can possibly be made faster by remembering diffs
61
# where the basis and destination are unchanged.
62
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.
1083 by Martin Pool
- add space to store revision-id in weave files
68
1082 by Martin Pool
- lift imports
69
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
70
from cStringIO import StringIO
71
from difflib import SequenceMatcher
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
72
import os
1082 by Martin Pool
- lift imports
73
import sha
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
74
import time
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
75
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
76
from bzrlib.trace import mutter
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
77
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
78
        RevisionAlreadyPresent,
79
        RevisionNotPresent,
80
        WeaveRevisionAlreadyPresent,
81
        WeaveRevisionNotPresent,
82
        )
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
83
import bzrlib.errors as errors
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
84
from bzrlib.osutils import sha_strings
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
85
from bzrlib.symbol_versioning import *
1185.16.117 by mbp at sourcefrog
Reweave in topological-sort order.
86
from bzrlib.tsort import topo_sort
1563.2.13 by Robert Collins
InterVersionedFile implemented.
87
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
88
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
89
90
91
class Weave(VersionedFile):
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
92
    """weave - versioned text file storage.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
93
    
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
94
    A Weave manages versions of line-based text files, keeping track
95
    of the originating version for each line.
96
97
    To clients the "lines" of the file are represented as a list of strings.
98
    These strings  will typically have terminal newline characters, but
99
    this is not required.  In particular files commonly do not have a newline
100
    at the end of the file.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
101
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
102
    Texts can be identified in either of two ways:
103
104
    * a nonnegative index number.
105
1324 by Martin Pool
- doc
106
    * a version-id string.
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
107
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
108
    Typically the index number will be valid only inside this weave and
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
109
    the version-id is used to reference it in the larger world.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
110
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
111
    The weave is represented as a list mixing edit instructions and
944 by Martin Pool
- refactor member names in Weave code
112
    literal text.  Each entry in _weave can be either a string (or
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
113
    unicode), or a tuple.  If a string, it means that the given line
114
    should be output in the currently active revisions.
115
116
    If a tuple, it gives a processing instruction saying in which
117
    revisions the enclosed lines are active.  The tuple has the form
118
    (instruction, version).
119
120
    The instruction can be '{' or '}' for an insertion block, and '['
121
    and ']' for a deletion block respectively.  The version is the
0.1.45 by Martin Pool
doc
122
    integer version index.  There is no replace operator, only deletes
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
123
    and inserts.  For '}', the end of an insertion, there is no
124
    version parameter because it always closes the most recently
125
    opened insertion.
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
126
0.1.41 by Martin Pool
Doc
127
    Constraints/notes:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
128
129
    * A later version can delete lines that were introduced by any
130
      number of ancestor versions; this implies that deletion
131
      instructions can span insertion blocks without regard to the
132
      insertion block's nesting.
133
0.1.41 by Martin Pool
Doc
134
    * Similarly, deletions need not be properly nested with regard to
135
      each other, because they might have been generated by
136
      independent revisions.
137
0.1.45 by Martin Pool
doc
138
    * Insertions are always made by inserting a new bracketed block
139
      into a single point in the previous weave.  This implies they
140
      can nest but not overlap, and the nesting must always have later
141
      insertions on the inside.
142
0.1.41 by Martin Pool
Doc
143
    * It doesn't seem very useful to have an active insertion
144
      inside an inactive insertion, but it might happen.
0.1.45 by Martin Pool
doc
145
      
0.1.41 by Martin Pool
Doc
146
    * Therefore, all instructions are always"considered"; that
147
      is passed onto and off the stack.  An outer inactive block
148
      doesn't disable an inner block.
149
150
    * Lines are enabled if the most recent enclosing insertion is
151
      active and none of the enclosing deletions are active.
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
152
0.1.49 by Martin Pool
Add another constraint: revisions should not delete text that they
153
    * There is no point having a deletion directly inside its own
154
      insertion; you might as well just not write it.  And there
155
      should be no way to get an earlier version deleting a later
156
      version.
157
944 by Martin Pool
- refactor member names in Weave code
158
    _weave
159
        Text of the weave; list of control instruction tuples and strings.
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
160
944 by Martin Pool
- refactor member names in Weave code
161
    _parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
162
        List of parents, indexed by version number.
163
        It is only necessary to store the minimal set of parents for
164
        each version; the parent's parents are implied.
0.1.13 by Martin Pool
Knit structure now allows for versions to include the lines present in other
165
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
166
    _sha1s
1083 by Martin Pool
- add space to store revision-id in weave files
167
        List of hex SHA-1 of each version.
168
169
    _names
170
        List of symbolic names for each version.  Each should be unique.
171
172
    _name_map
173
        For each name, the version number.
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
174
175
    _weave_name
176
        Descriptive name of this weave; typically the filename if known.
177
        Set by read_weave.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
178
    """
938 by Martin Pool
- various optimizations to weave add code
179
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
180
    __slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
181
                 '_weave_name']
938 by Martin Pool
- various optimizations to weave add code
182
    
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
183
    def __init__(self, weave_name=None):
944 by Martin Pool
- refactor member names in Weave code
184
        self._weave = []
185
        self._parents = []
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
186
        self._sha1s = []
1083 by Martin Pool
- add space to store revision-id in weave files
187
        self._names = []
188
        self._name_map = {}
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
189
        self._weave_name = weave_name
0.1.60 by Martin Pool
Weave eq and ne methods
190
1185.35.41 by Aaron Bentley
Added repr for Weave
191
    def __repr__(self):
192
        return "Weave(%r)" % self._weave_name
193
1393.1.51 by Martin Pool
- new Weave.copy()
194
    def copy(self):
195
        """Return a deep copy of self.
196
        
197
        The copy can be modified without affecting the original weave."""
198
        other = Weave()
199
        other._weave = self._weave[:]
200
        other._parents = self._parents[:]
201
        other._sha1s = self._sha1s[:]
202
        other._names = self._names[:]
203
        other._name_map = self._name_map.copy()
204
        other._weave_name = self._weave_name
205
        return other
206
0.1.60 by Martin Pool
Weave eq and ne methods
207
    def __eq__(self, other):
208
        if not isinstance(other, Weave):
209
            return False
944 by Martin Pool
- refactor member names in Weave code
210
        return self._parents == other._parents \
1083 by Martin Pool
- add space to store revision-id in weave files
211
               and self._weave == other._weave \
212
               and self._sha1s == other._sha1s 
0.1.60 by Martin Pool
Weave eq and ne methods
213
    
214
    def __ne__(self, other):
215
        return not self.__eq__(other)
216
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
217
    @deprecated_method(zero_eight)
218
    def idx_to_name(self, index):
219
        """Old public interface, the public interface is all names now."""
220
        return index
221
222
    def _idx_to_name(self, version):
223
        return self._names[version]
224
225
    @deprecated_method(zero_eight)
1083 by Martin Pool
- add space to store revision-id in weave files
226
    def lookup(self, name):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
227
        """Backwards compatability thunk:
228
229
        Return name, as name is valid in the api now, and spew deprecation
230
        warnings everywhere.
231
        """
232
        return name
233
234
    def _lookup(self, name):
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
235
        """Convert symbolic version name to index."""
1083 by Martin Pool
- add space to store revision-id in weave files
236
        try:
237
            return self._name_map[name]
238
        except KeyError:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
239
            raise RevisionNotPresent(name, self._weave_name)
240
241
    @deprecated_method(zero_eight)
242
    def iter_names(self):
243
        """Deprecated convenience function, please see VersionedFile.names()."""
244
        return iter(self.names())
245
246
    @deprecated_method(zero_eight)
1185.16.104 by mbp at sourcefrog
Add Weave.names()
247
    def names(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
248
        """See Weave.versions for the current api."""
249
        return self.versions()
250
251
    def versions(self):
252
        """See VersionedFile.versions."""
1185.16.105 by mbp at sourcefrog
- fix Weave.names()
253
        return self._names[:]
1229 by Martin Pool
- new Weave.idx_to_name and .parents methods
254
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
255
    def has_version(self, version_id):
256
        """See VersionedFile.has_version."""
257
        return self._name_map.has_key(version_id)
258
259
    __contains__ = has_version
260
261
    def get_parents(self, version_id):
262
        """See VersionedFile.get_parent."""
263
        return map(self._idx_to_name, self._parents[self._lookup(version_id)])
1229 by Martin Pool
- new Weave.idx_to_name and .parents methods
264
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
265
    def _check_repeated_add(self, name, parents, text, sha1):
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
266
        """Check that a duplicated add is OK.
267
268
        If it is, return the (old) index; otherwise raise an exception.
269
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
270
        idx = self._lookup(name)
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
271
        if sorted(self._parents[idx]) != sorted(parents) \
272
            or sha1 != self._sha1s[idx]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
273
            raise RevisionAlreadyPresent(name, self._weave_name)
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
274
        return idx
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
275
276
    @deprecated_method(zero_eight)
277
    def add_identical(self, old_rev_id, new_rev_id, parents):
278
        """Please use Weave.clone_text now."""
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
279
        return self.clone_text(new_rev_id, old_rev_id, parents)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
280
281
    def add_lines(self, version_id, parents, lines):
282
        """See VersionedFile.add_lines."""
283
        return self._add(version_id, lines, map(self._lookup, parents))
284
285
    @deprecated_method(zero_eight)
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
286
    def add(self, name, parents, text, sha1=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
287
        """See VersionedFile.add_lines for the non deprecated api."""
288
        return self._add(name, text, map(self._maybe_lookup, parents), sha1)
289
290
    def _add(self, version_id, lines, parents, sha1=None):
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
291
        """Add a single text on top of the weave.
0.1.36 by Martin Pool
doc
292
  
0.1.26 by Martin Pool
Refactor parameters to add command
293
        Returns the index number of the newly added version.
294
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
295
        version_id
1083 by Martin Pool
- add space to store revision-id in weave files
296
            Symbolic name for this version.
297
            (Typically the revision-id of the revision that added it.)
298
0.1.26 by Martin Pool
Refactor parameters to add command
299
        parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
300
            List or set of direct parent version numbers.
301
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
302
        lines
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
303
            Sequence of lines to be added in the new version.
304
        """
938 by Martin Pool
- various optimizations to weave add code
305
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
306
        assert isinstance(version_id, basestring)
307
        if not sha1:
308
            sha1 = sha_strings(lines)
309
        if version_id in self._name_map:
310
            return self._check_repeated_add(version_id, parents, lines, sha1)
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
311
938 by Martin Pool
- various optimizations to weave add code
312
        self._check_versions(parents)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
313
        ## self._check_lines(lines)
944 by Martin Pool
- refactor member names in Weave code
314
        new_version = len(self._parents)
0.1.5 by Martin Pool
Add test for storing two text versions.
315
1083 by Martin Pool
- add space to store revision-id in weave files
316
        # if we abort after here the (in-memory) weave will be corrupt because only
317
        # some fields are updated
1570.1.12 by Robert Collins
Add a FIXME for weave.add and remove some extraneous whitespace.
318
        # XXX: FIXME implement a succeed-or-fail of the rest of this routine.
319
        #      - Robert Collins 20060226
1083 by Martin Pool
- add space to store revision-id in weave files
320
        self._parents.append(parents[:])
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
321
        self._sha1s.append(sha1)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
322
        self._names.append(version_id)
323
        self._name_map[version_id] = new_version
938 by Martin Pool
- various optimizations to weave add code
324
325
            
326
        if not parents:
327
            # special case; adding with no parents revision; can do
328
            # this more quickly by just appending unconditionally.
329
            # even more specially, if we're adding an empty text we
330
            # need do nothing at all.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
331
            if lines:
944 by Martin Pool
- refactor member names in Weave code
332
                self._weave.append(('{', new_version))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
333
                self._weave.extend(lines)
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
334
                self._weave.append(('}', None))
938 by Martin Pool
- various optimizations to weave add code
335
            return new_version
336
941 by Martin Pool
- allow for parents specified to Weave.add to be a set
337
        if len(parents) == 1:
338
            pv = list(parents)[0]
339
            if sha1 == self._sha1s[pv]:
340
                # special case: same as the single parent
341
                return new_version
938 by Martin Pool
- various optimizations to weave add code
342
            
343
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
344
        ancestors = self._inclusions(parents)
938 by Martin Pool
- various optimizations to weave add code
345
944 by Martin Pool
- refactor member names in Weave code
346
        l = self._weave
938 by Martin Pool
- various optimizations to weave add code
347
348
        # basis a list of (origin, lineno, line)
349
        basis_lineno = []
350
        basis_lines = []
351
        for origin, lineno, line in self._extract(ancestors):
352
            basis_lineno.append(lineno)
353
            basis_lines.append(line)
354
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
355
        # another small special case: a merge, producing the same text
356
        # as auto-merge
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
357
        if lines == basis_lines:
938 by Martin Pool
- various optimizations to weave add code
358
            return new_version            
359
360
        # add a sentinal, because we can also match against the final line
944 by Martin Pool
- refactor member names in Weave code
361
        basis_lineno.append(len(self._weave))
938 by Martin Pool
- various optimizations to weave add code
362
363
        # XXX: which line of the weave should we really consider
364
        # matches the end of the file?  the current code says it's the
365
        # last line of the weave?
366
367
        #print 'basis_lines:', basis_lines
368
        #print 'new_lines:  ', lines
369
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
370
        s = SequenceMatcher(None, basis_lines, lines)
938 by Martin Pool
- various optimizations to weave add code
371
372
        # offset gives the number of lines that have been inserted
373
        # into the weave up to the current point; if the original edit instruction
374
        # says to change line A then we actually change (A+offset)
375
        offset = 0
376
377
        for tag, i1, i2, j1, j2 in s.get_opcodes():
378
            # i1,i2 are given in offsets within basis_lines; we need to map them
379
            # back to offsets within the entire weave
380
            #print 'raw match', tag, i1, i2, j1, j2
381
            if tag == 'equal':
382
                continue
383
384
            i1 = basis_lineno[i1]
385
            i2 = basis_lineno[i2]
386
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
387
            assert 0 <= j1 <= j2 <= len(lines)
938 by Martin Pool
- various optimizations to weave add code
388
389
            #print tag, i1, i2, j1, j2
390
391
            # the deletion and insertion are handled separately.
392
            # first delete the region.
393
            if i1 != i2:
944 by Martin Pool
- refactor member names in Weave code
394
                self._weave.insert(i1+offset, ('[', new_version))
395
                self._weave.insert(i2+offset+1, (']', new_version))
938 by Martin Pool
- various optimizations to weave add code
396
                offset += 2
397
398
            if j1 != j2:
399
                # there may have been a deletion spanning up to
400
                # i2; we want to insert after this region to make sure
401
                # we don't destroy ourselves
402
                i = i2 + offset
944 by Martin Pool
- refactor member names in Weave code
403
                self._weave[i:i] = ([('{', new_version)] 
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
404
                                    + lines[j1:j2] 
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
405
                                    + [('}', None)])
938 by Martin Pool
- various optimizations to weave add code
406
                offset += 2 + (j2 - j1)
407
        return new_version
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
408
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
409
    def clone_text(self, new_version_id, old_version_id, parents):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
410
        """See VersionedFile.clone_text."""
411
        old_lines = self.get_text(old_version_id)
412
        self.add_lines(new_version_id, parents, old_lines)
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
413
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
414
    def _inclusions(self, versions):
893 by Martin Pool
- Refactor weave calculation of inclusions
415
        """Return set of all ancestors of given version(s)."""
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
416
        if not len(versions):
417
            return []
928 by Martin Pool
- go back to using plain builtin set()
418
        i = set(versions)
1328 by Martin Pool
- slight refactoring of weave code
419
        for v in xrange(max(versions), 0, -1):
420
            if v in i:
421
                # include all its parents
422
                i.update(self._parents[v])
423
        return i
424
        ## except IndexError:
425
        ##     raise ValueError("version %d not present in weave" % v)
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
426
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
427
    @deprecated_method(zero_eight)
428
    def inclusions(self, version_ids):
429
        """Deprecated - see VersionedFile.get_ancestry for the replacement."""
430
        if not version_ids:
890 by Martin Pool
- weave info should show minimal expression of parents
431
            return []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
432
        if isinstance(version_ids[0], int):
433
            return [self._idx_to_name(v) for v in self._inclusions(version_ids)]
434
        else:
435
            return self.get_ancestry(version_ids)
436
437
    def get_ancestry(self, version_ids):
438
        """See VersionedFile.get_ancestry."""
439
        if isinstance(version_ids, basestring):
440
            version_ids = [version_ids]
441
        i = self._inclusions([self._lookup(v) for v in version_ids])
442
        return [self._idx_to_name(v) for v in i]
0.1.75 by Martin Pool
Remove VerInfo class; just store sets directly in the list of
443
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
444
    def _check_lines(self, text):
445
        if not isinstance(text, list):
446
            raise ValueError("text should be a list, not %s" % type(text))
447
448
        for l in text:
449
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
450
                raise ValueError("text line should be a string or unicode, not %s"
451
                                 % type(l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
452
        
453
454
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
455
    def _check_versions(self, indexes):
456
        """Check everything in the sequence of indexes is valid"""
457
        for i in indexes:
458
            try:
944 by Martin Pool
- refactor member names in Weave code
459
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
460
            except IndexError:
461
                raise IndexError("invalid version number %r" % i)
462
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
463
    def _compatible_parents(self, my_parents, other_parents):
464
        """During join check that other_parents are joinable with my_parents.
465
466
        Joinable is defined as 'is a subset of' - supersets may require 
467
        regeneration of diffs, but subsets do not.
468
        """
469
        return len(other_parents.difference(my_parents)) == 0
470
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
471
    def annotate(self, version_id):
472
        if isinstance(version_id, int):
473
            warn('Weave.annotate(int) is deprecated. Please use version names'
474
                 ' in all circumstances as of 0.8',
475
                 DeprecationWarning,
476
                 stacklevel=2
477
                 )
478
            result = []
479
            for origin, lineno, text in self._extract([version_id]):
480
                result.append((origin, text))
481
            return result
482
        else:
483
            return super(Weave, self).annotate(version_id)
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
484
    
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
485
    def annotate_iter(self, version_id):
486
        """Yield list of (version-id, line) pairs for the specified version.
0.1.7 by Martin Pool
Add trivial annotate text
487
488
        The index indicates when the line originated in the weave."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
489
        incls = [self._lookup(version_id)]
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
490
        for origin, lineno, text in self._extract(incls):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
491
            yield self._idx_to_name(origin), text
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
492
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
493
    @deprecated_method(zero_eight)
918 by Martin Pool
- start doing new weave-merge algorithm
494
    def _walk(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
495
        """_walk has become walk, a supported api."""
496
        return self.walk()
918 by Martin Pool
- start doing new weave-merge algorithm
497
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
498
    def walk(self, version_ids=None):
499
        """See VersionedFile.walk."""
918 by Martin Pool
- start doing new weave-merge algorithm
500
        
501
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
502
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
503
504
        lineno = 0         # line of weave, 0-based
505
944 by Martin Pool
- refactor member names in Weave code
506
        for l in self._weave:
918 by Martin Pool
- start doing new weave-merge algorithm
507
            if isinstance(l, tuple):
508
                c, v = l
509
                isactive = None
510
                if c == '{':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
511
                    istack.append(self._idx_to_name(v))
918 by Martin Pool
- start doing new weave-merge algorithm
512
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
513
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
514
                elif c == '[':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
515
                    assert self._idx_to_name(v) not in dset
516
                    dset.add(self._idx_to_name(v))
918 by Martin Pool
- start doing new weave-merge algorithm
517
                elif c == ']':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
518
                    dset.remove(self._idx_to_name(v))
918 by Martin Pool
- start doing new weave-merge algorithm
519
                else:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
520
                    raise WeaveFormatError('unexpected instruction %r' % v)
918 by Martin Pool
- start doing new weave-merge algorithm
521
            else:
522
                assert isinstance(l, basestring)
523
                assert istack
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
524
                yield lineno, istack[-1], dset.copy(), l
918 by Martin Pool
- start doing new weave-merge algorithm
525
            lineno += 1
526
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
527
        if istack:
528
            raise WeaveFormatError("unclosed insertion blocks "
529
                    "at end of weave: %s" % istack)
530
        if dset:
531
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
532
                                   % dset)
918 by Martin Pool
- start doing new weave-merge algorithm
533
893 by Martin Pool
- Refactor weave calculation of inclusions
534
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
535
        """Yield annotation of lines in included set.
536
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
537
        Yields a sequence of tuples (origin, lineno, text), where
538
        origin is the origin version, lineno the index in the weave,
539
        and text the text of the line.
540
0.1.20 by Martin Pool
Factor out Knit.extract() method
541
        The set typically but not necessarily corresponds to a version.
542
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
543
        for i in versions:
544
            if not isinstance(i, int):
545
                raise ValueError(i)
546
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
547
        included = self._inclusions(versions)
881 by Martin Pool
- faster weave extraction
548
549
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
550
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
551
552
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
553
894 by Martin Pool
- small optimization for weave extract
554
        isactive = None
0.1.85 by Martin Pool
doc
555
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
556
        result = []
557
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
558
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
559
944 by Martin Pool
- refactor member names in Weave code
560
        for l in self._weave:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
561
            if isinstance(l, tuple):
562
                c, v = l
894 by Martin Pool
- small optimization for weave extract
563
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
564
                if c == '{':
565
                    assert v not in istack
566
                    istack.append(v)
567
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
568
                    istack.pop()
891 by Martin Pool
- fix up refactoring of weave
569
                elif c == '[':
570
                    if v in included:
881 by Martin Pool
- faster weave extraction
571
                        assert v not in dset
0.1.48 by Martin Pool
Basic parsing of delete instructions.
572
                        dset.add(v)
891 by Martin Pool
- fix up refactoring of weave
573
                else:
574
                    assert c == ']'
575
                    if v in included:
881 by Martin Pool
- faster weave extraction
576
                        assert v in dset
0.1.48 by Martin Pool
Basic parsing of delete instructions.
577
                        dset.remove(v)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
578
            else:
579
                assert isinstance(l, basestring)
894 by Martin Pool
- small optimization for weave extract
580
                if isactive is None:
581
                    isactive = (not dset) and istack and (istack[-1] in included)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
582
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
583
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
584
            lineno += 1
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
585
        if istack:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
586
            raise WeaveFormatError("unclosed insertion blocks "
587
                    "at end of weave: %s" % istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
588
        if dset:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
589
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
590
                                   % dset)
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
591
        return result
592
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
593
    @deprecated_method(zero_eight)
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
594
    def get_iter(self, name_or_index):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
595
        """Deprecated, please do not use. Lookups are not not needed.
596
        
597
        Please use get_lines now.
598
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
599
        return self._get_iter(self._maybe_lookup(name_or_index))
600
601
    @deprecated_method(zero_eight)
602
    def maybe_lookup(self, name_or_index):
603
        """Deprecated, please do not use. Lookups are not not needed."""
604
        return self._maybe_lookup(name_or_index)
605
606
    def _maybe_lookup(self, name_or_index):
607
        """Convert possible symbolic name to index, or pass through indexes.
608
        
609
        NOT FOR PUBLIC USE.
610
        """
611
        if isinstance(name_or_index, (int, long)):
612
            return name_or_index
613
        else:
614
            return self._lookup(name_or_index)
615
616
    def _get_iter(self, version_id):
0.1.5 by Martin Pool
Add test for storing two text versions.
617
        """Yield lines for the specified version."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
618
        incls = [self._maybe_lookup(version_id)]
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
619
        if len(incls) == 1:
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
620
            index = incls[0]
621
            cur_sha = sha.new()
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
622
        else:
623
            # We don't have sha1 sums for multiple entries
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
624
            cur_sha = None
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
625
        for origin, lineno, line in self._extract(incls):
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
626
            if cur_sha:
627
                cur_sha.update(line)
0.1.8 by Martin Pool
Unify get/annotate code
628
            yield line
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
629
        if cur_sha:
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
630
            expected_sha1 = self._sha1s[index]
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
631
            measured_sha1 = cur_sha.hexdigest() 
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
632
            if measured_sha1 != expected_sha1:
633
                raise errors.WeaveInvalidChecksum(
634
                        'file %s, revision %s, expected: %s, measured %s' 
635
                        % (self._weave_name, self._names[index],
636
                           expected_sha1, measured_sha1))
0.1.5 by Martin Pool
Add test for storing two text versions.
637
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
638
    @deprecated_method(zero_eight)
639
    def get(self, version_id):
640
        """Please use either Weave.get_text or Weave.get_lines as desired."""
641
        return self.get_lines(version_id)
642
643
    def get_lines(self, version_id):
644
        """See VersionedFile.get_lines()."""
645
        return list(self._get_iter(version_id))
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
646
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
647
    def get_sha1(self, name):
648
        """Get the stored sha1 sum for the given revision.
649
        
650
        :param name: The name of the version to lookup
651
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
652
        return self._sha1s[self._lookup(name)]
0.1.91 by Martin Pool
Update Weave.check
653
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
654
    @deprecated_method(zero_eight)
0.1.91 by Martin Pool
Update Weave.check
655
    def numversions(self):
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
656
        """How many versions are in this weave?
657
658
        Deprecated in favour of num_versions.
659
        """
660
        return self.num_versions()
661
662
    def num_versions(self):
663
        """How many versions are in this weave?"""
944 by Martin Pool
- refactor member names in Weave code
664
        l = len(self._parents)
0.1.91 by Martin Pool
Update Weave.check
665
        assert l == len(self._sha1s)
666
        return l
667
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
668
    __len__ = num_versions
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
669
894 by Martin Pool
- small optimization for weave extract
670
    def check(self, progress_bar=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
671
        # TODO evaluate performance hit of using string sets in this routine.
0.1.91 by Martin Pool
Update Weave.check
672
        # check no circular inclusions
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
673
        for version in range(self.num_versions()):
944 by Martin Pool
- refactor member names in Weave code
674
            inclusions = list(self._parents[version])
0.1.91 by Martin Pool
Update Weave.check
675
            if inclusions:
676
                inclusions.sort()
677
                if inclusions[-1] >= version:
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
678
                    raise WeaveFormatError("invalid included version %d for index %d"
0.1.91 by Martin Pool
Update Weave.check
679
                                           % (inclusions[-1], version))
680
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
681
        # try extracting all versions; parallel extraction is used
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
682
        nv = self.num_versions()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
683
        sha1s = {}
684
        texts = {}
685
        inclusions = {}
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
686
        for i in range(nv):
687
            # For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
688
            # The problem is that set membership is much more expensive
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
689
            name = self._idx_to_name(i)
690
            sha1s[name] = sha.new()
691
            texts[name] = []
692
            new_inc = set([name])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
693
            for p in self._parents[i]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
694
                new_inc.update(inclusions[self._idx_to_name(p)])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
695
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
696
            assert set(new_inc) == set(self.get_ancestry(name)), \
697
                'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
698
            inclusions[name] = new_inc
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
699
700
        nlines = len(self._weave)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
701
702
        update_text = 'checking weave'
703
        if self._weave_name:
704
            short_name = os.path.basename(self._weave_name)
705
            update_text = 'checking %s' % (short_name,)
706
            update_text = update_text[:25]
707
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
708
        for lineno, insert, deleteset, line in self.walk():
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
709
            if progress_bar:
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
710
                progress_bar.update(update_text, lineno, nlines)
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
711
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
712
            for name, name_inclusions in inclusions.items():
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
713
                # The active inclusion must be an ancestor,
714
                # and no ancestors must have deleted this line,
715
                # because we don't support resurrection.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
716
                if (insert in name_inclusions) and not (deleteset & name_inclusions):
717
                    sha1s[name].update(line)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
718
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
719
        for i in range(nv):
720
            version = self._idx_to_name(i)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
721
            hd = sha1s[version].hexdigest()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
722
            expected = self._sha1s[i]
0.1.91 by Martin Pool
Update Weave.check
723
            if hd != expected:
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
724
                raise errors.WeaveInvalidChecksum(
725
                        "mismatched sha1 for version %s: "
726
                        "got %s, expected %s"
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
727
                        % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
728
881 by Martin Pool
- faster weave extraction
729
        # TODO: check insertions are properly nested, that there are
730
        # no lines outside of insertion blocks, that deletions are
731
        # properly paired, etc.
732
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
733
    def _join(self, other, pb, msg, version_ids):
734
        """Worker routine for join()."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
735
        if not other.versions():
1393.1.48 by Martin Pool
- Add stub Weave.join() method
736
            return          # nothing to update, easy
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
737
738
        if version_ids:
739
            for version_id in version_ids:
740
                if not self.has_version(version_id):
741
                    raise RevisionNotPresent(version_id, self._weave_name)
742
        assert version_ids == None
743
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
744
        # two loops so that we do not change ourselves before verifying it
745
        # will be ok
1393.1.50 by Martin Pool
- more development of Weave.join()
746
        # work through in index order to make sure we get all dependencies
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
747
        names_to_join = []
748
        processed = 0
1393.1.50 by Martin Pool
- more development of Weave.join()
749
        for other_idx, name in enumerate(other._names):
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
750
            self._check_version_consistent(other, other_idx, name)
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
751
            sha1 = other._sha1s[other_idx]
752
753
            processed += 1
754
755
            if name in self._name_map:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
756
                idx = self._lookup(name)
757
                n1 = set(map(other._idx_to_name, other._parents[other_idx]))
758
                n2 = set(map(self._idx_to_name, self._parents[idx]))
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
759
                if sha1 ==  self._sha1s[idx] and n1 == n2:
760
                        continue
761
762
            names_to_join.append((other_idx, name))
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
763
1551.3.11 by Aaron Bentley
Merge from Robert
764
        if pb and not msg:
765
            msg = 'weave join'
766
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
767
        merged = 0
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
768
        time0 = time.time()
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
769
        for other_idx, name in names_to_join:
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
770
            # TODO: If all the parents of the other version are already
1393.1.50 by Martin Pool
- more development of Weave.join()
771
            # present then we can avoid some work by just taking the delta
772
            # and adjusting the offsets.
1393.1.51 by Martin Pool
- new Weave.copy()
773
            new_parents = self._imported_parents(other, other_idx)
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
774
            sha1 = other._sha1s[other_idx]
775
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
776
            merged += 1
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
777
1551.3.11 by Aaron Bentley
Merge from Robert
778
            if pb:
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
779
                pb.update(msg, merged, len(names_to_join))
1551.3.11 by Aaron Bentley
Merge from Robert
780
           
1393.1.50 by Martin Pool
- more development of Weave.join()
781
            lines = other.get_lines(other_idx)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
782
            self._add(name, lines, new_parents, sha1)
1393.1.50 by Martin Pool
- more development of Weave.join()
783
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
784
        mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
785
                merged, processed, self._weave_name, time.time()-time0))
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
786
 
1393.1.51 by Martin Pool
- new Weave.copy()
787
    def _imported_parents(self, other, other_idx):
788
        """Return list of parents in self corresponding to indexes in other."""
789
        new_parents = []
790
        for parent_idx in other._parents[other_idx]:
791
            parent_name = other._names[parent_idx]
792
            if parent_name not in self._names:
793
                # should not be possible
794
                raise WeaveError("missing parent {%s} of {%s} in %r" 
795
                                 % (parent_name, other._name_map[other_idx], self))
796
            new_parents.append(self._name_map[parent_name])
797
        return new_parents
798
1393.1.50 by Martin Pool
- more development of Weave.join()
799
    def _check_version_consistent(self, other, other_idx, name):
800
        """Check if a version in consistent in this and other.
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
801
802
        To be consistent it must have:
803
804
         * the same text
805
         * the same direct parents (by name, not index, and disregarding
806
           order)
1393.1.50 by Martin Pool
- more development of Weave.join()
807
        
808
        If present & correct return True;
809
        if not present in self return False; 
810
        if inconsistent raise error."""
811
        this_idx = self._name_map.get(name, -1)
812
        if this_idx != -1:
813
            if self._sha1s[this_idx] != other._sha1s[other_idx]:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
814
                raise errors.WeaveTextDiffers(name, self, other)
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
815
            self_parents = self._parents[this_idx]
816
            other_parents = other._parents[other_idx]
1551.3.11 by Aaron Bentley
Merge from Robert
817
            n1 = set([self._names[i] for i in self_parents])
818
            n2 = set([other._names[i] for i in other_parents])
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
819
            if not self._compatible_parents(n1, n2):
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
820
                raise WeaveParentMismatch("inconsistent parents "
821
                    "for version {%s}: %s vs %s" % (name, n1, n2))
1393.1.50 by Martin Pool
- more development of Weave.join()
822
            else:
823
                return True         # ok!
824
        else:
825
            return False
918 by Martin Pool
- start doing new weave-merge algorithm
826
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
827
    @deprecated_method(zero_eight)
1551.3.11 by Aaron Bentley
Merge from Robert
828
    def reweave(self, other, pb=None, msg=None):
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
829
        """reweave has been superceded by plain use of join."""
830
        return self.join(other, pb, msg)
831
832
    def _reweave(self, other, pb, msg):
833
        """Reweave self with other - internal helper for join().
1551.3.11 by Aaron Bentley
Merge from Robert
834
835
        :param other: The other weave to merge
836
        :param pb: An optional progress bar, indicating how far done we are
837
        :param msg: An optional message for the progress
838
        """
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
839
        new_weave = _reweave(self, other, pb=pb, msg=msg)
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
840
        for attr in self.__slots__:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
841
            if attr != '_weave_name':
842
                setattr(self, attr, getattr(new_weave, attr))
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
843
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
844
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
845
class WeaveFile(Weave):
846
    """A WeaveFile represents a Weave on disk and writes on change."""
847
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
848
    WEAVE_SUFFIX = '.weave'
849
    
1563.2.25 by Robert Collins
Merge in upstream.
850
    def __init__(self, name, transport, mode=None, create=False):
851
        """Create a WeaveFile.
852
        
853
        :param create: If not True, only open an existing knit.
854
        """
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
855
        super(WeaveFile, self).__init__(name)
856
        self._transport = transport
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
857
        self._mode = mode
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
858
        try:
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
859
            _read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
860
        except errors.NoSuchFile:
1563.2.25 by Robert Collins
Merge in upstream.
861
            if not create:
862
                raise
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
863
            # new file, save it
864
            self._save()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
865
866
    def add_lines(self, version_id, parents, lines):
867
        """Add a version and save the weave."""
868
        super(WeaveFile, self).add_lines(version_id, parents, lines)
869
        self._save()
870
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
871
    def copy_to(self, name, transport):
872
        """See VersionedFile.copy_to()."""
873
        # as we are all in memory always, just serialise to the new place.
874
        sio = StringIO()
875
        write_weave_v5(self, sio)
876
        sio.seek(0)
877
        transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._mode)
878
1563.2.13 by Robert Collins
InterVersionedFile implemented.
879
    def create_empty(self, name, transport, mode=None):
1563.2.25 by Robert Collins
Merge in upstream.
880
        return WeaveFile(name, transport, mode, create=True)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
881
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
882
    def _save(self):
883
        """Save the weave."""
884
        sio = StringIO()
885
        write_weave_v5(self, sio)
886
        sio.seek(0)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
887
        self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
888
                            sio,
889
                            self._mode)
890
891
    @staticmethod
892
    def get_suffixes():
893
        """See VersionedFile.get_suffixes()."""
894
        return [WeaveFile.WEAVE_SUFFIX]
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
895
896
    def join(self, other, pb=None, msg=None, version_ids=None):
897
        """Join other into self and save."""
898
        super(WeaveFile, self).join(other, pb, msg, version_ids)
899
        self._save()
900
901
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
902
@deprecated_function(zero_eight)
1551.3.11 by Aaron Bentley
Merge from Robert
903
def reweave(wa, wb, pb=None, msg=None):
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
904
    """reweaving is deprecation, please just use weave.join()."""
905
    _reweave(wa, wb, pb, msg)
906
907
def _reweave(wa, wb, pb=None, msg=None):
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
908
    """Combine two weaves and return the result.
909
910
    This works even if a revision R has different parents in 
911
    wa and wb.  In the resulting weave all the parents are given.
912
913
    This is done by just building up a new weave, maintaining ordering 
914
    of the versions in the two inputs.  More efficient approaches
915
    might be possible but it should only be necessary to do 
916
    this operation rarely, when a new previously ghost version is 
917
    inserted.
1551.3.11 by Aaron Bentley
Merge from Robert
918
919
    :param pb: An optional progress bar, indicating how far done we are
920
    :param msg: An optional message for the progress
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
921
    """
922
    wr = Weave()
923
    ia = ib = 0
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
924
    queue_a = range(wa.num_versions())
925
    queue_b = range(wb.num_versions())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
926
    # first determine combined parents of all versions
927
    # map from version name -> all parent names
928
    combined_parents = _reweave_parent_graphs(wa, wb)
929
    mutter("combined parents: %r", combined_parents)
1185.16.117 by mbp at sourcefrog
Reweave in topological-sort order.
930
    order = topo_sort(combined_parents.iteritems())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
931
    mutter("order to reweave: %r", order)
1551.3.11 by Aaron Bentley
Merge from Robert
932
933
    if pb and not msg:
934
        msg = 'reweave'
935
936
    for idx, name in enumerate(order):
937
        if pb:
938
            pb.update(msg, idx, len(order))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
939
        if name in wa._name_map:
940
            lines = wa.get_lines(name)
941
            if name in wb._name_map:
1551.3.11 by Aaron Bentley
Merge from Robert
942
                lines_b = wb.get_lines(name)
943
                if lines != lines_b:
944
                    mutter('Weaves differ on content. rev_id {%s}', name)
945
                    mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
946
                    import difflib
947
                    lines = list(difflib.unified_diff(lines, lines_b,
948
                            wa._weave_name, wb._weave_name))
949
                    mutter('lines:\n%s', ''.join(lines))
950
                    raise errors.WeaveTextDiffers(name, wa, wb)
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
951
        else:
952
            lines = wb.get_lines(name)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
953
        wr._add(name, lines, [wr._lookup(i) for i in combined_parents[name]])
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
954
    return wr
955
956
def _reweave_parent_graphs(wa, wb):
957
    """Return combined parent ancestry for two weaves.
958
    
959
    Returned as a list of (version_name, set(parent_names))"""
960
    combined = {}
961
    for weave in [wa, wb]:
962
        for idx, name in enumerate(weave._names):
963
            p = combined.setdefault(name, set())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
964
            p.update(map(weave._idx_to_name, weave._parents[idx]))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
965
    return combined
966
967
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
968
def weave_toc(w):
969
    """Show the weave's table-of-contents"""
1083 by Martin Pool
- add space to store revision-id in weave files
970
    print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
971
    for i in (6, 50, 10, 10):
870 by Martin Pool
- better weave info display
972
        print '-' * i,
973
    print
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
974
    for i in range(w.num_versions()):
0.1.91 by Martin Pool
Update Weave.check
975
        sha1 = w._sha1s[i]
1083 by Martin Pool
- add space to store revision-id in weave files
976
        name = w._names[i]
977
        parent_str = ' '.join(map(str, w._parents[i]))
978
        print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
0.1.88 by Martin Pool
Add weave info command.
979
869 by Martin Pool
- more weave.py command line options
980
981
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
982
def weave_stats(weave_file, pb):
947 by Martin Pool
- new 'weave stats' command
983
    from bzrlib.weavefile import read_weave
984
985
    wf = file(weave_file, 'rb')
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
986
    w = read_weave(wf, WeaveVersionedFile)
947 by Martin Pool
- new 'weave stats' command
987
    # FIXME: doesn't work on pipes
988
    weave_size = wf.tell()
989
990
    total = 0
991
    vers = len(w)
992
    for i in range(vers):
993
        pb.update('checking sizes', i, vers)
1393.1.24 by Martin Pool
- slight speedup for weave stats
994
        for origin, lineno, line in w._extract([i]):
947 by Martin Pool
- new 'weave stats' command
995
            total += len(line)
996
997
    pb.clear()
998
999
    print 'versions          %9d' % vers
1000
    print 'weave file        %9d bytes' % weave_size
1001
    print 'total contents    %9d bytes' % total
1002
    print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1003
    if vers:
1004
        avg = total/vers
1005
        print 'average size      %9d bytes' % avg
1006
        print 'relative size     %9.2fx' % (float(weave_size) / float(avg))
947 by Martin Pool
- new 'weave stats' command
1007
1008
869 by Martin Pool
- more weave.py command line options
1009
def usage():
871 by Martin Pool
- add command for merge-based weave
1010
    print """bzr weave tool
1011
1012
Experimental tool for weave algorithm.
1013
869 by Martin Pool
- more weave.py command line options
1014
usage:
1015
    weave init WEAVEFILE
1016
        Create an empty weave file
1017
    weave get WEAVEFILE VERSION
1018
        Write out specified version.
1019
    weave check WEAVEFILE
1020
        Check consistency of all versions.
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1021
    weave toc WEAVEFILE
869 by Martin Pool
- more weave.py command line options
1022
        Display table of contents.
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1023
    weave add WEAVEFILE NAME [BASE...] < NEWTEXT
869 by Martin Pool
- more weave.py command line options
1024
        Add NEWTEXT, with specified parent versions.
1025
    weave annotate WEAVEFILE VERSION
1026
        Display origin of each line.
1027
    weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1028
        Auto-merge two versions and display conflicts.
1329 by Martin Pool
- add diff command to weave utility
1029
    weave diff WEAVEFILE VERSION1 VERSION2 
1030
        Show differences between two versions.
871 by Martin Pool
- add command for merge-based weave
1031
1032
example:
1033
1034
    % weave init foo.weave
1035
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1036
    % weave add foo.weave ver0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1037
    added version 0
1038
1039
    (create updated version)
1040
    % vi foo.txt
1041
    % weave get foo.weave 0 | diff -u - foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1042
    % weave add foo.weave ver1 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1043
    added version 1
1044
1045
    % weave get foo.weave 0 > foo.txt       (create forked version)
1046
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1047
    % weave add foo.weave ver2 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1048
    added version 2
1049
1050
    % weave merge foo.weave 1 2 > foo.txt   (merge them)
1051
    % vi foo.txt                            (resolve conflicts)
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1052
    % weave add foo.weave merged 1 2 < foo.txt     (commit merged version)     
871 by Martin Pool
- add command for merge-based weave
1053
    
869 by Martin Pool
- more weave.py command line options
1054
"""
0.1.88 by Martin Pool
Add weave info command.
1055
    
1056
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1057
1058
def main(argv):
1059
    import sys
1060
    import os
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1061
    try:
1062
        import bzrlib
1063
    except ImportError:
1064
        # in case we're run directly from the subdirectory
1065
        sys.path.append('..')
1066
        import bzrlib
1336 by Martin Pool
- tidy up import
1067
    from bzrlib.weavefile import write_weave, read_weave
894 by Martin Pool
- small optimization for weave extract
1068
    from bzrlib.progress import ProgressBar
1069
1078 by Martin Pool
- use psyco for weave if possible
1070
    try:
1071
        import psyco
1072
        psyco.full()
1073
    except ImportError:
1074
        pass
894 by Martin Pool
- small optimization for weave extract
1075
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1076
    if len(argv) < 2:
1077
        usage()
1078
        return 0
1079
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1080
    cmd = argv[1]
869 by Martin Pool
- more weave.py command line options
1081
1082
    def readit():
1083
        return read_weave(file(argv[2], 'rb'))
1084
    
1085
    if cmd == 'help':
1086
        usage()
1087
    elif cmd == 'add':
1088
        w = readit()
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1089
        # at the moment, based on everything in the file
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1090
        name = argv[3]
1091
        parents = map(int, argv[4:])
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1092
        lines = sys.stdin.readlines()
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1093
        ver = w.add(name, parents, lines)
869 by Martin Pool
- more weave.py command line options
1094
        write_weave(w, file(argv[2], 'wb'))
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1095
        print 'added version %r %d' % (name, ver)
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1096
    elif cmd == 'init':
1097
        fn = argv[2]
1098
        if os.path.exists(fn):
1099
            raise IOError("file exists")
1100
        w = Weave()
869 by Martin Pool
- more weave.py command line options
1101
        write_weave(w, file(fn, 'wb'))
1102
    elif cmd == 'get': # get one version
1103
        w = readit()
0.1.94 by Martin Pool
Fix get_iter call
1104
        sys.stdout.writelines(w.get_iter(int(argv[3])))
869 by Martin Pool
- more weave.py command line options
1105
        
1329 by Martin Pool
- add diff command to weave utility
1106
    elif cmd == 'diff':
1107
        from difflib import unified_diff
1108
        w = readit()
1109
        fn = argv[2]
1110
        v1, v2 = map(int, argv[3:5])
1111
        lines1 = w.get(v1)
1112
        lines2 = w.get(v2)
1113
        diff_gen = unified_diff(lines1, lines2,
1114
                                '%s version %d' % (fn, v1),
1115
                                '%s version %d' % (fn, v2))
1116
        sys.stdout.writelines(diff_gen)
1117
            
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1118
    elif cmd == 'annotate':
869 by Martin Pool
- more weave.py command line options
1119
        w = readit()
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1120
        # newline is added to all lines regardless; too hard to get
1121
        # reasonable formatting otherwise
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1122
        lasto = None
1123
        for origin, text in w.annotate(int(argv[3])):
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1124
            text = text.rstrip('\r\n')
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1125
            if origin == lasto:
1126
                print '      | %s' % (text)
1127
            else:
1128
                print '%5d | %s' % (origin, text)
1129
                lasto = origin
871 by Martin Pool
- add command for merge-based weave
1130
                
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1131
    elif cmd == 'toc':
1132
        weave_toc(readit())
947 by Martin Pool
- new 'weave stats' command
1133
1134
    elif cmd == 'stats':
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1135
        weave_stats(argv[2], ProgressBar())
871 by Martin Pool
- add command for merge-based weave
1136
        
0.1.91 by Martin Pool
Update Weave.check
1137
    elif cmd == 'check':
869 by Martin Pool
- more weave.py command line options
1138
        w = readit()
894 by Martin Pool
- small optimization for weave extract
1139
        pb = ProgressBar()
1140
        w.check(pb)
1141
        pb.clear()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1142
        print '%d versions ok' % w.num_versions()
871 by Martin Pool
- add command for merge-based weave
1143
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
1144
    elif cmd == 'inclusions':
1145
        w = readit()
1146
        print ' '.join(map(str, w.inclusions([int(argv[3])])))
1147
1148
    elif cmd == 'parents':
1149
        w = readit()
944 by Martin Pool
- refactor member names in Weave code
1150
        print ' '.join(map(str, w._parents[int(argv[3])]))
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
1151
918 by Martin Pool
- start doing new weave-merge algorithm
1152
    elif cmd == 'plan-merge':
1153
        w = readit()
1154
        for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
919 by Martin Pool
- more development of weave-merge
1155
            if line:
1156
                print '%14s | %s' % (state, line),
918 by Martin Pool
- start doing new weave-merge algorithm
1157
871 by Martin Pool
- add command for merge-based weave
1158
    elif cmd == 'merge':
919 by Martin Pool
- more development of weave-merge
1159
        w = readit()
1160
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1161
        sys.stdout.writelines(w.weave_merge(p))
1162
            
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1163
    else:
1164
        raise ValueError('unknown command %r' % cmd)
1165
    
1166
1076 by Martin Pool
- add code to run weave utility under profiler
1167
1168
def profile_main(argv): 
1169
    import tempfile, hotshot, hotshot.stats
1170
1171
    prof_f = tempfile.NamedTemporaryFile()
1172
1173
    prof = hotshot.Profile(prof_f.name)
1174
1175
    ret = prof.runcall(main, argv)
1176
    prof.close()
1177
1178
    stats = hotshot.stats.load(prof_f.name)
1179
    #stats.strip_dirs()
1079 by Martin Pool
- weavefile can just use lists for read-in ancestry, not frozensets
1180
    stats.sort_stats('cumulative')
1076 by Martin Pool
- add code to run weave utility under profiler
1181
    ## XXX: Might like to write to stderr or the trace file instead but
1182
    ## print_stats seems hardcoded to stdout
1183
    stats.print_stats(20)
1184
            
1185
    return ret
1186
1187
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
1188
def lsprofile_main(argv): 
1189
    from bzrlib.lsprof import profile
1190
    ret,stats = profile(main, argv)
1191
    stats.sort()
1192
    stats.pprint()
1193
    return ret
1194
1195
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1196
if __name__ == '__main__':
1197
    import sys
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1198
    if '--profile' in sys.argv:
1078 by Martin Pool
- use psyco for weave if possible
1199
        args = sys.argv[:]
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1200
        args.remove('--profile')
1078 by Martin Pool
- use psyco for weave if possible
1201
        sys.exit(profile_main(args))
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
1202
    elif '--lsprof' in sys.argv:
1203
        args = sys.argv[:]
1204
        args.remove('--lsprof')
1205
        sys.exit(lsprofile_main(args))
1078 by Martin Pool
- use psyco for weave if possible
1206
    else:
1207
        sys.exit(main(sys.argv))
1076 by Martin Pool
- add code to run weave utility under profiler
1208
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1209
1210
class InterWeave(InterVersionedFile):
1211
    """Optimised code paths for weave to weave operations."""
1212
    
1213
    _matching_file_factory = staticmethod(WeaveFile)
1214
    
1215
    @staticmethod
1216
    def is_compatible(source, target):
1217
        """Be compatible with weaves."""
1218
        try:
1219
            return (isinstance(source, Weave) and
1220
                    isinstance(target, Weave))
1221
        except AttributeError:
1222
            return False
1223
1224
    def join(self, pb=None, msg=None, version_ids=None):
1225
        """See InterVersionedFile.join."""
1226
        try:
1227
            self.target._join(self.source, pb, msg, version_ids)
1228
        except errors.WeaveParentMismatch:
1229
            self.target._reweave(self.source, pb, msg)
1230
1231
1232
InterVersionedFile.register_optimiser(InterWeave)