/brz/remove-bazaar

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