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