/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
318
        self._parents.append(parents[:])
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
319
        self._sha1s.append(sha1)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
320
        self._names.append(version_id)
321
        self._name_map[version_id] = new_version
938 by Martin Pool
- various optimizations to weave add code
322
323
            
324
        if not parents:
325
            # special case; adding with no parents revision; can do
326
            # this more quickly by just appending unconditionally.
327
            # even more specially, if we're adding an empty text we
328
            # need do nothing at all.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
329
            if lines:
944 by Martin Pool
- refactor member names in Weave code
330
                self._weave.append(('{', new_version))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
331
                self._weave.extend(lines)
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
332
                self._weave.append(('}', None))
938 by Martin Pool
- various optimizations to weave add code
333
            return new_version
334
941 by Martin Pool
- allow for parents specified to Weave.add to be a set
335
        if len(parents) == 1:
336
            pv = list(parents)[0]
337
            if sha1 == self._sha1s[pv]:
338
                # special case: same as the single parent
339
                return new_version
938 by Martin Pool
- various optimizations to weave add code
340
            
341
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
342
        ancestors = self._inclusions(parents)
938 by Martin Pool
- various optimizations to weave add code
343
944 by Martin Pool
- refactor member names in Weave code
344
        l = self._weave
938 by Martin Pool
- various optimizations to weave add code
345
346
        # basis a list of (origin, lineno, line)
347
        basis_lineno = []
348
        basis_lines = []
349
        for origin, lineno, line in self._extract(ancestors):
350
            basis_lineno.append(lineno)
351
            basis_lines.append(line)
352
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
353
        # another small special case: a merge, producing the same text
354
        # as auto-merge
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
355
        if lines == basis_lines:
938 by Martin Pool
- various optimizations to weave add code
356
            return new_version            
357
358
        # add a sentinal, because we can also match against the final line
944 by Martin Pool
- refactor member names in Weave code
359
        basis_lineno.append(len(self._weave))
938 by Martin Pool
- various optimizations to weave add code
360
361
        # XXX: which line of the weave should we really consider
362
        # matches the end of the file?  the current code says it's the
363
        # last line of the weave?
364
365
        #print 'basis_lines:', basis_lines
366
        #print 'new_lines:  ', lines
367
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
368
        s = SequenceMatcher(None, basis_lines, lines)
938 by Martin Pool
- various optimizations to weave add code
369
370
        # offset gives the number of lines that have been inserted
371
        # into the weave up to the current point; if the original edit instruction
372
        # says to change line A then we actually change (A+offset)
373
        offset = 0
374
375
        for tag, i1, i2, j1, j2 in s.get_opcodes():
376
            # i1,i2 are given in offsets within basis_lines; we need to map them
377
            # back to offsets within the entire weave
378
            #print 'raw match', tag, i1, i2, j1, j2
379
            if tag == 'equal':
380
                continue
381
382
            i1 = basis_lineno[i1]
383
            i2 = basis_lineno[i2]
384
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
385
            assert 0 <= j1 <= j2 <= len(lines)
938 by Martin Pool
- various optimizations to weave add code
386
387
            #print tag, i1, i2, j1, j2
388
389
            # the deletion and insertion are handled separately.
390
            # first delete the region.
391
            if i1 != i2:
944 by Martin Pool
- refactor member names in Weave code
392
                self._weave.insert(i1+offset, ('[', new_version))
393
                self._weave.insert(i2+offset+1, (']', new_version))
938 by Martin Pool
- various optimizations to weave add code
394
                offset += 2
395
396
            if j1 != j2:
397
                # there may have been a deletion spanning up to
398
                # i2; we want to insert after this region to make sure
399
                # we don't destroy ourselves
400
                i = i2 + offset
944 by Martin Pool
- refactor member names in Weave code
401
                self._weave[i:i] = ([('{', new_version)] 
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
402
                                    + lines[j1:j2] 
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
403
                                    + [('}', None)])
938 by Martin Pool
- various optimizations to weave add code
404
                offset += 2 + (j2 - j1)
405
        return new_version
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
406
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
407
    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.
408
        """See VersionedFile.clone_text."""
409
        old_lines = self.get_text(old_version_id)
410
        self.add_lines(new_version_id, parents, old_lines)
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
411
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
412
    def _inclusions(self, versions):
893 by Martin Pool
- Refactor weave calculation of inclusions
413
        """Return set of all ancestors of given version(s)."""
928 by Martin Pool
- go back to using plain builtin set()
414
        i = set(versions)
1328 by Martin Pool
- slight refactoring of weave code
415
        for v in xrange(max(versions), 0, -1):
416
            if v in i:
417
                # include all its parents
418
                i.update(self._parents[v])
419
        return i
420
        ## except IndexError:
