/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)
944 by Martin Pool
- refactor member names in Weave code
429
        new_version = len(self._parents)
0.1.5 by Martin Pool
Add test for storing two text versions.
430
1083 by Martin Pool
- add space to store revision-id in weave files
431
        # if we abort after here the (in-memory) weave will be corrupt because only
432
        # some fields are updated
1570.1.12 by Robert Collins
Add a FIXME for weave.add and remove some extraneous whitespace.
433
        # XXX: FIXME implement a succeed-or-fail of the rest of this routine.
434
        #      - Robert Collins 20060226
1083 by Martin Pool
- add space to store revision-id in weave files
435
        self._parents.append(parents[:])
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
436
        self._sha1s.append(sha1)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
437
        self._names.append(version_id)
438
        self._name_map[version_id] = new_version
938 by Martin Pool
- various optimizations to weave add code
439
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
440
938 by Martin Pool
- various optimizations to weave add code
441
        if not parents:
442
            # special case; adding with no parents revision; can do
443
            # this more quickly by just appending unconditionally.
444
            # even more specially, if we're adding an empty text we
445
            # need do nothing at all.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
446
            if lines:
944 by Martin Pool
- refactor member names in Weave code
447
                self._weave.append(('{', new_version))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
448
                self._weave.extend(lines)
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
449
                self._weave.append(('}', None))
938 by Martin Pool
- various optimizations to weave add code
450
            return new_version
451
941 by Martin Pool
- allow for parents specified to Weave.add to be a set
452
        if len(parents) == 1:
453
            pv = list(parents)[0]
454
            if sha1 == self._sha1s[pv]:
455
                # special case: same as the single parent
456
                return new_version
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
457
938 by Martin Pool
- various optimizations to weave add code
458
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
459
        ancestors = self._inclusions(parents)
938 by Martin Pool
- various optimizations to weave add code
460
944 by Martin Pool
- refactor member names in Weave code
461
        l = self._weave
938 by Martin Pool
- various optimizations to weave add code
462
463
        # basis a list of (origin, lineno, line)
464
        basis_lineno = []
465
        basis_lines = []
466
        for origin, lineno, line in self._extract(ancestors):
467
            basis_lineno.append(lineno)
468
            basis_lines.append(line)
469
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
470
        # another small special case: a merge, producing the same text
471
        # as auto-merge
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
472
        if lines == basis_lines:
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
473
            return new_version
938 by Martin Pool
- various optimizations to weave add code
474
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
475
        # add a sentinel, because we can also match against the final line
944 by Martin Pool
- refactor member names in Weave code
476
        basis_lineno.append(len(self._weave))
938 by Martin Pool
- various optimizations to weave add code
477
478
        # XXX: which line of the weave should we really consider
479
        # matches the end of the file?  the current code says it's the
480
        # last line of the weave?
481
482
        #print 'basis_lines:', basis_lines
483
        #print 'new_lines:  ', lines
484
1185.81.17 by Aaron Bentley
Merged latest bzr.dev
485
        s = self._matcher(None, basis_lines, lines)
938 by Martin Pool
- various optimizations to weave add code
486
487
        # offset gives the number of lines that have been inserted
488
        # into the weave up to the current point; if the original edit instruction
489
        # says to change line A then we actually change (A+offset)
490
        offset = 0
491
492
        for tag, i1, i2, j1, j2 in s.get_opcodes():
493
            # i1,i2 are given in offsets within basis_lines; we need to map them
494
            # back to offsets within the entire weave
495
            #print 'raw match', tag, i1, i2, j1, j2
496
            if tag == 'equal':
497
                continue
498
            i1 = basis_lineno[i1]
499
            i2 = basis_lineno[i2]
500
            # the deletion and insertion are handled separately.
501
            # first delete the region.
502
            if i1 != i2:
944 by Martin Pool
- refactor member names in Weave code
503
                self._weave.insert(i1+offset, ('[', new_version))
