/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
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
9
#
0.1.33 by Martin Pool
add gpl text
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
14
#
0.1.33 by Martin Pool
add gpl text
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,
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
30
# rather than being split up in some other way.  We could accommodate
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
31
# binaries, perhaps by naively splitting on \n or perhaps using
32
# something like a rolling checksum.
33
0.1.85 by Martin Pool
doc
34
# TODO: End marker for each version so we can stop reading?
0.1.69 by Martin Pool
Simple text-based format for storing weaves, cleaner than
35
36
# TODO: Check that no insertion occurs inside a deletion that was
37
# active in the version of the insertion.
38
912 by Martin Pool
- update todos for weave
39
# TODO: In addition to the SHA-1 check, perhaps have some code that
40
# checks structural constraints of the weave: ie that insertions are
41
# properly nested, that there is no text outside of an insertion, that
42
# insertions or deletions are not repeated, etc.
0.1.85 by Martin Pool
doc
43
918 by Martin Pool
- start doing new weave-merge algorithm
44
# TODO: Parallel-extract that passes back each line along with a
45
# description of which revisions include it.  Nice for checking all
1393.1.25 by Martin Pool
- comments in weave code
46
# shas or calculating stats in parallel.
918 by Martin Pool
- start doing new weave-merge algorithm
47
1082 by Martin Pool
- lift imports
48
# TODO: Using a single _extract routine and then processing the output
49
# is probably inefficient.  It's simple enough that we can afford to
50
# have slight specializations for different ways its used: annotate,
51
# basis for add, get, etc.
52
1185.16.13 by Martin Pool
todo
53
# TODO: Probably the API should work only in names to hide the integer
54
# indexes from the user.
1083 by Martin Pool
- add space to store revision-id in weave files
55
1328 by Martin Pool
- slight refactoring of weave code
56
# TODO: Is there any potential performance win by having an add()
57
# variant that is passed a pre-cooked version of the single basis
58
# version?
59
1185.16.13 by Martin Pool
todo
60
# TODO: Reweave can possibly be made faster by remembering diffs
61
# where the basis and destination are unchanged.
62
63
# FIXME: Sometimes we will be given a parents list for a revision
64
# that includes some redundant parents (i.e. already a parent of 
65
# something in the list.)  We should eliminate them.  This can 
66
# be done fairly efficiently because the sequence numbers constrain
67
# the possible relationships.
1083 by Martin Pool
- add space to store revision-id in weave files
68
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
69
# FIXME: the conflict markers should be *7* characters
1082 by Martin Pool
- lift imports
70
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
71
from copy import copy
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
72
from cStringIO import StringIO
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
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
76
import warnings
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
77
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
78
from bzrlib import (
79
    progress,
80
    )
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
81
from bzrlib.trace import mutter
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
82
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
83
        RevisionAlreadyPresent,
84
        RevisionNotPresent,
85
        WeaveRevisionAlreadyPresent,
86
        WeaveRevisionNotPresent,
87
        )
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
88
import bzrlib.errors as errors
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
89
from bzrlib.osutils import sha_strings
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
90
import bzrlib.patiencediff
1185.16.117 by mbp at sourcefrog
Reweave in topological-sort order.
91
from bzrlib.tsort import topo_sort
1563.2.13 by Robert Collins
InterVersionedFile implemented.
92
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.
93
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.
94
95
96
class Weave(VersionedFile):
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
97
    """weave - versioned text file storage.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
98
    
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
99
    A Weave manages versions of line-based text files, keeping track
100
    of the originating version for each line.
101
102
    To clients the "lines" of the file are represented as a list of strings.
103
    These strings  will typically have terminal newline characters, but
104
    this is not required.  In particular files commonly do not have a newline
105
    at the end of the file.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
106
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
107
    Texts can be identified in either of two ways:
108
109
    * a nonnegative index number.
110
1324 by Martin Pool
- doc
111
    * a version-id string.
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
112
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
113
    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.
114
    the version-id is used to reference it in the larger world.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
115
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
116
    The weave is represented as a list mixing edit instructions and
944 by Martin Pool
- refactor member names in Weave code
117
    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
118
    unicode), or a tuple.  If a string, it means that the given line
119
    should be output in the currently active revisions.
120
121
    If a tuple, it gives a processing instruction saying in which
122
    revisions the enclosed lines are active.  The tuple has the form
123
    (instruction, version).
124
125
    The instruction can be '{' or '}' for an insertion block, and '['
126
    and ']' for a deletion block respectively.  The version is the
0.1.45 by Martin Pool
doc
127
    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
128
    and inserts.  For '}', the end of an insertion, there is no
129
    version parameter because it always closes the most recently
130
    opened insertion.
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
131
0.1.41 by Martin Pool
Doc
132
    Constraints/notes:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
133
134
    * A later version can delete lines that were introduced by any
135
      number of ancestor versions; this implies that deletion
136
      instructions can span insertion blocks without regard to the
137
      insertion block's nesting.
138
0.1.41 by Martin Pool
Doc
139
    * Similarly, deletions need not be properly nested with regard to
140
      each other, because they might have been generated by
141
      independent revisions.
142
0.1.45 by Martin Pool
doc
143
    * Insertions are always made by inserting a new bracketed block
144
      into a single point in the previous weave.  This implies they
145
      can nest but not overlap, and the nesting must always have later
146
      insertions on the inside.
147
0.1.41 by Martin Pool
Doc
148
    * It doesn't seem very useful to have an active insertion
149
      inside an inactive insertion, but it might happen.
0.1.45 by Martin Pool
doc
150
      
0.1.41 by Martin Pool
Doc
151
    * Therefore, all instructions are always"considered"; that
152
      is passed onto and off the stack.  An outer inactive block
153
      doesn't disable an inner block.
154
155
    * Lines are enabled if the most recent enclosing insertion is
156
      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
157
0.1.49 by Martin Pool
Add another constraint: revisions should not delete text that they
158
    * There is no point having a deletion directly inside its own
159
      insertion; you might as well just not write it.  And there
160
      should be no way to get an earlier version deleting a later
161
      version.
162
944 by Martin Pool
- refactor member names in Weave code
163
    _weave
164
        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.
165
944 by Martin Pool
- refactor member names in Weave code
166
    _parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
167
        List of parents, indexed by version number.
168
        It is only necessary to store the minimal set of parents for
169
        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
170
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
171
    _sha1s
1083 by Martin Pool
- add space to store revision-id in weave files
172
        List of hex SHA-1 of each version.
173
174
    _names
175
        List of symbolic names for each version.  Each should be unique.
176
177
    _name_map
178
        For each name, the version number.
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
179
180
    _weave_name
181
        Descriptive name of this weave; typically the filename if known.
182
        Set by read_weave.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
183
    """