421
        ##     raise ValueError("version %d not present in weave" % v)
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
422
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
423
    @deprecated_method(zero_eight)
424
    def inclusions(self, version_ids):
425
        """Deprecated - see VersionedFile.get_ancestry for the replacement."""
426
        if not version_ids:
890 by Martin Pool
- weave info should show minimal expression of parents
427
            return []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
428
        if isinstance(version_ids[0], int):
429
            return [self._idx_to_name(v) for v in self._inclusions(version_ids)]
430
        else:
431
            return self.get_ancestry(version_ids)
432
433
    def get_ancestry(self, version_ids):
434
        """See VersionedFile.get_ancestry."""
435
        if isinstance(version_ids, basestring):
436
            version_ids = [version_ids]
437
        i = self._inclusions([self._lookup(v) for v in version_ids])
438
        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
439
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
440
    def _check_lines(self, text):
441
        if not isinstance(text, list):
442
            raise ValueError("text should be a list, not %s" % type(text))
443
444
        for l in text:
445
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
446
                raise ValueError("text line should be a string or unicode, not %s"
447
                                 % type(l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
448
        
449
450
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
451
    def _check_versions(self, indexes):
452
        """Check everything in the sequence of indexes is valid"""
453
        for i in indexes:
454
            try:
944 by Martin Pool
- refactor member names in Weave code
455
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
456
            except IndexError:
457
                raise IndexError("invalid version number %r" % i)
458
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
459
    def annotate(self, version_id):
460
        if isinstance(version_id, int):
461
            warn('Weave.annotate(int) is deprecated. Please use version names'
462
                 ' in all circumstances as of 0.8',
463
                 DeprecationWarning,
464
                 stacklevel=2
465
                 )
466
            result = []
467
            for origin, lineno, text in self._extract([version_id]):
468
                result.append((origin, text))
469
            return result
470
        else:
471
            return super(Weave, self).annotate(version_id)
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
472
    
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
473
    def annotate_iter(self, version_id):
474
        """Yield list of (version-id, line) pairs for the specified version.
0.1.7 by Martin Pool
Add trivial annotate text
475
476
        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.
477
        incls = [self._lookup(version_id)]
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
478
        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.
479
            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.
480
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
481
    @deprecated_method(zero_eight)
918 by Martin Pool
- start doing new weave-merge algorithm
482
    def _walk(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
483
        """_walk has become walk, a supported api."""
484
        return self.walk()
918 by Martin Pool
- start doing new weave-merge algorithm
485
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
486
    def walk(self, version_ids=None):
487
        """See VersionedFile.walk."""
918 by Martin Pool
- start doing new weave-merge algorithm
488
        
489
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
490
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
491
492
        lineno = 0         # line of weave, 0-based
493
944 by Martin Pool
- refactor member names in Weave code
494
        for l in self._weave:
918 by Martin Pool
- start doing new weave-merge algorithm
495
            if isinstance(l, tuple):
496
                c, v = l
497
                isactive = None
498
                if c == '{':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
499
                    istack.append(self._idx_to_name(v))
918 by Martin Pool
- start doing new weave-merge algorithm
500
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
501
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
502
                elif c == '[':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
503
                    assert self._idx_to_name(v) not in dset
504
                    dset.add(self._idx_to_name(v))
918 by Martin Pool
- start doing new weave-merge algorithm
505
                elif c == ']':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
506
                    dset.remove(self._idx_to_name(v))
918 by Martin Pool
- start doing new weave-merge algorithm
507
                else:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
508
                    raise WeaveFormatError('unexpected instruction %r' % v)
918 by Martin Pool
- start doing new weave-merge algorithm
509
            else:
510
                assert isinstance(l, basestring)
511
                assert istack
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
512
                yield lineno, istack[-1], dset.copy(), l
918 by Martin Pool
- start doing new weave-merge algorithm
513
            lineno += 1
514
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
515
        if istack:
516
            raise WeaveFormatError("unclosed insertion blocks "
517
                    "at end of weave: %s" % istack)
518
        if dset:
519
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
520
                                   % dset)
918 by Martin Pool
- start doing new weave-merge algorithm
521
893 by Martin Pool
- Refactor weave calculation of inclusions
522
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
523
        """Yield annotation of lines in included set.
524
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
525
        Yields a sequence of tuples (origin, lineno, text), where
526
        origin is the origin version, lineno the index in the weave,
527
        and text the text of the line.
528
0.1.20 by Martin Pool
Factor out Knit.extract() method
529
        The set typically but not necessarily corresponds to a version.
530
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
531
        for i in versions:
532
            if not isinstance(i, int):
533
                raise ValueError(i)
534
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
535
        included = self._inclusions(versions)
881 by Martin Pool
- faster weave extraction
536
537
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
538
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
539
540
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
541
894 by Martin Pool
- small optimization for weave extract
542
        isactive = None
0.1.85 by Martin Pool
doc
543
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
544
        result = []
545
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
546
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
547
944 by Martin Pool
- refactor member names in Weave code
548
        for l in self._weave:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
549
            if isinstance(l, tuple):
550
                c, v = l
894 by Martin Pool
- small optimization for weave extract
551
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
552
                if c == '{':
553
                    assert v not in istack
554
                    istack.append(v)
555
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
556
                    istack.pop()
891 by Martin Pool
- fix up refactoring of weave
557
                elif c == '[':
558
                    if v in included:
881 by Martin Pool
- faster weave extraction
559
                        assert v not in dset
0.1.48 by Martin Pool
Basic parsing of delete instructions.
560
                        dset.add(v)
891 by Martin Pool
- fix up refactoring of weave
561
                else:
562
                    assert c == ']'
563
                    if v in included:
881 by Martin Pool
- faster weave extraction
564
                        assert v in dset
0.1.48 by Martin Pool
Basic parsing of delete instructions.
565
                        dset.remove(v)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
566
            else:
567
                assert isinstance(l, basestring)
894 by Martin Pool
- small optimization for weave extract
568
                if isactive is None:
569
                    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
570
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
571
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
572
            lineno += 1
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
573
        if istack:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
574
            raise WeaveFormatError("unclosed insertion blocks "
575
                    "at end of weave: %s" % istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
576
        if dset:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
577
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
578
                                   % dset)
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
579
        return result
580
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
581
    @deprecated_method(zero_eight)
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
582
    def get_iter(self, name_or_index):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
583
        """Deprecated, please do not use. Lookups are not not needed.
584
        
585
        Please use get_lines now.
586
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
587
        return self._get_iter(self._maybe_lookup(name_or_index))
588
589
    @deprecated_method(zero_eight)
590
    def maybe_lookup(self, name_or_index):
591
        """Deprecated, please do not use. Lookups are not not needed."""
592
        return self._maybe_lookup(name_or_index)
593
594
    def _maybe_lookup(self, name_or_index):
595
        """Convert possible symbolic name to index, or pass through indexes.
596
        
597
        NOT FOR PUBLIC USE.
598
        """
599
        if isinstance(name_or_index, (int, long)):
600
            return name_or_index
601
        else:
602
            return self._lookup(name_or_index)
603
604
    def _get_iter(self, version_id):
0.1.5 by Martin Pool
Add test for storing two text versions.
605
        """Yield lines for the specified version."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
606
        incls = [self._maybe_lookup(version_id)]
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
607
        if len(incls) == 1:
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
608
            index = incls[0]
609
            cur_sha = sha.new()
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
610
        else:
611
            # We don't have sha1 sums for multiple entries
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
612
            cur_sha = None
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
613
        for origin, lineno, line in self._extract(incls):
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
614
            if cur_sha:
615
                cur_sha.update(line)
0.1.8 by Martin Pool
Unify get/annotate code
616
            yield line
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
617
        if cur_sha:
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
618
            expected_sha1 = self._sha1s[index]
1185.50.29 by John Arbash Meinel
Whitespace and other formatting cleanups suggested by Robert.
619
            measured_sha1 = cur_sha.hexdigest() 
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
620
            if measured_sha1 != expected_sha1:
621
                raise errors.WeaveInvalidChecksum(
622
                        'file %s, revision %s, expected: %s, measured %s' 
623
                        % (self._weave_name, self._names[index],
624
                           expected_sha1, measured_sha1))
0.1.5 by Martin Pool
Add test for storing two text versions.
625
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
626
    @deprecated_method(zero_eight)
627
    def get(self, version_id):
628
        """Please use either Weave.get_text or Weave.get_lines as desired."""
629
        return self.get_lines(version_id)
630
631
    def get_lines(self, version_id):
632
        """See VersionedFile.get_lines()."""
633
        return list(self._get_iter(version_id))
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
634
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
635
    def get_sha1(self, name):
636
        """Get the stored sha1 sum for the given revision.
637
        
638
        :param name: The name of the version to lookup
639
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
640
        return self._sha1s[self._lookup(name)]
0.1.91 by Martin Pool
Update Weave.check
641
642
    def numversions(self):
944 by Martin Pool
- refactor member names in Weave code
643
        l = len(self._parents)
0.1.91 by Martin Pool
Update Weave.check
644
        assert l == len(self._sha1s)
645
        return l
646
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
647
    __len__ = numversions
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
648
894 by Martin Pool
- small optimization for weave extract
649
    def check(self, progress_bar=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
650
        # TODO evaluate performance hit of using string sets in this routine.
0.1.91 by Martin Pool
Update Weave.check
651
        # check no circular inclusions
652
        for version in range(self.numversions()):
944 by Martin Pool
- refactor member names in Weave code
653
            inclusions = list(self._parents[version])
0.1.91 by Martin Pool
Update Weave.check
654
            if inclusions:
655
                inclusions.sort()
656
                if inclusions[-1] >= version:
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
657
                    raise WeaveFormatError("invalid included version %d for index %d"
0.1.91 by Martin Pool
Update Weave.check
658
                                           % (inclusions[-1], version))
659
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
660
        # try extracting all versions; parallel extraction is used
894 by Martin Pool
- small optimization for weave extract
661
        nv = self.numversions()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
662
        sha1s = {}
663
        texts = {}
664
        inclusions = {}
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
665
        for i in range(nv):
666
            # For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
667
            # 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.
668
            name = self._idx_to_name(i)
669
            sha1s[name] = sha.new()
670
            texts[name] = []
671
            new_inc = set([name])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
672
            for p in self._parents[i]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
673
                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.
674
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
675
            assert set(new_inc) == set(self.get_ancestry(name)), \
676
                'failed %s != %s' % (set(new_inc), set(self.get_ancestry(name)))
677
            inclusions[name] = new_inc
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
678
679
        nlines = len(self._weave)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
680
681
        update_text = 'checking weave'
682
        if self._weave_name:
683
            short_name = os.path.basename(self._weave_name)
684
            update_text = 'checking %s' % (short_name,)
685
            update_text = update_text[:25]
686
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
687
        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.
688
            if progress_bar:
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
689
                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.
690
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
691
            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.
692
                # The active inclusion must be an ancestor,
693
                # and no ancestors must have deleted this line,
694
                # because we don't support resurrection.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
695
                if (insert in name_inclusions) and not (deleteset & name_inclusions):
696
                    sha1s[name].update(line)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
697
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
698
        for i in range(nv):
699
            version = self._idx_to_name(i)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
700
            hd = sha1s[version].hexdigest()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
701
            expected = self._sha1s[i]
0.1.91 by Martin Pool
Update Weave.check
702
            if hd != expected:
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
703
                raise errors.WeaveInvalidChecksum(
704
                        "mismatched sha1 for version %s: "
705
                        "got %s, expected %s"
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
706
                        % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
707
881 by Martin Pool
- faster weave extraction
708
        # TODO: check insertions are properly nested, that there are
709
        # no lines outside of insertion blocks, that deletions are
710
        # properly paired, etc.
711
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.
712
    def _join(self, other, pb, msg, version_ids):
713
        """Worker routine for join()."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
714
        if not other.versions():
1393.1.48 by Martin Pool
- Add stub Weave.join() method
715
            return          # nothing to update, easy
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
716
717
        if version_ids:
718
            for version_id in version_ids:
719
                if not self.has_version(version_id):
720
                    raise RevisionNotPresent(version_id, self._weave_name)
721
        assert version_ids == None
722
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
723
        # two loops so that we do not change ourselves before verifying it
724
        # will be ok
1393.1.50 by Martin Pool
- more development of Weave.join()
725
        # 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
726
        names_to_join = []
727
        processed = 0
1393.1.50 by Martin Pool
- more development of Weave.join()
728
        for other_idx, name in enumerate(other._names):
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
729
            self._check_version_consistent(other, other_idx, name)
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
730
            sha1 = other._sha1s[other_idx]
731
732
            processed += 1
733
734
            if name in self._name_map:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
735
                idx = self._lookup(name)
736
                n1 = set(map(other._idx_to_name, other._parents[other_idx]))
737
                n2 = set(map(self._idx_to_name, self._parents[idx]))
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
738
                if sha1 ==  self._sha1s[idx] and n1 == n2:
739
                        continue
740
741
            names_to_join.append((other_idx, name))
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
742
1551.3.11 by Aaron Bentley
Merge from Robert
743
        if pb and not msg:
744
            msg = 'weave join'
745
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
746
        merged = 0
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
747
        time0 = time.time()
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
748
        for other_idx, name in names_to_join:
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
749
            # TODO: If all the parents of the other version are already
1393.1.50 by Martin Pool
- more development of Weave.join()
750
            # present then we can avoid some work by just taking the delta
751
            # and adjusting the offsets.
1393.1.51 by Martin Pool
- new Weave.copy()
752
            new_parents = self._imported_parents(other, other_idx)
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
753
            sha1 = other._sha1s[other_idx]
754
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
755
            merged += 1
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
756
1551.3.11 by Aaron Bentley
Merge from Robert
757
            if pb:
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
758
                pb.update(msg, merged, len(names_to_join))
1551.3.11 by Aaron Bentley
Merge from Robert
759
           
1393.1.50 by Martin Pool
- more development of Weave.join()
760
            lines = other.get_lines(other_idx)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
761
            self._add(name, lines, new_parents, sha1)
1393.1.50 by Martin Pool
- more development of Weave.join()
762
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
763
        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.
764
                merged, processed, self._weave_name, time.time()-time0))
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
765
 