504
                self._weave.insert(i2+offset+1, (']', new_version))
938 by Martin Pool
- various optimizations to weave add code
505
                offset += 2
506
507
            if j1 != j2:
508
                # there may have been a deletion spanning up to
509
                # i2; we want to insert after this region to make sure
510
                # we don't destroy ourselves
511
                i = i2 + offset
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
512
                self._weave[i:i] = ([('{', new_version)]
513
                                    + lines[j1:j2]
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
514
                                    + [('}', None)])
938 by Martin Pool
- various optimizations to weave add code
515
                offset += 2 + (j2 - j1)
516
        return new_version
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
517
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
518
    def _inclusions(self, versions):
893 by Martin Pool
- Refactor weave calculation of inclusions
519
        """Return set of all ancestors of given version(s)."""
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
520
        if not len(versions):
521
            return []
928 by Martin Pool
- go back to using plain builtin set()
522
        i = set(versions)
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
523
        for v in range(max(versions), 0, -1):
1328 by Martin Pool
- slight refactoring of weave code
524
            if v in i:
525
                # include all its parents
526
                i.update(self._parents[v])
527
        return i
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
528
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
529
    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.
530
        """See VersionedFile.get_ancestry."""
531
        if isinstance(version_ids, basestring):
532
            version_ids = [version_ids]
533
        i = self._inclusions([self._lookup(v) for v in version_ids])
534
        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
535
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
536
    def _check_lines(self, text):
537
        if not isinstance(text, list):
538
            raise ValueError("text should be a list, not %s" % type(text))
539
540
        for l in text:
541
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
542
                raise ValueError("text line should be a string or unicode, not %s"
543
                                 % type(l))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
544
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
545
546
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
547
    def _check_versions(self, indexes):
548
        """Check everything in the sequence of indexes is valid"""
549
        for i in indexes:
550
            try:
944 by Martin Pool
- refactor member names in Weave code
551
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
552
            except IndexError:
553
                raise IndexError("invalid version number %r" % i)
554
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
555
    def _compatible_parents(self, my_parents, other_parents):
556
        """During join check that other_parents are joinable with my_parents.
557
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
558
        Joinable is defined as 'is a subset of' - supersets may require
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
559
        regeneration of diffs, but subsets do not.
560
        """
561
        return len(other_parents.difference(my_parents)) == 0
562
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
563
    def annotate(self, version_id):
564
        """Return a list of (version-id, line) tuples for version_id.
0.1.7 by Martin Pool
Add trivial annotate text
565
566
        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.
567
        incls = [self._lookup(version_id)]
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
568
        return [(self._idx_to_name(origin), text) for origin, lineno, text in
569
            self._extract(incls)]
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
570
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
571
    def iter_lines_added_or_present_in_versions(self, version_ids=None,
572
                                                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.
573
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
574
        if version_ids is None:
575
            version_ids = self.versions()
576
        version_ids = set(version_ids)
577
        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.
578
            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.
579
            if line[-1] != '\n':
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
580
                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.
581
            else:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
582
                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.
583
584
    def _walk_internal(self, version_ids=None):
585
        """Helper method for weave actions."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
586
918 by Martin Pool
- start doing new weave-merge algorithm
587
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
588
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
589
590
        lineno = 0         # line of weave, 0-based
591
944 by Martin Pool
- refactor member names in Weave code
592
        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.
593
            if l.__class__ == tuple:
918 by Martin Pool
- start doing new weave-merge algorithm
594
                c, v = l
595
                isactive = None
596
                if c == '{':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