938 by Martin Pool
- various optimizations to weave add code
184
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
185
    __slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
1185.81.6 by John Arbash Meinel
Adding an optional matcher class, which allows to use cdvdifflib matcher.
186
                 '_weave_name', '_matcher']
938 by Martin Pool
- various optimizations to weave add code
187
    
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
188
    def __init__(self, weave_name=None, access_mode='w', matcher=None, get_scope=None):
3316.2.5 by Robert Collins
Review feedback.
189
        """Create a weave.
190
191
        :param get_scope: A callable that returns an opaque object to be used
192
            for detecting when this weave goes out of scope (should stop
193
            answering requests or allowing mutation).
194
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
195
        super(Weave, self).__init__(access_mode)
944 by Martin Pool
- refactor member names in Weave code
196
        self._weave = []
197
        self._parents = []
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
198
        self._sha1s = []
1083 by Martin Pool
- add space to store revision-id in weave files
199
        self._names = []
200
        self._name_map = {}
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
201
        self._weave_name = weave_name
1185.81.6 by John Arbash Meinel
Adding an optional matcher class, which allows to use cdvdifflib matcher.
202
        if matcher is None:
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
203
            self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
1185.81.6 by John Arbash Meinel
Adding an optional matcher class, which allows to use cdvdifflib matcher.
204
        else:
205
            self._matcher = matcher
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
206
        if get_scope is None:
207
            get_scope = lambda:None
3316.2.5 by Robert Collins
Review feedback.
208
        self._get_scope = get_scope
209
        self._scope = get_scope()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
210
        self._access_mode = access_mode
0.1.60 by Martin Pool
Weave eq and ne methods
211
1185.35.41 by Aaron Bentley
Added repr for Weave
212
    def __repr__(self):
213
        return "Weave(%r)" % self._weave_name
214
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
215
    def _check_write_ok(self):
216
        """Is the versioned file marked as 'finished' ? Raise if it is."""
3316.2.5 by Robert Collins
Review feedback.
217
        if self._get_scope() != self._scope:
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
218
            raise errors.OutSideTransaction()
219
        if self._access_mode != 'w':
220
            raise errors.ReadOnlyObjectDirtiedError(self)
221
1393.1.51 by Martin Pool
- new Weave.copy()
222
    def copy(self):
223
        """Return a deep copy of self.
224
        
225
        The copy can be modified without affecting the original weave."""
226
        other = Weave()
227
        other._weave = self._weave[:]
228
        other._parents = self._parents[:]
229
        other._sha1s = self._sha1s[:]
230
        other._names = self._names[:]
231
        other._name_map = self._name_map.copy()
232
        other._weave_name = self._weave_name
233
        return other
234
0.1.60 by Martin Pool
Weave eq and ne methods
235
    def __eq__(self, other):
236
        if not isinstance(other, Weave):
237
            return False
944 by Martin Pool
- refactor member names in Weave code
238
        return self._parents == other._parents \
1083 by Martin Pool
- add space to store revision-id in weave files
239
               and self._weave == other._weave \
240
               and self._sha1s == other._sha1s 
0.1.60 by Martin Pool
Weave eq and ne methods
241
    
242
    def __ne__(self, other):
243
        return not self.__eq__(other)
244
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
245
    def _idx_to_name(self, version):
246
        return self._names[version]
247
248
    def _lookup(self, name):
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
249
        """Convert symbolic version name to index."""
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
250
        self.check_not_reserved_id(name)
1083 by Martin Pool
- add space to store revision-id in weave files
251
        try:
252
            return self._name_map[name]
253
        except KeyError:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
254
            raise RevisionNotPresent(name, self._weave_name)
255
256
    def versions(self):
257
        """See VersionedFile.versions."""
1185.16.105 by mbp at sourcefrog
- fix Weave.names()
258
        return self._names[:]
1229 by Martin Pool
- new Weave.idx_to_name and .parents methods
259
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
260
    def has_version(self, version_id):
261
        """See VersionedFile.has_version."""
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
262
        return (version_id in self._name_map)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
263
264
    __contains__ = has_version
265
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
266
    def get_parent_map(self, version_ids):
267
        """See VersionedFile.get_parent_map."""
268
        result = {}
269
        for version_id in version_ids:
270
            try:
271
                result[version_id] = tuple(
272
                    map(self._idx_to_name, self._parents[self._lookup(version_id)]))
273
            except RevisionNotPresent:
274
                pass
275
        return result
276
277
    def get_parents_with_ghosts(self, version_id):
278
        raise NotImplementedError(self.get_parents_with_ghosts)
1229 by Martin Pool
- new Weave.idx_to_name and .parents methods
279
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
280
    def _check_repeated_add(self, name, parents, text, sha1):
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
281
        """Check that a duplicated add is OK.
282
283
        If it is, return the (old) index; otherwise raise an exception.
284
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
285
        idx = self._lookup(name)
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
286
        if sorted(self._parents[idx]) != sorted(parents) \
287
            or sha1 != self._sha1s[idx]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
288
            raise RevisionAlreadyPresent(name, self._weave_name)
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
289
        return idx
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
290
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
291
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
292
       left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
293
        """See VersionedFile.add_lines."""
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
294
        idx = self._add(version_id, lines, map(self._lookup, parents),
295
            nostore_sha=nostore_sha)
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
296
        return sha_strings(lines), sum(map(len, lines)), idx
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
297
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
298
    def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
299
        """Add a single text on top of the weave.
0.1.36 by Martin Pool
doc
300
  
0.1.26 by Martin Pool
Refactor parameters to add command
301
        Returns the index number of the newly added version.
302
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
303
        version_id
1083 by Martin Pool
- add space to store revision-id in weave files
304
            Symbolic name for this version.
305
            (Typically the revision-id of the revision that added it.)
306
0.1.26 by Martin Pool
Refactor parameters to add command
307
        parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
308
            List or set of direct parent version numbers.
309
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
310
        lines
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
311
            Sequence of lines to be added in the new version.
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
312
313
        :param nostore_sha: See VersionedFile.add_lines.
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
314
        """
1666.1.6 by Robert Collins
Make knit the default format.
315
        self._check_lines_not_unicode(lines)