1393.1.51 by Martin Pool
- new Weave.copy()
766
    def _imported_parents(self, other, other_idx):
767
        """Return list of parents in self corresponding to indexes in other."""
768
        new_parents = []
769
        for parent_idx in other._parents[other_idx]:
770
            parent_name = other._names[parent_idx]
771
            if parent_name not in self._names:
772
                # should not be possible
773
                raise WeaveError("missing parent {%s} of {%s} in %r" 
774
                                 % (parent_name, other._name_map[other_idx], self))
775
            new_parents.append(self._name_map[parent_name])
776
        return new_parents
777
1393.1.50 by Martin Pool
- more development of Weave.join()
778
    def _check_version_consistent(self, other, other_idx, name):
779
        """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
780
781
        To be consistent it must have:
782
783
         * the same text
784
         * the same direct parents (by name, not index, and disregarding
785
           order)
1393.1.50 by Martin Pool
- more development of Weave.join()
786
        
787
        If present & correct return True;
788
        if not present in self return False; 
789
        if inconsistent raise error."""
790
        this_idx = self._name_map.get(name, -1)
791
        if this_idx != -1:
792
            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.
793
                raise errors.WeaveTextDiffers(name, self, other)
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
794
            self_parents = self._parents[this_idx]
795
            other_parents = other._parents[other_idx]
