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