~bzr-pqm/bzr/bzr.dev

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