1551.3.11 by Aaron Bentley
Merge from Robert
796
            n1 = set([self._names[i] for i in self_parents])
797
            n2 = set([other._names[i] for i in other_parents])
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
798
            if n1 != n2:
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
799
                raise WeaveParentMismatch("inconsistent parents "
800
                    "for version {%s}: %s vs %s" % (name, n1, n2))
1393.1.50 by Martin Pool
- more development of Weave.join()
801
            else:
802
                return True         # ok!
803
        else:
804
            return False
918 by Martin Pool
- start doing new weave-merge algorithm
805
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.
806
    @deprecated_method(zero_eight)
1551.3.11 by Aaron Bentley
Merge from Robert
807
    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.
808
        """reweave has been superceded by plain use of join."""
809
        return self.join(other, pb, msg)
810
811
    def _reweave(self, other, pb, msg):
812
        """Reweave self with other - internal helper for join().
1551.3.11 by Aaron Bentley
Merge from Robert
813
814
        :param other: The other weave to merge
815
        :param pb: An optional progress bar, indicating how far done we are
816
        :param msg: An optional message for the progress
817
        """
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.
818
        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
819
        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.
820
            if attr != '_weave_name':
821
                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
822
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
823
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
824
class WeaveFile(Weave):
825
    """A WeaveFile represents a Weave on disk and writes on change."""
