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