316
        self._check_lines_are_lines(lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
317
        if not sha1:
318
            sha1 = sha_strings(lines)
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
319
        if sha1 == nostore_sha:
320
            raise errors.ExistingContent
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
321
        if version_id in self._name_map:
322
            return self._check_repeated_add(version_id, parents, lines, sha1)
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
323
938 by Martin Pool
- various optimizations to weave add code
324
        self._check_versions(parents)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
325
        ## self._check_lines(lines)
944 by Martin Pool
- refactor member names in Weave code
326
        new_version = len(self._parents)
0.1.5 by Martin Pool
Add test for storing two text versions.
327
1083 by Martin Pool
- add space to store revision-id in weave files
328
        # if we abort after here the (in-memory) weave will be corrupt because only
329
        # some fields are updated
1570.1.12 by Robert Collins
Add a FIXME for weave.add and remove some extraneous whitespace.
330
        # XXX: FIXME implement a succeed-or-fail of the rest of this routine.
331
        #      - Robert Collins 20060226
1083 by Martin Pool
- add space to store revision-id in weave files
332
        self._parents.append(parents[:])
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
333
        self._sha1s.append(sha1)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
334
        self._names.append(version_id)
335
        self._name_map[version_id] = new_version
938 by Martin Pool
- various optimizations to weave add code
336
337
            
338
        if not parents:
339
            # special case; adding with no parents revision; can do
340
            # this more quickly by just appending unconditionally.
341
            # even more specially, if we're adding an empty text we
342
            # need do nothing at all.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
343
            if lines:
944 by Martin Pool
- refactor member names in Weave code
344
                self._weave.append(('{', new_version))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
345
                self._weave.extend(lines)
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
346
                self._weave.append(('}', None))
938 by Martin Pool
- various optimizations to weave add code
347
            return new_version
348
941 by Martin Pool
- allow for parents specified to Weave.add to be a set
349
        if len(parents) == 1:
350
            pv = list(parents)[0]
351
            if sha1 == self._sha1s[pv]:
352
                # special case: same as the single parent
353
                return new_version
938 by Martin Pool
- various optimizations to weave add code
354
            
355
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
356
        ancestors = self._inclusions(parents)
938 by Martin Pool
- various optimizations to weave add code
357
944 by Martin Pool
- refactor member names in Weave code
358
        l = self._weave
938 by Martin Pool
- various optimizations to weave add code
359
360
        # basis a list of (origin, lineno, line)
361
        basis_lineno = []
362
        basis_lines = []
363
        for origin, lineno, line in self._extract(ancestors):
364
            basis_lineno.append(lineno)
365
            basis_lines.append(line)
366
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
367
        # another small special case: a merge, producing the same text
368
        # as auto-merge
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
369
        if lines == basis_lines:
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
370
            return new_version
938 by Martin Pool
- various optimizations to weave add code
371
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
372
        # add a sentinel, because we can also match against the final line
944 by Martin Pool
- refactor member names in Weave code
373
        basis_lineno.append(len(self._weave))
938 by Martin Pool
- various optimizations to weave add code
374
375
        # XXX: which line of the weave should we really consider
376
        # matches the end of the file?  the current code says it's the
377
        # last line of the weave?
378
379
        #print 'basis_lines:', basis_lines
380
        #print 'new_lines:  ', lines
381
1185.81.17 by Aaron Bentley
Merged latest bzr.dev
382
        s = self._matcher(None, basis_lines, lines)
938 by Martin Pool
- various optimizations to weave add code
383
384
        # offset gives the number of lines that have been inserted
385
        # into the weave up to the current point; if the original edit instruction
386
        # says to change line A then we actually change (A+offset)
387
        offset = 0
388
389
        for tag, i1, i2, j1, j2 in s.get_opcodes():
390
            # i1,i2 are given in offsets within basis_lines; we need to map them
391
            # back to offsets within the entire weave
392
            #print 'raw match', tag, i1, i2, j1, j2
393
            if tag == 'equal':
394
                continue
395
            i1 = basis_lineno[i1]
396
            i2 = basis_lineno[i2]
397
            # the deletion and insertion are handled separately.
398
            # first delete the region.
399
            if i1 != i2:
944 by Martin Pool
- refactor member names in Weave code
400
                self._weave.insert(i1+offset, ('[', new_version))
401
                self._weave.insert(i2+offset+1, (']', new_version))
938 by Martin Pool
- various optimizations to weave add code
402
                offset += 2
403
404
            if j1 != j2:
405
                # there may have been a deletion spanning up to
406
                # i2; we want to insert after this region to make sure
407
                # we don't destroy ourselves
408
                i = i2 + offset
944 by Martin Pool
- refactor member names in Weave code
409
                self._weave[i:i] = ([('{', new_version)] 
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
410
                                    + lines[j1:j2] 
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
411
                                    + [('}', None)])
938 by Martin Pool
- various optimizations to weave add code
412
                offset += 2 + (j2 - j1)
413
        return new_version
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
414
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
415
    def _inclusions(self, versions):
893 by Martin Pool
- Refactor weave calculation of inclusions
416
        """Return set of all ancestors of given version(s)."""
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
417
        if not len(versions):
418
            return []
928 by Martin Pool
- go back to using plain builtin set()
419
        i = set(versions)
1328 by Martin Pool
- slight refactoring of weave code
420
        for v in xrange(max(versions), 0, -1):
421
            if v in i:
422
                # include all its parents
423
                i.update(self._parents[v])
424
        return i
425
        ## except IndexError:
426
        ##     raise ValueError("version %d not present in weave" % v)
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
427
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
428
    def get_ancestry(self, version_ids, topo_sorted=True):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
429
        """See VersionedFile.get_ancestry."""
430
        if isinstance(version_ids, basestring):
431
            version_ids = [version_ids]
432
        i = self._inclusions([self._lookup(v) for v in version_ids])
433
        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
434
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
435
    def _check_lines(self, text):
436
        if not isinstance(text, list):
437
            raise ValueError("text should be a list, not %s" % type(text))
438
439
        for l in text:
440
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
441
                raise ValueError("text line should be a string or unicode, not %s"
442
                                 % type(l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
443
        
444
445
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
446
    def _check_versions(self, indexes):
447
        """Check everything in the sequence of indexes is valid"""
448
        for i in indexes:
449
            try:
944 by Martin Pool
- refactor member names in Weave code
450
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
451
            except IndexError:
452
                raise IndexError("invalid version number %r" % i)
453
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
454
    def _compatible_parents(self, my_parents, other_parents):
455
        """During join check that other_parents are joinable with my_parents.
456
457
        Joinable is defined as 'is a subset of' - supersets may require 
458
        regeneration of diffs, but subsets do not.
459
        """
460
        return len(other_parents.difference(my_parents)) == 0
461
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
462
    def annotate(self, version_id):
463
        """Return a list of (version-id, line) tuples for version_id.
0.1.7 by Martin Pool
Add trivial annotate text
464
465
        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.
466
        incls = [self._lookup(version_id)]
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
467
        return [(self._idx_to_name(origin), text) for origin, lineno, text in
468
            self._extract(incls)]
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
469
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
470
    def iter_lines_added_or_present_in_versions(self, version_ids=None,
471
                                                pb=None):
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
472
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
473
        if version_ids is None:
474
            version_ids = self.versions()
475
        version_ids = set(version_ids)
476
        for lineno, inserted, deletes, line in self._walk_internal(version_ids):
477
            # if inserted not in version_ids then it was inserted before the
478
            # versions we care about, but because weaves cannot represent ghosts
479
            # properly, we do not filter down to that
480
            # if inserted not in version_ids: continue
481
            if line[-1] != '\n':
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
482
                yield line + '\n', inserted
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
483
            else:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
484
                yield line, inserted
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
485
486
    def _walk_internal(self, version_ids=None):
487
        """Helper method for weave actions."""
918 by Martin Pool
- start doing new weave-merge algorithm
488
        
489
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
490
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
491
492
        lineno = 0         # line of weave, 0-based
493
944 by Martin Pool
- refactor member names in Weave code
494
        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.
495
            if l.__class__ == tuple:
918 by Martin Pool
- start doing new weave-merge algorithm
496
                c, v = l
497
                isactive = None
498
                if c == '{':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
499
                    istack.append(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
500
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
501
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
502
                elif c == '[':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
503
                    dset.add(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
504
                elif c == ']':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
505
                    dset.remove(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
506
                else:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
507
                    raise WeaveFormatError('unexpected instruction %r' % v)
918 by Martin Pool
- start doing new weave-merge algorithm
508
            else:
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
509
                yield lineno, istack[-1], frozenset(dset), l
918 by Martin Pool
- start doing new weave-merge algorithm
510
            lineno += 1
511
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
512
        if istack:
513
            raise WeaveFormatError("unclosed insertion blocks "
514
                    "at end of weave: %s" % istack)
515
        if dset:
516
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
517
                                   % dset)
918 by Martin Pool
- start doing new weave-merge algorithm
518
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
519
    def plan_merge(self, ver_a, ver_b):
520
        """Return pseudo-annotation indicating how the two versions merge.
521
522
        This is computed between versions a and b and their common
523
        base.
524
525
        Weave lines present in none of them are skipped entirely.
526
        """
527
        inc_a = set(self.get_ancestry([ver_a]))
528
        inc_b = set(self.get_ancestry([ver_b]))
529
        inc_c = inc_a & inc_b
530
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
531
        for lineno, insert, deleteset, line in self._walk_internal([ver_a, ver_b]):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
532
            if deleteset & inc_c:
533
                # killed in parent; can't be in either a or b
534
                # not relevant to our work
535
                yield 'killed-base', line
536
            elif insert in inc_c:
537
                # was inserted in base
538
                killed_a = bool(deleteset & inc_a)
539
                killed_b = bool(deleteset & inc_b)
540
                if killed_a and killed_b:
541
                    yield 'killed-both', line
542
                elif killed_a:
543
                    yield 'killed-a', line
544
                elif killed_b:
545
                    yield 'killed-b', line
546
                else:
547
                    yield 'unchanged', line
548
            elif insert in inc_a:
549
                if deleteset & inc_a:
550
                    yield 'ghost-a', line
551
                else:
552
                    # new in A; not in B
553
                    yield 'new-a', line
554
            elif insert in inc_b:
555
                if deleteset & inc_b:
556
                    yield 'ghost-b', line
557
                else:
558
                    yield 'new-b', line
559
            else:
560
                # not in either revision
561
                yield 'irrelevant', line
562
563
        yield 'unchanged', ''           # terminator
564
893 by Martin Pool
- Refactor weave calculation of inclusions
565
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
566
        """Yield annotation of lines in included set.
567
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
568
        Yields a sequence of tuples (origin, lineno, text), where
569
        origin is the origin version, lineno the index in the weave,
570
        and text the text of the line.
571
0.1.20 by Martin Pool
Factor out Knit.extract() method
572
        The set typically but not necessarily corresponds to a version.
573
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
574
        for i in versions:
575
            if not isinstance(i, int):
576
                raise ValueError(i)
577
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
578
        included = self._inclusions(versions)
881 by Martin Pool
- faster weave extraction
579
580
        istack = []
1596.2.25 by Robert Collins
Weave._extract should be faster
581
        iset = set()
928 by Martin Pool
- go back to using plain builtin set()
582
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
583
584
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
585
894 by Martin Pool
- small optimization for weave extract
586
        isactive = None
0.1.85 by Martin Pool
doc
587
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
588
        result = []
589
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
590
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
591
1596.2.25 by Robert Collins
Weave._extract should be faster
592
        # wow. 
593
        #  449       0   4474.6820   2356.5590   bzrlib.weave:556(_extract)
594
        #  +285282   0   1676.8040   1676.8040   +<isinstance>
595
        # 1.6 seconds in 'isinstance'.
596
        # changing the first isinstance:
597
        #  449       0   2814.2660   1577.1760   bzrlib.weave:556(_extract)
598
        #  +140414   0    762.8050    762.8050   +<isinstance>
599
        # note that the inline time actually dropped (less function calls)
600
        # and total processing time was halved.
601
        # we're still spending ~1/4 of the method in isinstance though.
602
        # so lets hard code the acceptable string classes we expect:
603
        #  449       0   1202.9420    786.2930   bzrlib.weave:556(_extract)
604
        # +71352     0    377.5560    377.5560   +<method 'append' of 'list' 
605
        #                                          objects>
606
        # yay, down to ~1/4 the initial extract time, and our inline time
607
        # has shrunk again, with isinstance no longer dominating.
608
        # tweaking the stack inclusion test to use a set gives:
609
        #  449       0   1122.8030    713.0080   bzrlib.weave:556(_extract)
610
        # +71352     0    354.9980    354.9980   +<method 'append' of 'list' 
611
        #                                          objects>
612
        # - a 5% win, or possibly just noise. However with large istacks that
613
        # 'in' test could dominate, so I'm leaving this change in place -
614
        # when its fast enough to consider profiling big datasets we can review.
615
616
              
617
             
618
944 by Martin Pool
- refactor member names in Weave code
619
        for l in self._weave:
1596.2.25 by Robert Collins
Weave._extract should be faster
620
            if l.__class__ == tuple:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
621
                c, v = l
894 by Martin Pool
- small optimization for weave extract
622
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
623
                if c == '{':
624
                    istack.append(v)
1596.2.25 by Robert Collins
Weave._extract should be faster
625
                    iset.add(v)
891 by Martin Pool
- fix up refactoring of weave
626
                elif c == '}':
1596.2.25 by Robert Collins
Weave._extract should be faster
627
                    iset.remove(istack.pop())
891 by Martin Pool
- fix up refactoring of weave
628
                elif c == '[':
629
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
630
                        dset.add(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
631
                elif c == ']':
891 by Martin Pool
- fix up refactoring of weave
632
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
633
                        dset.remove(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
634
                else:
635
                    raise AssertionError()
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
636
            else:
894 by Martin Pool
- small optimization for weave extract
637
                if isactive is None:
638
                    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
639
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
640
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
641
            lineno += 1
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
642
        if istack:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
643
            raise WeaveFormatError("unclosed insertion blocks "
644
                    "at end of weave: %s" % istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
645
        if dset:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
646
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
647
                                   % dset)
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
648
        return result
649
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
650
    def _maybe_lookup(self, name_or_index):
651
        """Convert possible symbolic name to index, or pass through indexes.
652
        
653
        NOT FOR PUBLIC USE.
654
        """
655
        if isinstance(name_or_index, (int, long)):
656
            return name_or_index
657
        else:
658
            return self._lookup(name_or_index)
659
660
    def get_lines(self, version_id):
661
        """See VersionedFile.get_lines()."""
1596.2.30 by Robert Collins
Unbreak backwards compatability on weave.get_lines.
662
        int_index = self._maybe_lookup(version_id)
1596.2.29 by Robert Collins
Make weave.get_lines faster.
663
        result = [line for (origin, lineno, line) in self._extract([int_index])]
664
        expected_sha1 = self._sha1s[int_index]
665
        measured_sha1 = sha_strings(result)
666
        if measured_sha1 != expected_sha1:
667
            raise errors.WeaveInvalidChecksum(
668
                    'file %s, revision %s, expected: %s, measured %s' 
669
                    % (self._weave_name, version_id,
670
                       expected_sha1, measured_sha1))
671
        return result
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
672
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
673
    def get_sha1s(self, version_ids):
674
        """See VersionedFile.get_sha1s()."""
675
        return [self._sha1s[self._lookup(v)] for v in version_ids]
676
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
677
    def num_versions(self):
678
        """How many versions are in this weave?"""
944 by Martin Pool
- refactor member names in Weave code
679
        l = len(self._parents)
0.1.91 by Martin Pool
Update Weave.check
680
        return l
681
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
682
    __len__ = num_versions
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
683
894 by Martin Pool
- small optimization for weave extract
684
    def check(self, progress_bar=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
685
        # TODO evaluate performance hit of using string sets in this routine.
1616.1.5 by Martin Pool
Cleanup and document some check code
686
        # TODO: check no circular inclusions
687
        # TODO: create a nested progress bar
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
688
        for version in range(self.num_versions()):
944 by Martin Pool
- refactor member names in Weave code
689
            inclusions = list(self._parents[version])
0.1.91 by Martin Pool
Update Weave.check
690
            if inclusions:
691
                inclusions.sort()
692
                if inclusions[-1] >= version:
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
693
                    raise WeaveFormatError("invalid included version %d for index %d"
0.1.91 by Martin Pool
Update Weave.check
694
                                           % (inclusions[-1], version))
695
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
696
        # try extracting all versions; parallel extraction is used
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
697
        nv = self.num_versions()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
698
        sha1s = {}
699
        texts = {}
700
        inclusions = {}
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
701
        for i in range(nv):
702
            # For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
703
            # 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.
704
            name = self._idx_to_name(i)
705
            sha1s[name] = sha.new()
706
            texts[name] = []
707
            new_inc = set([name])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
708
            for p in self._parents[i]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
709
                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.
710
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
711
            if set(new_inc) != set(self.get_ancestry(name)):
712
                raise AssertionError(
713
                    'failed %s != %s' 
714
                    % (set(new_inc), set(self.get_ancestry(name))))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
715
            inclusions[name] = new_inc
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
716
717
        nlines = len(self._weave)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
718
719
        update_text = 'checking weave'
720
        if self._weave_name:
721
            short_name = os.path.basename(self._weave_name)
722
            update_text = 'checking %s' % (short_name,)
723
            update_text = update_text[:25]
724
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
725
        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.
726
            if progress_bar:
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
727
                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.
728
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
729
            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.
730
                # The active inclusion must be an ancestor,
731
                # and no ancestors must have deleted this line,
732
                # because we don't support resurrection.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
733
                if (insert in name_inclusions) and not (deleteset & name_inclusions):
734
                    sha1s[name].update(line)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
735
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
736
        for i in range(nv):
737
            version = self._idx_to_name(i)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
738
            hd = sha1s[version].hexdigest()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
739
            expected = self._sha1s[i]
0.1.91 by Martin Pool
Update Weave.check
740
            if hd != expected:
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
741
                raise errors.WeaveInvalidChecksum(
742
                        "mismatched sha1 for version %s: "
743
                        "got %s, expected %s"
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
744
                        % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
745
881 by Martin Pool
- faster weave extraction
746
        # TODO: check insertions are properly nested, that there are
747
        # no lines outside of insertion blocks, that deletions are
748
        # properly paired, etc.
749
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
750
    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.
751
        """Worker routine for join()."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
752
        if not other.versions():
1393.1.48 by Martin Pool
- Add stub Weave.join() method
753
            return          # nothing to update, easy
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
754
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
755
        if not version_ids:
756
            # versions is never none, InterWeave checks this.
757
            return 0
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
758
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
759
        # two loops so that we do not change ourselves before verifying it
760
        # will be ok
1393.1.50 by Martin Pool
- more development of Weave.join()
761
        # 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
762
        names_to_join = []
763
        processed = 0
1563.2.40 by Robert Collins
Extra test for joining of version-limited sets.
764
        # get the selected versions only that are in other.versions.
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
765
        version_ids = set(other.versions()).intersection(set(version_ids))
1563.2.40 by Robert Collins
Extra test for joining of version-limited sets.
766
        # pull in the referenced graph.
767
        version_ids = other.get_ancestry(version_ids)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
768
        pending_parents = other.get_parent_map(version_ids)
769
        pending_graph = pending_parents.items()
770
        if len(pending_graph) != len(version_ids):
771
            raise RevisionNotPresent(
3287.5.7 by Robert Collins
Bugfix error raising in weaves for msising revisions.
772
                set(version_ids) - set(pending_parents.keys()), self)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
773
        for name in topo_sort(pending_graph):
774
            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.
775
            # returns True if we have it, False if we need it.
776
            if not self._check_version_consistent(other, other_idx, name):
777
                names_to_join.append((other_idx, name))
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
778
            processed += 1
779
1551.3.11 by Aaron Bentley
Merge from Robert
780
        if pb and not msg:
781
            msg = 'weave join'
782
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
783
        merged = 0
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
784
        time0 = time.time()
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
785
        for other_idx, name in names_to_join:
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
786
            # TODO: If all the parents of the other version are already
1393.1.50 by Martin Pool
- more development of Weave.join()
787
            # present then we can avoid some work by just taking the delta
788
            # and adjusting the offsets.
1393.1.51 by Martin Pool
- new Weave.copy()
789
            new_parents = self._imported_parents(other, other_idx)
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
790
            sha1 = other._sha1s[other_idx]
791
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
792
            merged += 1
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
793
1551.3.11 by Aaron Bentley
Merge from Robert
794
            if pb:
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
795
                pb.update(msg, merged, len(names_to_join))
1551.3.11 by Aaron Bentley
Merge from Robert
796
           
1393.1.50 by Martin Pool
- more development of Weave.join()
797
            lines = other.get_lines(other_idx)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
798
            self._add(name, lines, new_parents, sha1)
1393.1.50 by Martin Pool
- more development of Weave.join()
799
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
800
        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.
801
                merged, processed, self._weave_name, time.time()-time0))
1185.33.93 by Martin Pool
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
802
 
1393.1.51 by Martin Pool
- new Weave.copy()
803
    def _imported_parents(self, other, other_idx):
804
        """Return list of parents in self corresponding to indexes in other."""
805
        new_parents = []
806
        for parent_idx in other._parents[other_idx]:
807
            parent_name = other._names[parent_idx]
1596.2.31 by Robert Collins
Remove a list __contains__ usage in weave operations.
808
            if parent_name not in self._name_map:
1393.1.51 by Martin Pool
- new Weave.copy()
809
                # should not be possible
810
                raise WeaveError("missing parent {%s} of {%s} in %r" 
811
                                 % (parent_name, other._name_map[other_idx], self))
812
            new_parents.append(self._name_map[parent_name])
813
        return new_parents
814
1393.1.50 by Martin Pool
- more development of Weave.join()
815
    def _check_version_consistent(self, other, other_idx, name):
816
        """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
817
818
        To be consistent it must have:
819
820
         * the same text
821
         * the same direct parents (by name, not index, and disregarding
822
           order)
1393.1.50 by Martin Pool
- more development of Weave.join()
823
        
824
        If present & correct return True;
825
        if not present in self return False; 
826
        if inconsistent raise error."""
827
        this_idx = self._name_map.get(name, -1)
828
        if this_idx != -1:
829
            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.
830
                raise errors.WeaveTextDiffers(name, self, other)
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
831
            self_parents = self._parents[this_idx]
832
            other_parents = other._parents[other_idx]
1551.3.11 by Aaron Bentley
Merge from Robert
833
            n1 = set([self._names[i] for i in self_parents])
834
            n2 = set([other._names[i] for i in other_parents])
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
835
            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
836
                raise WeaveParentMismatch("inconsistent parents "
837
                    "for version {%s}: %s vs %s" % (name, n1, n2))
1393.1.50 by Martin Pool
- more development of Weave.join()
838
            else:
839
                return True         # ok!
840
        else:
841
            return False
918 by Martin Pool
- start doing new weave-merge algorithm
842
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.
843
    def _reweave(self, other, pb, msg):
844
        """Reweave self with other - internal helper for join().
1551.3.11 by Aaron Bentley
Merge from Robert
845
846
        :param other: The other weave to merge
847
        :param pb: An optional progress bar, indicating how far done we are
848
        :param msg: An optional message for the progress
849
        """
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.
850
        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.
851
        self._copy_weave_content(new_weave)
852
853
    def _copy_weave_content(self, otherweave):
854
        """adsorb the content from otherweave."""
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
855
        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.
856
            if attr != '_weave_name':
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
857
                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
858
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
859
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
860
class WeaveFile(Weave):
861
    """A WeaveFile represents a Weave on disk and writes on change."""
862
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
863
    WEAVE_SUFFIX = '.weave'
864
    
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
865
    def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
1563.2.25 by Robert Collins
Merge in upstream.
866
        """Create a WeaveFile.
867
        
868
        :param create: If not True, only open an existing knit.
869
        """
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
870
        super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
871
        self._transport = transport
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
872
        self._filemode = filemode
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
873
        try:
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
874
            _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.
875
        except errors.NoSuchFile:
1563.2.25 by Robert Collins
Merge in upstream.
876
            if not create:
877
                raise
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
878
            # new file, save it
879
            self._save()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
880
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
881
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
882
        left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
883
        """Add a version and save the weave."""
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
884
        self.check_not_reserved_id(version_id)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
885
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
886
            parent_texts, left_matching_blocks, nostore_sha, random_id,
887
            check_content)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
888
        self._save()
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
889
        return result
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
890
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
891
    def copy_to(self, name, transport):
892
        """See VersionedFile.copy_to()."""
893
        # as we are all in memory always, just serialise to the new place.
894
        sio = StringIO()
895
        write_weave_v5(self, sio)
896
        sio.seek(0)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
897
        transport.put_file(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.
898
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
899
    def _save(self):
900
        """Save the weave."""
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
901
        self._check_write_ok()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
902
        sio = StringIO()
903
        write_weave_v5(self, sio)
904
        sio.seek(0)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
905
        self._transport.put_file(self._weave_name + WeaveFile.WEAVE_SUFFIX,
906
                                 sio,
907
                                 self._filemode)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
908
909
    @staticmethod
910
    def get_suffixes():
911
        """See VersionedFile.get_suffixes()."""
912
        return [WeaveFile.WEAVE_SUFFIX]
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
913
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
914
    def join(self, other, pb=None, msg=None, version_ids=None,
915
             ignore_missing=False):
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
916
        """Join other into self and save."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
917
        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.
918
        self._save()
919
920
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.
921
def _reweave(wa, wb, pb=None, msg=None):
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
922
    """Combine two weaves and return the result.
923
924
    This works even if a revision R has different parents in 
925
    wa and wb.  In the resulting weave all the parents are given.
926
927
    This is done by just building up a new weave, maintaining ordering 
928
    of the versions in the two inputs.  More efficient approaches
929
    might be possible but it should only be necessary to do 
930
    this operation rarely, when a new previously ghost version is 
931
    inserted.
1551.3.11 by Aaron Bentley
Merge from Robert
932
933
    :param pb: An optional progress bar, indicating how far done we are
934
    :param msg: An optional message for the progress
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
935
    """
936
    wr = Weave()
937
    ia = ib = 0
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
938
    queue_a = range(wa.num_versions())
939
    queue_b = range(wb.num_versions())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
940
    # first determine combined parents of all versions
941
    # map from version name -> all parent names
942
    combined_parents = _reweave_parent_graphs(wa, wb)
943
    mutter("combined parents: %r", combined_parents)
1185.16.117 by mbp at sourcefrog
Reweave in topological-sort order.
944
    order = topo_sort(combined_parents.iteritems())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
945
    mutter("order to reweave: %r", order)
1551.3.11 by Aaron Bentley
Merge from Robert
946
947
    if pb and not msg:
948
        msg = 'reweave'
949
950
    for idx, name in enumerate(order):
951
        if pb:
952
            pb.update(msg, idx, len(order))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
953
        if name in wa._name_map:
954
            lines = wa.get_lines(name)
955
            if name in wb._name_map:
1551.3.11 by Aaron Bentley
Merge from Robert
956
                lines_b = wb.get_lines(name)
957
                if lines != lines_b:
958
                    mutter('Weaves differ on content. rev_id {%s}', name)
959
                    mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
960
                    import difflib
961
                    lines = list(difflib.unified_diff(lines, lines_b,
962
                            wa._weave_name, wb._weave_name))
963
                    mutter('lines:\n%s', ''.join(lines))
964
                    raise errors.WeaveTextDiffers(name, wa, wb)
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
965
        else:
966
            lines = wb.get_lines(name)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
967
        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
968
    return wr
969
970
def _reweave_parent_graphs(wa, wb):
971
    """Return combined parent ancestry for two weaves.
972
    
973
    Returned as a list of (version_name, set(parent_names))"""
974
    combined = {}
975
    for weave in [wa, wb]:
976
        for idx, name in enumerate(weave._names):
977
            p = combined.setdefault(name, set())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
978
            p.update(map(weave._idx_to_name, weave._parents[idx]))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
979
    return combined
980
981
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
982
def weave_toc(w):
983
    """Show the weave's table-of-contents"""
1083 by Martin Pool
- add space to store revision-id in weave files
984
    print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
985
    for i in (6, 50, 10, 10):
870 by Martin Pool
- better weave info display
986
        print '-' * i,
987
    print
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
988
    for i in range(w.num_versions()):
0.1.91 by Martin Pool
Update Weave.check
989
        sha1 = w._sha1s[i]
1083 by Martin Pool
- add space to store revision-id in weave files
990
        name = w._names[i]
991
        parent_str = ' '.join(map(str, w._parents[i]))
992
        print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
0.1.88 by Martin Pool
Add weave info command.
993
869 by Martin Pool
- more weave.py command line options
994
995
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
996
def weave_stats(weave_file, pb):
947 by Martin Pool
- new 'weave stats' command
997
    from bzrlib.weavefile import read_weave
998
999
    wf = file(weave_file, 'rb')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1000
    w = read_weave(wf)
947 by Martin Pool
- new 'weave stats' command
1001
    # FIXME: doesn't work on pipes
1002
    weave_size = wf.tell()
1003
1004
    total = 0
1005
    vers = len(w)
1006
    for i in range(vers):
1007
        pb.update('checking sizes', i, vers)
1393.1.24 by Martin Pool
- slight speedup for weave stats
1008
        for origin, lineno, line in w._extract([i]):
947 by Martin Pool
- new 'weave stats' command
1009
            total += len(line)
1010
1011
    pb.clear()
1012
1013
    print 'versions          %9d' % vers
1014
    print 'weave file        %9d bytes' % weave_size
1015
    print 'total contents    %9d bytes' % total
1016
    print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1017
    if vers:
1018
        avg = total/vers
1019
        print 'average size      %9d bytes' % avg
1020
        print 'relative size     %9.2fx' % (float(weave_size) / float(avg))
947 by Martin Pool
- new 'weave stats' command
1021
1022
869 by Martin Pool
- more weave.py command line options
1023
def usage():
871 by Martin Pool
- add command for merge-based weave
1024
    print """bzr weave tool
1025
1026
Experimental tool for weave algorithm.
1027
869 by Martin Pool
- more weave.py command line options
1028
usage:
1029
    weave init WEAVEFILE
1030
        Create an empty weave file
1031
    weave get WEAVEFILE VERSION
1032
        Write out specified version.
1033
    weave check WEAVEFILE
1034
        Check consistency of all versions.
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1035
    weave toc WEAVEFILE
869 by Martin Pool
- more weave.py command line options
1036
        Display table of contents.
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1037
    weave add WEAVEFILE NAME [BASE...] < NEWTEXT
869 by Martin Pool
- more weave.py command line options
1038
        Add NEWTEXT, with specified parent versions.
1039
    weave annotate WEAVEFILE VERSION
1040
        Display origin of each line.
1041
    weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1042
        Auto-merge two versions and display conflicts.
1329 by Martin Pool
- add diff command to weave utility
1043
    weave diff WEAVEFILE VERSION1 VERSION2 
1044
        Show differences between two versions.
871 by Martin Pool
- add command for merge-based weave
1045
1046
example:
1047
1048
    % weave init foo.weave
1049
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1050
    % weave add foo.weave ver0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1051
    added version 0
1052
1053
    (create updated version)
1054
    % vi foo.txt
1055
    % weave get foo.weave 0 | diff -u - foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1056
    % weave add foo.weave ver1 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1057
    added version 1
1058
1059
    % weave get foo.weave 0 > foo.txt       (create forked version)
1060
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1061
    % weave add foo.weave ver2 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1062
    added version 2
1063
1064
    % weave merge foo.weave 1 2 > foo.txt   (merge them)
1065
    % vi foo.txt                            (resolve conflicts)
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1066
    % weave add foo.weave merged 1 2 < foo.txt     (commit merged version)     
871 by Martin Pool
- add command for merge-based weave
1067
    
869 by Martin Pool
- more weave.py command line options
1068
"""
0.1.88 by Martin Pool
Add weave info command.
1069
    
1070
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1071
1072
def main(argv):
1073
    import sys
1074
    import os
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1075
    try:
1076
        import bzrlib
1077
    except ImportError:
1078
        # in case we're run directly from the subdirectory
1079
        sys.path.append('..')
1080
        import bzrlib
1336 by Martin Pool
- tidy up import
1081
    from bzrlib.weavefile import write_weave, read_weave
894 by Martin Pool
- small optimization for weave extract
1082
    from bzrlib.progress import ProgressBar
1083
1078 by Martin Pool
- use psyco for weave if possible
1084
    try:
1085
        import psyco
1086
        psyco.full()
1087
    except ImportError:
1088
        pass
894 by Martin Pool
- small optimization for weave extract
1089
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1090
    if len(argv) < 2:
1091
        usage()
1092
        return 0
1093
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1094
    cmd = argv[1]
869 by Martin Pool
- more weave.py command line options
1095
1096
    def readit():
1097
        return read_weave(file(argv[2], 'rb'))
1098
    
1099
    if cmd == 'help':
1100
        usage()
1101
    elif cmd == 'add':
1102
        w = readit()
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1103
        # at the moment, based on everything in the file
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1104
        name = argv[3]
1105
        parents = map(int, argv[4:])
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1106
        lines = sys.stdin.readlines()
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1107
        ver = w.add(name, parents, lines)
869 by Martin Pool
- more weave.py command line options
1108
        write_weave(w, file(argv[2], 'wb'))
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1109
        print 'added version %r %d' % (name, ver)
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1110
    elif cmd == 'init':
1111
        fn = argv[2]
1112
        if os.path.exists(fn):
1113
            raise IOError("file exists")
1114
        w = Weave()
869 by Martin Pool
- more weave.py command line options
1115
        write_weave(w, file(fn, 'wb'))
1116
    elif cmd == 'get': # get one version
1117
        w = readit()
0.1.94 by Martin Pool
Fix get_iter call
1118
        sys.stdout.writelines(w.get_iter(int(argv[3])))
869 by Martin Pool
- more weave.py command line options
1119
        
1329 by Martin Pool
- add diff command to weave utility
1120
    elif cmd == 'diff':
1121
        w = readit()
1122
        fn = argv[2]
1123
        v1, v2 = map(int, argv[3:5])
1124
        lines1 = w.get(v1)
1125
        lines2 = w.get(v2)
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
1126
        diff_gen = bzrlib.patiencediff.unified_diff(lines1, lines2,
1329 by Martin Pool
- add diff command to weave utility
1127
                                '%s version %d' % (fn, v1),
1128
                                '%s version %d' % (fn, v2))
1129
        sys.stdout.writelines(diff_gen)
1130
            
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1131
    elif cmd == 'annotate':
869 by Martin Pool
- more weave.py command line options
1132
        w = readit()
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1133
        # newline is added to all lines regardless; too hard to get
1134
        # reasonable formatting otherwise
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1135
        lasto = None
1136
        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.
1137
            text = text.rstrip('\r\n')
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1138
            if origin == lasto:
1139
                print '      | %s' % (text)
1140
            else:
1141
                print '%5d | %s' % (origin, text)
1142
                lasto = origin
871 by Martin Pool
- add command for merge-based weave
1143
                
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1144
    elif cmd == 'toc':
1145
        weave_toc(readit())
947 by Martin Pool
- new 'weave stats' command
1146
1147
    elif cmd == 'stats':
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1148
        weave_stats(argv[2], ProgressBar())
871 by Martin Pool
- add command for merge-based weave
1149
        
0.1.91 by Martin Pool
Update Weave.check
1150
    elif cmd == 'check':
869 by Martin Pool
- more weave.py command line options
1151
        w = readit()
894 by Martin Pool
- small optimization for weave extract
1152
        pb = ProgressBar()
1153
        w.check(pb)
1154
        pb.clear()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1155
        print '%d versions ok' % w.num_versions()
871 by Martin Pool
- add command for merge-based weave
1156
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
1157
    elif cmd == 'inclusions':
1158
        w = readit()
1159
        print ' '.join(map(str, w.inclusions([int(argv[3])])))
1160
1161
    elif cmd == 'parents':
1162
        w = readit()
944 by Martin Pool
- refactor member names in Weave code
1163
        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
1164
918 by Martin Pool
- start doing new weave-merge algorithm
1165
    elif cmd == 'plan-merge':
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
1166
        # replaced by 'bzr weave-plan-merge'
918 by Martin Pool
- start doing new weave-merge algorithm
1167
        w = readit()
1168
        for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
919 by Martin Pool
- more development of weave-merge
1169
            if line:
1170
                print '%14s | %s' % (state, line),
871 by Martin Pool
- add command for merge-based weave
1171
    elif cmd == 'merge':
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
1172
        # replaced by 'bzr weave-merge-text'
919 by Martin Pool
- more development of weave-merge
1173
        w = readit()
1174
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1175
        sys.stdout.writelines(w.weave_merge(p))
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1176
    else:
1177
        raise ValueError('unknown command %r' % cmd)
1178
    
1179
1180
if __name__ == '__main__':
1181
    import sys
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1182
    sys.exit(main(sys.argv))
1076 by Martin Pool
- add code to run weave utility under profiler
1183
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1184
1185
class InterWeave(InterVersionedFile):
1186
    """Optimised code paths for weave to weave operations."""
1187
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1188
    _matching_file_from_factory = staticmethod(WeaveFile)
1189
    _matching_file_to_factory = staticmethod(WeaveFile)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1190
    
1191
    @staticmethod
1192
    def is_compatible(source, target):
1193
        """Be compatible with weaves."""
1194
        try:
1195
            return (isinstance(source, Weave) and
1196
                    isinstance(target, Weave))
1197
        except AttributeError:
1198
            return False
1199
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1200
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1201
        """See InterVersionedFile.join."""
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
1202
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
1203
        if self.target.versions() == [] and version_ids is None:
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
1204
            self.target._copy_weave_content(self.source)
1205
            return
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
1206
        self.target._join(self.source, pb, msg, version_ids, ignore_missing)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1207
1208
1209
InterVersionedFile.register_optimiser(InterWeave)