826
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
827
    def __init__(self, name, transport, mode=None):
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
828
        super(WeaveFile, self).__init__(name)
829
        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.
830
        self._mode = mode
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
831
        try:
832
            _read_weave_v5(self._transport.get(name), self)
833
        except errors.NoSuchFile:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
834
            # new file, save it
835
            self._save()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
836
837
    def add_lines(self, version_id, parents, lines):
838
        """Add a version and save the weave."""
839
        super(WeaveFile, self).add_lines(version_id, parents, lines)
840
        self._save()
841
1563.2.13 by Robert Collins
InterVersionedFile implemented.
842
    def create_empty(self, name, transport, mode=None):
843
        return WeaveFile(name, transport, mode)
844
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
845
    def _save(self):
846
        """Save the weave."""
847
        sio = StringIO()
848
        write_weave_v5(self, sio)
849
        sio.seek(0)
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
850
        self._transport.put(self._weave_name, sio, self._mode)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
851
852
    def join(self, other, pb=None, msg=None, version_ids=None):
853
        """Join other into self and save."""
854
        super(WeaveFile, self).join(other, pb, msg, version_ids)
855
        self._save()
856
857
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.
858
@deprecated_function(zero_eight)
1551.3.11 by Aaron Bentley
Merge from Robert
859
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.
860
    """reweaving is deprecation, please just use weave.join()."""
861
    _reweave(wa, wb, pb, msg)
