~bzr-pqm/bzr/bzr.dev

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