597
                    istack.append(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
598
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
599
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
600
                elif c == '[':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
601
                    dset.add(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
602
                elif c == ']':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
603
                    dset.remove(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
604
                else:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
605
                    raise WeaveFormatError('unexpected instruction %r' % v)
918 by Martin Pool
- start doing new weave-merge algorithm
606
            else:
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
607
                yield lineno, istack[-1], frozenset(dset), l
918 by Martin Pool
- start doing new weave-merge algorithm
608
            lineno += 1
609
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
610
        if istack:
611
            raise WeaveFormatError("unclosed insertion blocks "
612
                    "at end of weave: %s" % istack)
613
        if dset:
614
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
615
                                   % dset)
918 by Martin Pool
- start doing new weave-merge algorithm
616
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
617
    def plan_merge(self, ver_a, ver_b):
618
        """Return pseudo-annotation indicating how the two versions merge.
619
620
        This is computed between versions a and b and their common
621
        base.
622
623
        Weave lines present in none of them are skipped entirely.
624
        """
625
        inc_a = set(self.get_ancestry([ver_a]))
626
        inc_b = set(self.get_ancestry([ver_b]))
627
        inc_c = inc_a & inc_b
628
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
629
        for lineno, insert, deleteset, line in self._walk_internal([ver_a, ver_b]):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
630
            if deleteset & inc_c:
631
                # killed in parent; can't be in either a or b
632
                # not relevant to our work
633
                yield 'killed-base', line
634
            elif insert in inc_c:
635
                # was inserted in base
636
                killed_a = bool(deleteset & inc_a)
637
                killed_b = bool(deleteset & inc_b)
638
                if killed_a and killed_b:
639
                    yield 'killed-both', line
640
                elif killed_a:
641
                    yield 'killed-a', line
642
                elif killed_b:
643
                    yield 'killed-b', line
644
                else:
645
                    yield 'unchanged', line
646
            elif insert in inc_a:
647
                if deleteset & inc_a:
648
                    yield 'ghost-a', line
649
                else:
650
                    # new in A; not in B
651
                    yield 'new-a', line
652
            elif insert in inc_b:
653
                if deleteset & inc_b:
654
                    yield 'ghost-b', line
655
                else:
656
                    yield 'new-b', line
657
            else:
658
                # not in either revision
659
                yield 'irrelevant', line
660
893 by Martin Pool
- Refactor weave calculation of inclusions
661
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
662
        """Yield annotation of lines in included set.
663
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
664
        Yields a sequence of tuples (origin, lineno, text), where
665
        origin is the origin version, lineno the index in the weave,
666
        and text the text of the line.
667
0.1.20 by Martin Pool
Factor out Knit.extract() method
668
        The set typically but not necessarily corresponds to a version.
669
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
670
        for i in versions:
671
            if not isinstance(i, int):
672
                raise ValueError(i)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
673
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
674
        included = self._inclusions(versions)
881 by Martin Pool
- faster weave extraction
675
676
        istack = []
1596.2.25 by Robert Collins
Weave._extract should be faster
677
        iset = set()
928 by Martin Pool
- go back to using plain builtin set()
678
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
679
680
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
681
894 by Martin Pool
- small optimization for weave extract
682
        isactive = None
0.1.85 by Martin Pool
doc
683
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
684
        result = []
685
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
686
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
687
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
688
        # wow.
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
689
        #  449       0   4474.6820   2356.5590   breezy.weave:556(_extract)
1596.2.25 by Robert Collins
Weave._extract should be faster
690
        #  +285282   0   1676.8040   1676.8040   +<isinstance>
691
        # 1.6 seconds in 'isinstance'.
692
        # changing the first isinstance:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
693
        #  449       0   2814.2660   1577.1760   breezy.weave:556(_extract)
1596.2.25 by Robert Collins
Weave._extract should be faster
694
        #  +140414   0    762.8050    762.8050   +<isinstance>
695
        # note that the inline time actually dropped (less function calls)
696
        # and total processing time was halved.
697
        # we're still spending ~1/4 of the method in isinstance though.
698
        # so lets hard code the acceptable string classes we expect:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
699
        #  449       0   1202.9420    786.2930   breezy.weave:556(_extract)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
700
        # +71352     0    377.5560    377.5560   +<method 'append' of 'list'
1596.2.25 by Robert Collins
Weave._extract should be faster
701
        #                                          objects>
702
        # yay, down to ~1/4 the initial extract time, and our inline time
703
        # has shrunk again, with isinstance no longer dominating.
704
        # tweaking the stack inclusion test to use a set gives:
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
705
        #  449       0   1122.8030    713.0080   breezy.weave:556(_extract)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
706
        # +71352     0    354.9980    354.9980   +<method 'append' of 'list'
1596.2.25 by Robert Collins
Weave._extract should be faster
707
        #                                          objects>
708
        # - a 5% win, or possibly just noise. However with large istacks that
709
        # 'in' test could dominate, so I'm leaving this change in place -
710
        # when its fast enough to consider profiling big datasets we can review.
711
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
712
713
1596.2.25 by Robert Collins
Weave._extract should be faster
714
944 by Martin Pool
- refactor member names in Weave code
715
        for l in self._weave:
1596.2.25 by Robert Collins
Weave._extract should be faster
716
            if l.__class__ == tuple:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
717
                c, v = l
894 by Martin Pool
- small optimization for weave extract
718
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
719
                if c == '{':
720
                    istack.append(v)
1596.2.25 by Robert Collins
Weave._extract should be faster
721
                    iset.add(v)
891 by Martin Pool
- fix up refactoring of weave
722
                elif c == '}':
1596.2.25 by Robert Collins
Weave._extract should be faster
723
                    iset.remove(istack.pop())
891 by Martin Pool
- fix up refactoring of weave
724
                elif c == '[':
725
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
726
                        dset.add(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
727
                elif c == ']':
891 by Martin Pool
- fix up refactoring of weave
728
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
729
                        dset.remove(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
730
                else:
731
                    raise AssertionError()
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
732
            else:
894 by Martin Pool
- small optimization for weave extract
733
                if isactive is None:
734
                    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
735
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
736
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
737
            lineno += 1
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
738
        if istack:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
739
            raise WeaveFormatError("unclosed insertion blocks "
740
                    "at end of weave: %s" % istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
741
        if dset:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
742
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
743
                                   % dset)
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
744
        return result
745
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
746
    def _maybe_lookup(self, name_or_index):
747
        """Convert possible symbolic name to index, or pass through indexes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
748
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
749
        NOT FOR PUBLIC USE.
750
        """
6621.18.1 by Martin
Remove or fix use of long type and nearby type issues
751
        # GZ 2017-04-01: This used to check for long as well, but I don't think
752
        # there are python implementations with sys.maxsize > sys.maxint
753
        if isinstance(name_or_index, int):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
754
            return name_or_index
755
        else:
756
            return self._lookup(name_or_index)
757
758
    def get_lines(self, version_id):
759
        """See VersionedFile.get_lines()."""
1596.2.30 by Robert Collins
Unbreak backwards compatability on weave.get_lines.
760
        int_index = self._maybe_lookup(version_id)
1596.2.29 by Robert Collins
Make weave.get_lines faster.
761
        result = [line for (origin, lineno, line) in self._extract([int_index])]
762
        expected_sha1 = self._sha1s[int_index]
763
        measured_sha1 = sha_strings(result)
764
        if measured_sha1 != expected_sha1:
5582.9.20 by Jelmer Vernooij
remove some of the weave changes.
765
            raise errors.WeaveInvalidChecksum(
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
766
                    'file %s, revision %s, expected: %s, measured %s'
1596.2.29 by Robert Collins
Make weave.get_lines faster.
767
                    % (self._weave_name, version_id,
768
                       expected_sha1, measured_sha1))
769
        return result
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
770
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
771
    def get_sha1s(self, version_ids):
772
        """See VersionedFile.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
773
        result = {}
774
        for v in version_ids:
775
            result[v] = self._sha1s[self._lookup(v)]
776
        return result
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
777
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
778
    def num_versions(self):
779
        """How many versions are in this weave?"""
944 by Martin Pool
- refactor member names in Weave code
780
        l = len(self._parents)
0.1.91 by Martin Pool
Update Weave.check
781
        return l
782
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
783
    __len__ = num_versions
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
784
894 by Martin Pool
- small optimization for weave extract
785
    def check(self, progress_bar=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
786
        # TODO evaluate performance hit of using string sets in this routine.
1616.1.5 by Martin Pool
Cleanup and document some check code
787
        # TODO: check no circular inclusions
788
        # TODO: create a nested progress bar
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
789
        for version in range(self.num_versions()):
944 by Martin Pool
- refactor member names in Weave code
790
            inclusions = list(self._parents[version])
0.1.91 by Martin Pool
Update Weave.check
791
            if inclusions:
792
                inclusions.sort()
793
                if inclusions[-1] >= version:
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
794
                    raise WeaveFormatError("invalid included version %d for index %d"
0.1.91 by Martin Pool
Update Weave.check
795
                                           % (inclusions[-1], version))
796
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
797
        # try extracting all versions; parallel extraction is used
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
798
        nv = self.num_versions()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
799
        sha1s = {}
800
        texts = {}
801
        inclusions = {}
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
802
        for i in range(nv):
803
            # For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
804
            # The problem is that set membership is much more expensive
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
805
            name = self._idx_to_name(i)
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
806
            sha1s[name] = sha()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
807
            texts[name] = []
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
808
            new_inc = {name}
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
809
            for p in self._parents[i]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
810
                new_inc.update(inclusions[self._idx_to_name(p)])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
811
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
812
            if set(new_inc) != set(self.get_ancestry(name)):
813
                raise AssertionError(
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
814
                    'failed %s != %s'
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
815
                    % (set(new_inc), set(self.get_ancestry(name))))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
816
            inclusions[name] = new_inc
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
817
818
        nlines = len(self._weave)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
819
820
        update_text = 'checking weave'
821
        if self._weave_name:
822
            short_name = os.path.basename(self._weave_name)
823
            update_text = 'checking %s' % (short_name,)
824
            update_text = update_text[:25]
825
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
826
        for lineno, insert, deleteset, line in self._walk_internal():
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
827
            if progress_bar:
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
828
                progress_bar.update(update_text, lineno, nlines)
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
829
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
830
            for name, name_inclusions in inclusions.items():
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
831
                # The active inclusion must be an ancestor,
832
                # and no ancestors must have deleted this line,
833
                # because we don't support resurrection.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
834
                if (insert in name_inclusions) and not (deleteset & name_inclusions):
835
                    sha1s[name].update(line)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
836
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
837
        for i in range(nv):
838
            version = self._idx_to_name(i)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
839
            hd = sha1s[version].hexdigest()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
840
            expected = self._sha1s[i]
0.1.91 by Martin Pool
Update Weave.check
841
            if hd != expected:
5582.9.20 by Jelmer Vernooij
remove some of the weave changes.
842
                raise errors.WeaveInvalidChecksum(
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
843
                        "mismatched sha1 for version %s: "
844
                        "got %s, expected %s"
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
845
                        % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
846
881 by Martin Pool
- faster weave extraction
847
        # TODO: check insertions are properly nested, that there are
848
        # no lines outside of insertion blocks, that deletions are
849
        # properly paired, etc.
850
1393.1.51 by Martin Pool
- new Weave.copy()
851
    def _imported_parents(self, other, other_idx):
852
        """Return list of parents in self corresponding to indexes in other."""
853
        new_parents = []
854
        for parent_idx in other._parents[other_idx]:
855
            parent_name = other._names[parent_idx]
1596.2.31 by Robert Collins
Remove a list __contains__ usage in weave operations.
856
            if parent_name not in self._name_map:
1393.1.51 by Martin Pool
- new Weave.copy()
857
                # should not be possible
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
858
                raise WeaveError("missing parent {%s} of {%s} in %r"
1393.1.51 by Martin Pool
- new Weave.copy()
859
                                 % (parent_name, other._name_map[other_idx], self))
860
            new_parents.append(self._name_map[parent_name])
861
        return new_parents
862
1393.1.50 by Martin Pool
- more development of Weave.join()
863
    def _check_version_consistent(self, other, other_idx, name):
864
        """Check if a version in consistent in this and other.
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
865
866
        To be consistent it must have:
867
868
         * the same text
869
         * the same direct parents (by name, not index, and disregarding
870
           order)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
871
1393.1.50 by Martin Pool
- more development of Weave.join()
872
        If present & correct return True;
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
873
        if not present in self return False;
1393.1.50 by Martin Pool
- more development of Weave.join()
874
        if inconsistent raise error."""
875
        this_idx = self._name_map.get(name, -1)
876
        if this_idx != -1:
877
            if self._sha1s[this_idx] != other._sha1s[other_idx]:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
878
                raise errors.WeaveTextDiffers(name, self, other)
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
879
            self_parents = self._parents[this_idx]
880
            other_parents = other._parents[other_idx]
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
881
            n1 = {self._names[i] for i in self_parents}
882
            n2 = {other._names[i] for i in other_parents}
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
883
            if not self._compatible_parents(n1, n2):
5582.9.20 by Jelmer Vernooij
remove some of the weave changes.
884
                raise WeaveParentMismatch("inconsistent parents "
885
                    "for version {%s}: %s vs %s" % (name, n1, n2))
1393.1.50 by Martin Pool
- more development of Weave.join()
886
            else:
887
                return True         # ok!
888
        else:
889
            return False
918 by Martin Pool
- start doing new weave-merge algorithm
890
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
891
    def _reweave(self, other, pb, msg):
892
        """Reweave self with other - internal helper for join().
1551.3.11 by Aaron Bentley
Merge from Robert
893
894
        :param other: The other weave to merge
895
        :param pb: An optional progress bar, indicating how far done we are
896
        :param msg: An optional message for the progress
897
        """
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
898
        new_weave = _reweave(self, other, pb=pb, msg=msg)
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
899
        self._copy_weave_content(new_weave)
900
901
    def _copy_weave_content(self, otherweave):
902
        """adsorb the content from otherweave."""
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
903
        for attr in self.__slots__:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
904
            if attr != '_weave_name':
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
905
                setattr(self, attr, copy(getattr(otherweave, attr)))
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
906
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
907
5582.10.41 by Jelmer Vernooij
revert weavefile changes
908
class WeaveFile(Weave):
909
    """A WeaveFile represents a Weave on disk and writes on change."""
910
911
    WEAVE_SUFFIX = '.weave'
912
913
    def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
914
        """Create a WeaveFile.
915
916
        :param create: If not True, only open an existing knit.
917
        """
918
        super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
919
            allow_reserved=False)
920
        self._transport = transport
921
        self._filemode = filemode
922
        try:
6352.4.5 by Jelmer Vernooij
Fix weave test.
923
            f = self._transport.get(name + WeaveFile.WEAVE_SUFFIX)
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
924
            _read_weave_v5(BytesIO(f.read()), self)
5582.10.41 by Jelmer Vernooij
revert weavefile changes
925
        except errors.NoSuchFile:
926
            if not create:
927
                raise
928
            # new file, save it
929
            self._save()
930
931
    def _add_lines(self, version_id, parents, lines, parent_texts,
932
        left_matching_blocks, nostore_sha, random_id, check_content):
933
        """Add a version and save the weave."""
934
        self.check_not_reserved_id(version_id)
935
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
936
            parent_texts, left_matching_blocks, nostore_sha, random_id,
937
            check_content)
938
        self._save()
939
        return result
940
941
    def copy_to(self, name, transport):
942
        """See VersionedFile.copy_to()."""
943
        # 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
944
        sio = BytesIO()
5582.10.41 by Jelmer Vernooij
revert weavefile changes
945
        write_weave_v5(self, sio)
946
        sio.seek(0)
947
        transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
948
949
    def _save(self):
950
        """Save the weave."""
951
        self._check_write_ok()
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
952
        sio = BytesIO()
5582.10.41 by Jelmer Vernooij
revert weavefile changes
953
        write_weave_v5(self, sio)
954
        sio.seek(0)
955
        bytes = sio.getvalue()
956
        path = self._weave_name + WeaveFile.WEAVE_SUFFIX
957
        try:
958
            self._transport.put_bytes(path, bytes, self._filemode)
959
        except errors.NoSuchFile:
960
            self._transport.mkdir(dirname(path))
961
            self._transport.put_bytes(path, bytes, self._filemode)
962
963
    @staticmethod
964
    def get_suffixes():
965
        """See VersionedFile.get_suffixes()."""
966
        return [WeaveFile.WEAVE_SUFFIX]
967
968
    def insert_record_stream(self, stream):
969
        super(WeaveFile, self).insert_record_stream(stream)
970
        self._save()
971
972
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.
973
def _reweave(wa, wb, pb=None, msg=None):
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
974
    """Combine two weaves and return the result.
975
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
976
    This works even if a revision R has different parents in
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
977
    wa and wb.  In the resulting weave all the parents are given.
978
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
979
    This is done by just building up a new weave, maintaining ordering
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
980
    of the versions in the two inputs.  More efficient approaches
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
981
    might be possible but it should only be necessary to do
982
    this operation rarely, when a new previously ghost version is
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
983
    inserted.
1551.3.11 by Aaron Bentley
Merge from Robert
984
985
    :param pb: An optional progress bar, indicating how far done we are
986
    :param msg: An optional message for the progress
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
987
    """
988
    wr = Weave()
989
    # first determine combined parents of all versions
990
    # map from version name -> all parent names
991
    combined_parents = _reweave_parent_graphs(wa, wb)
992
    mutter("combined parents: %r", combined_parents)
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
993
    order = tsort.topo_sort(combined_parents.items())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
994
    mutter("order to reweave: %r", order)
1551.3.11 by Aaron Bentley
Merge from Robert
995
996
    if pb and not msg:
997
        msg = 'reweave'
998
999
    for idx, name in enumerate(order):
1000
        if pb:
1001
            pb.update(msg, idx, len(order))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1002
        if name in wa._name_map:
1003
            lines = wa.get_lines(name)
1004
            if name in wb._name_map:
1551.3.11 by Aaron Bentley
Merge from Robert
1005
                lines_b = wb.get_lines(name)
1006
                if lines != lines_b:
1007
                    mutter('Weaves differ on content. rev_id {%s}', name)
1008
                    mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1009
                    import difflib
1010
                    lines = list(difflib.unified_diff(lines, lines_b,
1011
                            wa._weave_name, wb._weave_name))
1012
                    mutter('lines:\n%s', ''.join(lines))
1013
                    raise errors.WeaveTextDiffers(name, wa, wb)
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1014
        else:
1015
            lines = wb.get_lines(name)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1016
        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
1017
    return wr
1018
4415.1.2 by Martin Pool
Remove code to run weave.py as a script
1019
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1020
def _reweave_parent_graphs(wa, wb):
1021
    """Return combined parent ancestry for two weaves.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1022
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1023
    Returned as a list of (version_name, set(parent_names))"""
1024
    combined = {}
1025
    for weave in [wa, wb]:
1026
        for idx, name in enumerate(weave._names):
1027
            p = combined.setdefault(name, set())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1028
            p.update(map(weave._idx_to_name, weave._parents[idx]))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1029
    return combined