862
863
def _reweave(wa, wb, pb=None, msg=None):
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
864
    """Combine two weaves and return the result.
865
866
    This works even if a revision R has different parents in 
867
    wa and wb.  In the resulting weave all the parents are given.
868
869
    This is done by just building up a new weave, maintaining ordering 
870
    of the versions in the two inputs.  More efficient approaches
871
    might be possible but it should only be necessary to do 
872
    this operation rarely, when a new previously ghost version is 
873
    inserted.
1551.3.11 by Aaron Bentley
Merge from Robert
874
875
    :param pb: An optional progress bar, indicating how far done we are
876
    :param msg: An optional message for the progress
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
877
    """
878
    wr = Weave()
879
    ia = ib = 0
880
    queue_a = range(wa.numversions())
881
    queue_b = range(wb.numversions())
882
    # first determine combined parents of all versions
883
    # map from version name -> all parent names
884
    combined_parents = _reweave_parent_graphs(wa, wb)
885
    mutter("combined parents: %r", combined_parents)
1185.16.117 by mbp at sourcefrog
Reweave in topological-sort order.
886
    order = topo_sort(combined_parents.iteritems())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
887
    mutter("order to reweave: %r", order)
1551.3.11 by Aaron Bentley
Merge from Robert
888
889
    if pb and not msg:
890
        msg = 'reweave'
891
892
    for idx, name in enumerate(order):
893
        if pb:
894
            pb.update(msg, idx, len(order))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
895
        if name in wa._name_map:
896
            lines = wa.get_lines(name)
897
            if name in wb._name_map:
1551.3.11 by Aaron Bentley
Merge from Robert
898
                lines_b = wb.get_lines(name)
899
                if lines != lines_b:
900
                    mutter('Weaves differ on content. rev_id {%s}', name)
901
                    mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
902
                    import difflib
903
                    lines = list(difflib.unified_diff(lines, lines_b,
904
                            wa._weave_name, wb._weave_name))
905
                    mutter('lines:\n%s', ''.join(lines))
906
                    raise errors.WeaveTextDiffers(name, wa, wb)
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
907
        else:
908
            lines = wb.get_lines(name)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
909
        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
910
    return wr
911
912
def _reweave_parent_graphs(wa, wb):
913
    """Return combined parent ancestry for two weaves.
914
    
915
    Returned as a list of (version_name, set(parent_names))"""
916
    combined = {}
917
    for weave in [wa, wb]:
918
        for idx, name in enumerate(weave._names):
919
            p = combined.setdefault(name, set())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
920
            p.update(map(weave._idx_to_name, weave._parents[idx]))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
921
    return combined
922
923
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
924
def weave_toc(w):
925
    """Show the weave's table-of-contents"""
1083 by Martin Pool
- add space to store revision-id in weave files
926
    print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
927
    for i in (6, 50, 10, 10):
870 by Martin Pool
- better weave info display
928
        print '-' * i,
929
    print
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
930
    for i in range(w.numversions()):
0.1.91 by Martin Pool
Update Weave.check
931
        sha1 = w._sha1s[i]
1083 by Martin Pool
- add space to store revision-id in weave files
932
        name = w._names[i]
933
        parent_str = ' '.join(map(str, w._parents[i]))
934
        print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
0.1.88 by Martin Pool
Add weave info command.
935
869 by Martin Pool
- more weave.py command line options
936
937
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
938
def weave_stats(weave_file, pb):
947 by Martin Pool
- new 'weave stats' command
939
    from bzrlib.weavefile import read_weave
940
941
    wf = file(weave_file, 'rb')
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
942
    w = read_weave(wf, WeaveVersionedFile)
947 by Martin Pool
- new 'weave stats' command
943
    # FIXME: doesn't work on pipes
944
    weave_size = wf.tell()
945
946
    total = 0
947
    vers = len(w)
948
    for i in range(vers):
949
        pb.update('checking sizes', i, vers)
1393.1.24 by Martin Pool
- slight speedup for weave stats
950
        for origin, lineno, line in w._extract([i]):
947 by Martin Pool
- new 'weave stats' command
951
            total += len(line)
952
953
    pb.clear()
954
955
    print 'versions          %9d' % vers
956
    print 'weave file        %9d bytes' % weave_size
957
    print 'total contents    %9d bytes' % total
958
    print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
959
    if vers:
960
        avg = total/vers
961
        print 'average size      %9d bytes' % avg
962
        print 'relative size     %9.2fx' % (float(weave_size) / float(avg))
