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