/brz/remove-bazaar

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