947 by Martin Pool
- new 'weave stats' command
963
964
869 by Martin Pool
- more weave.py command line options
965
def usage():
871 by Martin Pool
- add command for merge-based weave
966
    print """bzr weave tool
967
968
Experimental tool for weave algorithm.
969
869 by Martin Pool
- more weave.py command line options
970
usage:
971
    weave init WEAVEFILE
972
        Create an empty weave file
973
    weave get WEAVEFILE VERSION
974
        Write out specified version.
975
    weave check WEAVEFILE
976
        Check consistency of all versions.
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
977
    weave toc WEAVEFILE
869 by Martin Pool
- more weave.py command line options
978
        Display table of contents.
1084 by Martin Pool
- weave add command needs to take a symbolic name too
979
    weave add WEAVEFILE NAME [BASE...] < NEWTEXT
869 by Martin Pool
- more weave.py command line options
980
        Add NEWTEXT, with specified parent versions.
981
    weave annotate WEAVEFILE VERSION
982
        Display origin of each line.
983
    weave merge WEAVEFILE VERSION1 VERSION2 > OUT
984
        Auto-merge two versions and display conflicts.
1329 by Martin Pool
- add diff command to weave utility
985
    weave diff WEAVEFILE VERSION1 VERSION2 
986
        Show differences between two versions.
871 by Martin Pool
- add command for merge-based weave
987
988
example:
989
990
    % weave init foo.weave
991
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
992
    % weave add foo.weave ver0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
993
    added version 0
994
995
    (create updated version)
996
    % vi foo.txt
997
    % weave get foo.weave 0 | diff -u - foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
998
    % weave add foo.weave ver1 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
999
    added version 1
1000
1001
    % weave get foo.weave 0 > foo.txt       (create forked version)
1002
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1003
    % weave add foo.weave ver2 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1004
    added version 2
1005
1006
    % weave merge foo.weave 1 2 > foo.txt   (merge them)
1007
    % vi foo.txt                            (resolve conflicts)
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1008
    % weave add foo.weave merged 1 2 < foo.txt     (commit merged version)     
871 by Martin Pool
- add command for merge-based weave
1009
    
869 by Martin Pool
- more weave.py command line options
1010
"""
0.1.88 by Martin Pool
Add weave info command.
1011
    
1012
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1013
1014
def main(argv):
1015
    import sys
1016
    import os
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1017
    try:
1018
        import bzrlib
1019
    except ImportError:
1020
        # in case we're run directly from the subdirectory
1021
        sys.path.append('..')
1022
        import bzrlib
1336 by Martin Pool
- tidy up import
1023
    from bzrlib.weavefile import write_weave, read_weave
894 by Martin Pool
- small optimization for weave extract
1024
    from bzrlib.progress import ProgressBar
1025
1078 by Martin Pool
- use psyco for weave if possible
1026
    try:
1027
        import psyco
1028
        psyco.full()
1029
    except ImportError:
1030
        pass
894 by Martin Pool
- small optimization for weave extract
1031
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1032
    if len(argv) < 2:
1033
        usage()
1034
        return 0
1035
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1036
    cmd = argv[1]
869 by Martin Pool
- more weave.py command line options
1037
1038
    def readit():
1039
        return read_weave(file(argv[2], 'rb'))
1040
    
1041
    if cmd == 'help':
1042
        usage()
1043
    elif cmd == 'add':
1044
        w = readit()
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1045
        # at the moment, based on everything in the file
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1046
        name = argv[3]
1047
        parents = map(int, argv[4:])
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1048
        lines = sys.stdin.readlines()
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1049
        ver = w.add(name, parents, lines)
869 by Martin Pool
- more weave.py command line options
1050
        write_weave(w, file(argv[2], 'wb'))
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1051
        print 'added version %r %d' % (name, ver)
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1052
    elif cmd == 'init':
1053
        fn = argv[2]
1054
        if os.path.exists(fn):
1055
            raise IOError("file exists")
1056
        w = Weave()
869 by Martin Pool
- more weave.py command line options
1057
        write_weave(w, file(fn, 'wb'))
1058
    elif cmd == 'get': # get one version
1059
        w = readit()
0.1.94 by Martin Pool
Fix get_iter call
1060
        sys.stdout.writelines(w.get_iter(int(argv[3])))
869 by Martin Pool
- more weave.py command line options
1061
        
1329 by Martin Pool
- add diff command to weave utility
1062
    elif cmd == 'diff':
1063
        from difflib import unified_diff
1064
        w = readit()
1065
        fn = argv[2]
1066
        v1, v2 = map(int, argv[3:5])
1067
        lines1 = w.get(v1)
1068
        lines2 = w.get(v2)
1069
        diff_gen = unified_diff(lines1, lines2,
1070
                                '%s version %d' % (fn, v1),
1071
                                '%s version %d' % (fn, v2))
1072
        sys.stdout.writelines(diff_gen)
1073
            
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1074
    elif cmd == 'annotate':
869 by Martin Pool
- more weave.py command line options
1075
        w = readit()
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1076
        # newline is added to all lines regardless; too hard to get
1077
        # reasonable formatting otherwise
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1078
        lasto = None
1079
        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.
1080
            text = text.rstrip('\r\n')
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1081
            if origin == lasto:
