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