1082
                print '      | %s' % (text)
1083
            else:
1084
                print '%5d | %s' % (origin, text)
1085
                lasto = origin
871 by Martin Pool
- add command for merge-based weave
1086
                
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1087
    elif cmd == 'toc':
1088
        weave_toc(readit())
947 by Martin Pool
- new 'weave stats' command
1089
1090
    elif cmd == 'stats':
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1091
        weave_stats(argv[2], ProgressBar())
871 by Martin Pool
- add command for merge-based weave
1092
        
0.1.91 by Martin Pool
Update Weave.check
1093
    elif cmd == 'check':
869 by Martin Pool
- more weave.py command line options
1094
        w = readit()
894 by Martin Pool
- small optimization for weave extract
1095
        pb = ProgressBar()
1096
        w.check(pb)
1097
        pb.clear()
938 by Martin Pool
- various optimizations to weave add code
1098
        print '%d versions ok' % w.numversions()
871 by Martin Pool
- add command for merge-based weave
1099
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
1100
    elif cmd == 'inclusions':
1101
        w = readit()
1102
        print ' '.join(map(str, w.inclusions([int(argv[3])])))
1103
1104
    elif cmd == 'parents':
1105
        w = readit()
944 by Martin Pool
- refactor member names in Weave code
1106
        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
1107
918 by Martin Pool
- start doing new weave-merge algorithm
1108
    elif cmd == 'plan-merge':
1109
        w = readit()
1110
        for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
919 by Martin Pool
- more development of weave-merge
1111
            if line:
1112
                print '%14s | %s' % (state, line),
918 by Martin Pool
- start doing new weave-merge algorithm
1113
871 by Martin Pool
- add command for merge-based weave
1114
    elif cmd == 'merge':
919 by Martin Pool
- more development of weave-merge
1115
        w = readit()
1116
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1117
        sys.stdout.writelines(w.weave_merge(p))
1118
            
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1119
    else:
1120
        raise ValueError('unknown command %r' % cmd)
1121
    
1122
1076 by Martin Pool
- add code to run weave utility under profiler
1123
1124
def profile_main(argv): 
1125
    import tempfile, hotshot, hotshot.stats
1126
1127
    prof_f = tempfile.NamedTemporaryFile()
1128
1129
    prof = hotshot.Profile(prof_f.name)
1130
1131
    ret = prof.runcall(main, argv)
1132
    prof.close()
1133
1134
    stats = hotshot.stats.load(prof_f.name)
1135
    #stats.strip_dirs()
1079 by Martin Pool
- weavefile can just use lists for read-in ancestry, not frozensets
1136
    stats.sort_stats('cumulative')
1076 by Martin Pool
- add code to run weave utility under profiler
1137
    ## XXX: Might like to write to stderr or the trace file instead but
1138
    ## print_stats seems hardcoded to stdout
1139
    stats.print_stats(20)
1140
            
1141
    return ret
1142
1143
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
1144
def lsprofile_main(argv): 
1145
    from bzrlib.lsprof import profile
1146
    ret,stats = profile(main, argv)
1147
    stats.sort()
1148
    stats.pprint()
1149
    return ret
1150
1151
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1152
if __name__ == '__main__':
1153
    import sys
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1154
    if '--profile' in sys.argv:
1078 by Martin Pool
- use psyco for weave if possible
1155
        args = sys.argv[:]
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1156
        args.remove('--profile')
1078 by Martin Pool
- use psyco for weave if possible
1157
        sys.exit(profile_main(args))
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
1158
    elif '--lsprof' in sys.argv:
1159
        args = sys.argv[:]
1160
        args.remove('--lsprof')
1161
        sys.exit(lsprofile_main(args))
1078 by Martin Pool
- use psyco for weave if possible
1162
    else:
1163
        sys.exit(main(sys.argv))
1076 by Martin Pool
- add code to run weave utility under profiler
1164
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1165
1166
class InterWeave(InterVersionedFile):
1167
    """Optimised code paths for weave to weave operations."""
1168
    
1169
    _matching_file_factory = staticmethod(WeaveFile)
1170
    
1171
    @staticmethod
1172
    def is_compatible(source, target):
1173
        """Be compatible with weaves."""
1174
        try:
1175
            return (isinstance(source, Weave) and
1176
                    isinstance(target, Weave))
1177
        except AttributeError:
1178
            return False
1179
1180
    def join(self, pb=None, msg=None, version_ids=None):
1181
        """See InterVersionedFile.join."""
1182
        try:
1183
            self.target._join(self.source, pb, msg, version_ids)
1184
        except errors.WeaveParentMismatch:
1185
            self.target._reweave(self.source, pb, msg)
1186
1187
1188
InterVersionedFile.register_optimiser(InterWeave)