~bzr-pqm/bzr/bzr.dev

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
19
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
20
"""Weave - storage of related text file versions"""
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
21
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
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
70
from cStringIO import StringIO
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
71
import os
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
72
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
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import tsort
76
""")
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
77
from bzrlib import (
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
78
    errors,
79
    osutils,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
80
    )
1185.50.23 by John Arbash Meinel
Adding sha1 check when weave extracts a text.
81
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
82
        RevisionAlreadyPresent,
83
        RevisionNotPresent,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
84
        UnavailableRepresentation,
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
85
        )
3734.2.4 by Vincent Ladeuil
Fix python2.6 deprecation warnings related to hashlib.
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
87
import bzrlib.patiencediff
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
88
from bzrlib.revision import NULL_REVISION
3350.3.20 by Robert Collins
Remove more uses of versionedfile.join() and fix a bug with weave's insert_record_stream.
89
from bzrlib.symbol_versioning import *
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
90
from bzrlib.trace import mutter
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
91
from bzrlib.versionedfile import (
3350.3.12 by Robert Collins
Generate streams with absent records.
92
    AbsentContentFactory,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
93
    adapter_registry,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
94
    ContentFactory,
4111.1.1 by Robert Collins
Add a groupcompress sort order.
95
    sort_groupcompress,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
96
    VersionedFile,
97
    )
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
98
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
99
100
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
101
class WeaveContentFactory(ContentFactory):
102
    """Content factory for streaming from weaves.
103
104
    :seealso ContentFactory:
105
    """
106
107
    def __init__(self, version, weave):
108
        """Create a WeaveContentFactory for version from weave."""
109
        ContentFactory.__init__(self)
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
110
        self.sha1 = weave.get_sha1s([version])[version]
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
111
        self.key = (version,)
112
        parents = weave.get_parent_map([version])[version]
113
        self.parents = tuple((parent,) for parent in parents)
114
        self.storage_kind = 'fulltext'
115
        self._weave = weave
116
117
    def get_bytes_as(self, storage_kind):
118
        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.
119
            return self._weave.get_text(self.key[-1])
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
120
        elif storage_kind == 'chunked':
121
            return self._weave.get_lines(self.key[-1])
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
122
        else:
123
            raise UnavailableRepresentation(self.key, storage_kind, 'fulltext')
124
125
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
126
class Weave(VersionedFile):
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
127
    """weave - versioned text file storage.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
128
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
129
    A Weave manages versions of line-based text files, keeping track
130
    of the originating version for each line.
131
132
    To clients the "lines" of the file are represented as a list of strings.
133
    These strings  will typically have terminal newline characters, but
134
    this is not required.  In particular files commonly do not have a newline
135
    at the end of the file.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
136
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
137
    Texts can be identified in either of two ways:
138
139
    * a nonnegative index number.
140
1324 by Martin Pool
- doc
141
    * a version-id string.
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
142
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
143
    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.
144
    the version-id is used to reference it in the larger world.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
145
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
146
    The weave is represented as a list mixing edit instructions and
944 by Martin Pool
- refactor member names in Weave code
147
    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
148
    unicode), or a tuple.  If a string, it means that the given line
149
    should be output in the currently active revisions.
150
151
    If a tuple, it gives a processing instruction saying in which
152
    revisions the enclosed lines are active.  The tuple has the form
153
    (instruction, version).
154
155
    The instruction can be '{' or '}' for an insertion block, and '['
156
    and ']' for a deletion block respectively.  The version is the
0.1.45 by Martin Pool
doc
157
    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
158
    and inserts.  For '}', the end of an insertion, there is no
159
    version parameter because it always closes the most recently
160
    opened insertion.
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
161
0.1.41 by Martin Pool
Doc
162
    Constraints/notes:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
163
164
    * A later version can delete lines that were introduced by any
165
      number of ancestor versions; this implies that deletion
166
      instructions can span insertion blocks without regard to the
167
      insertion block's nesting.
168
0.1.41 by Martin Pool
Doc
169
    * Similarly, deletions need not be properly nested with regard to
170
      each other, because they might have been generated by
171
      independent revisions.
172
0.1.45 by Martin Pool
doc
173
    * Insertions are always made by inserting a new bracketed block
174
      into a single point in the previous weave.  This implies they
175
      can nest but not overlap, and the nesting must always have later
176
      insertions on the inside.
177
0.1.41 by Martin Pool
Doc
178
    * It doesn't seem very useful to have an active insertion
179
      inside an inactive insertion, but it might happen.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
180
0.1.41 by Martin Pool
Doc
181
    * Therefore, all instructions are always"considered"; that
182
      is passed onto and off the stack.  An outer inactive block
183
      doesn't disable an inner block.
184
185
    * Lines are enabled if the most recent enclosing insertion is
186
      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
187
0.1.49 by Martin Pool
Add another constraint: revisions should not delete text that they
188
    * There is no point having a deletion directly inside its own
189
      insertion; you might as well just not write it.  And there
190
      should be no way to get an earlier version deleting a later
191
      version.
192
944 by Martin Pool
- refactor member names in Weave code
193
    _weave
194
        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.
195
944 by Martin Pool
- refactor member names in Weave code
196
    _parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
197
        List of parents, indexed by version number.
198
        It is only necessary to store the minimal set of parents for
199
        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
200
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
201
    _sha1s
1083 by Martin Pool
- add space to store revision-id in weave files
202
        List of hex SHA-1 of each version.
203
204
    _names
205
        List of symbolic names for each version.  Each should be unique.
206
207
    _name_map
208
        For each name, the version number.
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
209
210
    _weave_name
211
        Descriptive name of this weave; typically the filename if known.
212
        Set by read_weave.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
213
    """
938 by Martin Pool
- various optimizations to weave add code
214
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
215
    __slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',
3514.2.2 by John Arbash Meinel
Restore a real weave merge to 'bzr merge --weave'.
216
                 '_weave_name', '_matcher', '_allow_reserved']
3734.2.2 by Vincent Ladeuil
Python-2.6 doesn't allow passing passing parameters to object methods __init__
217
3514.2.2 by John Arbash Meinel
Restore a real weave merge to 'bzr merge --weave'.
218
    def __init__(self, weave_name=None, access_mode='w', matcher=None,
219
                 get_scope=None, allow_reserved=False):
3316.2.5 by Robert Collins
Review feedback.
220
        """Create a weave.
221
222
        :param get_scope: A callable that returns an opaque object to be used
223
            for detecting when this weave goes out of scope (should stop
224
            answering requests or allowing mutation).
225
        """
3734.2.2 by Vincent Ladeuil
Python-2.6 doesn't allow passing passing parameters to object methods __init__
226
        super(Weave, self).__init__()
944 by Martin Pool
- refactor member names in Weave code
227
        self._weave = []
228
        self._parents = []
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
229
        self._sha1s = []
1083 by Martin Pool
- add space to store revision-id in weave files
230
        self._names = []
231
        self._name_map = {}
1209 by Martin Pool
- Add Weave._weave_name for debugging purposes
232
        self._weave_name = weave_name
1185.81.6 by John Arbash Meinel
Adding an optional matcher class, which allows to use cdvdifflib matcher.
233
        if matcher is None:
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
234
            self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
1185.81.6 by John Arbash Meinel
Adding an optional matcher class, which allows to use cdvdifflib matcher.
235
        else:
236
            self._matcher = matcher
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
237
        if get_scope is None:
238
            get_scope = lambda:None
3316.2.5 by Robert Collins
Review feedback.
239
        self._get_scope = get_scope
240
        self._scope = get_scope()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
241
        self._access_mode = access_mode
3514.2.2 by John Arbash Meinel
Restore a real weave merge to 'bzr merge --weave'.
242
        self._allow_reserved = allow_reserved
0.1.60 by Martin Pool
Weave eq and ne methods
243
1185.35.41 by Aaron Bentley
Added repr for Weave
244
    def __repr__(self):
245
        return "Weave(%r)" % self._weave_name
246
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
247
    def _check_write_ok(self):
248
        """Is the versioned file marked as 'finished' ? Raise if it is."""
3316.2.5 by Robert Collins
Review feedback.
249
        if self._get_scope() != self._scope:
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
250
            raise errors.OutSideTransaction()
251
        if self._access_mode != 'w':
252
            raise errors.ReadOnlyObjectDirtiedError(self)
253
1393.1.51 by Martin Pool
- new Weave.copy()
254
    def copy(self):
255
        """Return a deep copy of self.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
256
1393.1.51 by Martin Pool
- new Weave.copy()
257
        The copy can be modified without affecting the original weave."""
258
        other = Weave()
259
        other._weave = self._weave[:]
260
        other._parents = self._parents[:]
261
        other._sha1s = self._sha1s[:]
262
        other._names = self._names[:]
263
        other._name_map = self._name_map.copy()
264
        other._weave_name = self._weave_name
265
        return other
266
0.1.60 by Martin Pool
Weave eq and ne methods
267
    def __eq__(self, other):
268
        if not isinstance(other, Weave):
269
            return False
944 by Martin Pool
- refactor member names in Weave code
270
        return self._parents == other._parents \
1083 by Martin Pool
- add space to store revision-id in weave files
271
               and self._weave == other._weave \
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
272
               and self._sha1s == other._sha1s
273
0.1.60 by Martin Pool
Weave eq and ne methods
274
    def __ne__(self, other):
275
        return not self.__eq__(other)
276
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
277
    def _idx_to_name(self, version):
278
        return self._names[version]
279
280
    def _lookup(self, name):
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
281
        """Convert symbolic version name to index."""
3514.2.2 by John Arbash Meinel
Restore a real weave merge to 'bzr merge --weave'.
282
        if not self._allow_reserved:
283
            self.check_not_reserved_id(name)
1083 by Martin Pool
- add space to store revision-id in weave files
284
        try:
285
            return self._name_map[name]
286
        except KeyError:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
287
            raise RevisionNotPresent(name, self._weave_name)
288
289
    def versions(self):
290
        """See VersionedFile.versions."""
1185.16.105 by mbp at sourcefrog
- fix Weave.names()
291
        return self._names[:]
1229 by Martin Pool
- new Weave.idx_to_name and .parents methods
292
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
293
    def has_version(self, version_id):
294
        """See VersionedFile.has_version."""
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
295
        return (version_id in self._name_map)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
296
297
    __contains__ = has_version
298
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
299
    def get_record_stream(self, versions, ordering, include_delta_closure):
300
        """Get a stream of records for versions.
301
302
        :param versions: The versions to include. Each version is a tuple
303
            (version,).
304
        :param ordering: Either 'unordered' or 'topological'. A topologically
305
            sorted stream has compression parents strictly before their
306
            children.
307
        :param include_delta_closure: If True then the closure across any
308
            compression parents will be included (in the opaque data).
309
        :return: An iterator of ContentFactory objects, each of which is only
310
            valid until the iterator is advanced.
311
        """
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.
312
        versions = [version[-1] for version in versions]
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
313
        if ordering == 'topological':
314
            parents = self.get_parent_map(versions)
3224.5.36 by Andrew Bennetts
Make topo_sort lazy in bzrlib/weave.py
315
            new_versions = tsort.topo_sort(parents)
3350.3.18 by Robert Collins
Test absent record emission more stringently.
316
            new_versions.extend(set(versions).difference(set(parents)))
317
            versions = new_versions
4111.1.1 by Robert Collins
Add a groupcompress sort order.
318
        elif ordering == 'groupcompress':
319
            parents = self.get_parent_map(versions)
320
            new_versions = sort_groupcompress(parents)
321
            new_versions.extend(set(versions).difference(set(parents)))
322
            versions = new_versions
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
323
        for version in versions:
3350.3.12 by Robert Collins
Generate streams with absent records.
324
            if version in self:
325
                yield WeaveContentFactory(version, self)
326
            else:
327
                yield AbsentContentFactory((version,))
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
328
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
329
    def get_parent_map(self, version_ids):
330
        """See VersionedFile.get_parent_map."""
331
        result = {}
332
        for version_id in version_ids:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
333
            if version_id == NULL_REVISION:
334
                parents = ()
335
            else:
336
                try:
337
                    parents = tuple(
338
                        map(self._idx_to_name,
339
                            self._parents[self._lookup(version_id)]))
340
                except RevisionNotPresent:
341
                    continue
342
            result[version_id] = parents
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
343
        return result
344
345
    def get_parents_with_ghosts(self, version_id):
346
        raise NotImplementedError(self.get_parents_with_ghosts)
1229 by Martin Pool
- new Weave.idx_to_name and .parents methods
347
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
348
    def insert_record_stream(self, stream):
349
        """Insert a record stream into this versioned file.
350
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
351
        :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.
352
        :return: None
353
        :seealso VersionedFile.get_record_stream:
354
        """
355
        adapters = {}
356
        for record in stream:
3350.3.15 by Robert Collins
Update the insert_record_stream contract to error if an absent record is provided.
357
            # Raise an error when a record is missing.
358
            if record.storage_kind == 'absent':
359
                raise RevisionNotPresent([record.key[0]], self)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
360
            # adapt to non-tuple interface
361
            parents = [parent[0] for parent in record.parents]
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
362
            if (record.storage_kind == 'fulltext'
363
                or record.storage_kind == 'chunked'):
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
364
                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.
365
                    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.
366
            else:
367
                adapter_key = record.storage_kind, 'fulltext'
368
                try:
369
                    adapter = adapters[adapter_key]
370
                except KeyError:
371
                    adapter_factory = adapter_registry.get(adapter_key)
372
                    adapter = adapter_factory(self)
373
                    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.
374
                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.
375
                try:
376
                    self.add_lines(record.key[0], parents, lines)
377
                except RevisionAlreadyPresent:
378
                    pass
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
379
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
380
    def _check_repeated_add(self, name, parents, text, sha1):
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
381
        """Check that a duplicated add is OK.
382
383
        If it is, return the (old) index; otherwise raise an exception.
384
        """
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
385
        idx = self._lookup(name)
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
386
        if sorted(self._parents[idx]) != sorted(parents) \
387
            or sha1 != self._sha1s[idx]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
388
            raise RevisionAlreadyPresent(name, self._weave_name)
1237 by Martin Pool
- allow the same version to be repeatedly added to a weave
389
        return idx
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
390
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
391
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
392
       left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
393
        """See VersionedFile.add_lines."""
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
394
        idx = self._add(version_id, lines, map(self._lookup, parents),
395
            nostore_sha=nostore_sha)
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
396
        return sha_strings(lines), sum(map(len, lines)), idx
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
397
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
398
    def _add(self, version_id, lines, parents, sha1=None, nostore_sha=None):
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
399
        """Add a single text on top of the weave.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
400
0.1.26 by Martin Pool
Refactor parameters to add command
401
        Returns the index number of the newly added version.
402
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
403
        version_id
1083 by Martin Pool
- add space to store revision-id in weave files
404
            Symbolic name for this version.
405
            (Typically the revision-id of the revision that added it.)
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
406
            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
407
0.1.26 by Martin Pool
Refactor parameters to add command
408
        parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
409
            List or set of direct parent version numbers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
410
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
411
        lines
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
412
            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.
413
414
        :param nostore_sha: See VersionedFile.add_lines.
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
415
        """
1666.1.6 by Robert Collins
Make knit the default format.
416
        self._check_lines_not_unicode(lines)
417
        self._check_lines_are_lines(lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
418
        if not sha1:
419
            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.
420
        if sha1 == nostore_sha:
421
            raise errors.ExistingContent
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
422
        if version_id is None:
423
            version_id = "sha1:" + sha1
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
424
        if version_id in self._name_map:
425
            return self._check_repeated_add(version_id, parents, lines, sha1)
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
426
938 by Martin Pool
- various optimizations to weave add code
427
        self._check_versions(parents)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
428
        ## self._check_lines(lines)
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)
1328 by Martin Pool
- slight refactoring of weave code
523
        for v in xrange(max(versions), 0, -1):
524
            if v in i:
525
                # include all its parents
526
                i.update(self._parents[v])
527
        return i
528
        ## except IndexError:
529
        ##     raise ValueError("version %d not present in weave" % v)
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
530
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
531
    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.
532
        """See VersionedFile.get_ancestry."""
533
        if isinstance(version_ids, basestring):
534
            version_ids = [version_ids]
535
        i = self._inclusions([self._lookup(v) for v in version_ids])
536
        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
537
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
538
    def _check_lines(self, text):
539
        if not isinstance(text, list):
540
            raise ValueError("text should be a list, not %s" % type(text))
541
542
        for l in text:
543
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
544
                raise ValueError("text line should be a string or unicode, not %s"
545
                                 % type(l))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
546
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
547
548
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
549
    def _check_versions(self, indexes):
550
        """Check everything in the sequence of indexes is valid"""
551
        for i in indexes:
552
            try:
944 by Martin Pool
- refactor member names in Weave code
553
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
554
            except IndexError:
555
                raise IndexError("invalid version number %r" % i)
556
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
557
    def _compatible_parents(self, my_parents, other_parents):
558
        """During join check that other_parents are joinable with my_parents.
559
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
560
        Joinable is defined as 'is a subset of' - supersets may require
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
561
        regeneration of diffs, but subsets do not.
562
        """
563
        return len(other_parents.difference(my_parents)) == 0
564
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
565
    def annotate(self, version_id):
566
        """Return a list of (version-id, line) tuples for version_id.
0.1.7 by Martin Pool
Add trivial annotate text
567
568
        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.
569
        incls = [self._lookup(version_id)]
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
570
        return [(self._idx_to_name(origin), text) for origin, lineno, text in
571
            self._extract(incls)]
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
572
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
573
    def iter_lines_added_or_present_in_versions(self, version_ids=None,
574
                                                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.
575
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
576
        if version_ids is None:
577
            version_ids = self.versions()
578
        version_ids = set(version_ids)
579
        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.
580
            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.
581
            if line[-1] != '\n':
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
582
                yield line + '\n', inserted
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
583
            else:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
584
                yield line, inserted
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
585
586
    def _walk_internal(self, version_ids=None):
587
        """Helper method for weave actions."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
588
918 by Martin Pool
- start doing new weave-merge algorithm
589
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
590
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
591
592
        lineno = 0         # line of weave, 0-based
593
944 by Martin Pool
- refactor member names in Weave code
594
        for l in self._weave:
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
595
            if l.__class__ == tuple:
918 by Martin Pool
- start doing new weave-merge algorithm
596
                c, v = l
597
                isactive = None
598
                if c == '{':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
599
                    istack.append(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
600
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
601
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
602
                elif c == '[':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
603
                    dset.add(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
604
                elif c == ']':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
605
                    dset.remove(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
606
                else:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
607
                    raise WeaveFormatError('unexpected instruction %r' % v)
918 by Martin Pool
- start doing new weave-merge algorithm
608
            else:
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
609
                yield lineno, istack[-1], frozenset(dset), l
918 by Martin Pool
- start doing new weave-merge algorithm
610
            lineno += 1
611
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
612
        if istack:
613
            raise WeaveFormatError("unclosed insertion blocks "
614
                    "at end of weave: %s" % istack)
615
        if dset:
616
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
617
                                   % dset)
918 by Martin Pool
- start doing new weave-merge algorithm
618
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
619
    def plan_merge(self, ver_a, ver_b):
620
        """Return pseudo-annotation indicating how the two versions merge.
621
622
        This is computed between versions a and b and their common
623
        base.
624
625
        Weave lines present in none of them are skipped entirely.
626
        """
627
        inc_a = set(self.get_ancestry([ver_a]))
628
        inc_b = set(self.get_ancestry([ver_b]))
629
        inc_c = inc_a & inc_b
630
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
631
        for lineno, insert, deleteset, line in self._walk_internal([ver_a, ver_b]):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
632
            if deleteset & inc_c:
633
                # killed in parent; can't be in either a or b
634
                # not relevant to our work
635
                yield 'killed-base', line
636
            elif insert in inc_c:
637
                # was inserted in base
638
                killed_a = bool(deleteset & inc_a)
639
                killed_b = bool(deleteset & inc_b)
640
                if killed_a and killed_b:
641
                    yield 'killed-both', line
642
                elif killed_a:
643
                    yield 'killed-a', line
644
                elif killed_b:
645
                    yield 'killed-b', line
646
                else:
647
                    yield 'unchanged', line
648
            elif insert in inc_a:
649
                if deleteset & inc_a:
650
                    yield 'ghost-a', line
651
                else:
652
                    # new in A; not in B
653
                    yield 'new-a', line
654
            elif insert in inc_b:
655
                if deleteset & inc_b:
656
                    yield 'ghost-b', line
657
                else:
658
                    yield 'new-b', line
659
            else:
660
                # not in either revision
661
                yield 'irrelevant', line
662
893 by Martin Pool
- Refactor weave calculation of inclusions
663
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
664
        """Yield annotation of lines in included set.
665
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
666
        Yields a sequence of tuples (origin, lineno, text), where
667
        origin is the origin version, lineno the index in the weave,
668
        and text the text of the line.
669
0.1.20 by Martin Pool
Factor out Knit.extract() method
670
        The set typically but not necessarily corresponds to a version.
671
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
672
        for i in versions:
673
            if not isinstance(i, int):
674
                raise ValueError(i)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
675
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
676
        included = self._inclusions(versions)
881 by Martin Pool
- faster weave extraction
677
678
        istack = []
1596.2.25 by Robert Collins
Weave._extract should be faster
679
        iset = set()
928 by Martin Pool
- go back to using plain builtin set()
680
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
681
682
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
683
894 by Martin Pool
- small optimization for weave extract
684
        isactive = None
0.1.85 by Martin Pool
doc
685
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
686
        result = []
687
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
688
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
689
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
690
        # wow.
1596.2.25 by Robert Collins
Weave._extract should be faster
691
        #  449       0   4474.6820   2356.5590   bzrlib.weave:556(_extract)
692
        #  +285282   0   1676.8040   1676.8040   +<isinstance>
693
        # 1.6 seconds in 'isinstance'.
694
        # changing the first isinstance:
695
        #  449       0   2814.2660   1577.1760   bzrlib.weave:556(_extract)
696
        #  +140414   0    762.8050    762.8050   +<isinstance>
697
        # note that the inline time actually dropped (less function calls)
698
        # and total processing time was halved.
699
        # we're still spending ~1/4 of the method in isinstance though.
700
        # so lets hard code the acceptable string classes we expect:
701
        #  449       0   1202.9420    786.2930   bzrlib.weave:556(_extract)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
702
        # +71352     0    377.5560    377.5560   +<method 'append' of 'list'
1596.2.25 by Robert Collins
Weave._extract should be faster
703
        #                                          objects>
704
        # yay, down to ~1/4 the initial extract time, and our inline time
705
        # has shrunk again, with isinstance no longer dominating.
706
        # tweaking the stack inclusion test to use a set gives:
707
        #  449       0   1122.8030    713.0080   bzrlib.weave:556(_extract)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
708
        # +71352     0    354.9980    354.9980   +<method 'append' of 'list'
1596.2.25 by Robert Collins
Weave._extract should be faster
709
        #                                          objects>
710
        # - a 5% win, or possibly just noise. However with large istacks that
711
        # 'in' test could dominate, so I'm leaving this change in place -
712
        # when its fast enough to consider profiling big datasets we can review.
713
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
714
715
1596.2.25 by Robert Collins
Weave._extract should be faster
716
944 by Martin Pool
- refactor member names in Weave code
717
        for l in self._weave:
1596.2.25 by Robert Collins
Weave._extract should be faster
718
            if l.__class__ == tuple:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
719
                c, v = l
894 by Martin Pool
- small optimization for weave extract
720
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
721
                if c == '{':
722
                    istack.append(v)
1596.2.25 by Robert Collins
Weave._extract should be faster
723
                    iset.add(v)
891 by Martin Pool
- fix up refactoring of weave
724
                elif c == '}':
1596.2.25 by Robert Collins
Weave._extract should be faster
725
                    iset.remove(istack.pop())
891 by Martin Pool
- fix up refactoring of weave
726
                elif c == '[':
727
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
728
                        dset.add(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
729
                elif c == ']':
891 by Martin Pool
- fix up refactoring of weave
730
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
731
                        dset.remove(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
732
                else:
733
                    raise AssertionError()
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
734
            else:
894 by Martin Pool
- small optimization for weave extract
735
                if isactive is None:
736
                    isactive = (not dset) and istack and (istack[-1] in included)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
737
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
738
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
739
            lineno += 1
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
740
        if istack:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
741
            raise WeaveFormatError("unclosed insertion blocks "
742
                    "at end of weave: %s" % istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
743
        if dset:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
744
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
745
                                   % dset)
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
746
        return result
747
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
748
    def _maybe_lookup(self, name_or_index):
749
        """Convert possible symbolic name to index, or pass through indexes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
750
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
751
        NOT FOR PUBLIC USE.
752
        """
753
        if isinstance(name_or_index, (int, long)):
754
            return name_or_index
755
        else:
756
            return self._lookup(name_or_index)
757
758
    def get_lines(self, version_id):
759
        """See VersionedFile.get_lines()."""
1596.2.30 by Robert Collins
Unbreak backwards compatability on weave.get_lines.
760
        int_index = self._maybe_lookup(version_id)
1596.2.29 by Robert Collins
Make weave.get_lines faster.
761
        result = [line for (origin, lineno, line) in self._extract([int_index])]
762
        expected_sha1 = self._sha1s[int_index]
763
        measured_sha1 = sha_strings(result)
764
        if measured_sha1 != expected_sha1:
765
            raise errors.WeaveInvalidChecksum(
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] = []
808
            new_inc = set([name])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
809
            for p in self._parents[i]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
810
                new_inc.update(inclusions[self._idx_to_name(p)])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
811
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
812
            if set(new_inc) != set(self.get_ancestry(name)):
813
                raise AssertionError(
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:
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
842
                raise errors.WeaveInvalidChecksum(
843
                        "mismatched sha1 for version %s: "
844
                        "got %s, expected %s"
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
845
                        % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
846
881 by Martin Pool
- faster weave extraction
847
        # TODO: check insertions are properly nested, that there are
848
        # no lines outside of insertion blocks, that deletions are
849
        # properly paired, etc.
850
1393.1.51 by Martin Pool
- new Weave.copy()
851
    def _imported_parents(self, other, other_idx):
852
        """Return list of parents in self corresponding to indexes in other."""
853
        new_parents = []
854
        for parent_idx in other._parents[other_idx]:
855
            parent_name = other._names[parent_idx]
1596.2.31 by Robert Collins
Remove a list __contains__ usage in weave operations.
856
            if parent_name not in self._name_map:
1393.1.51 by Martin Pool
- new Weave.copy()
857
                # should not be possible
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]
1551.3.11 by Aaron Bentley
Merge from Robert
881
            n1 = set([self._names[i] for i in self_parents])
882
            n2 = set([other._names[i] for i in other_parents])
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
883
            if not self._compatible_parents(n1, n2):
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
884
                raise WeaveParentMismatch("inconsistent parents "
885
                    "for version {%s}: %s vs %s" % (name, n1, n2))
1393.1.50 by Martin Pool
- more development of Weave.join()
886
            else:
887
                return True         # ok!
888
        else:
889
            return False
918 by Martin Pool
- start doing new weave-merge algorithm
890
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
891
    def _reweave(self, other, pb, msg):
892
        """Reweave self with other - internal helper for join().
1551.3.11 by Aaron Bentley
Merge from Robert
893
894
        :param other: The other weave to merge
895
        :param pb: An optional progress bar, indicating how far done we are
896
        :param msg: An optional message for the progress
897
        """
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
898
        new_weave = _reweave(self, other, pb=pb, msg=msg)
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
899
        self._copy_weave_content(new_weave)
900
901
    def _copy_weave_content(self, otherweave):
902
        """adsorb the content from otherweave."""
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
903
        for attr in self.__slots__:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
904
            if attr != '_weave_name':
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
905
                setattr(self, attr, copy(getattr(otherweave, attr)))
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
906
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
907
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
908
class WeaveFile(Weave):
909
    """A WeaveFile represents a Weave on disk and writes on change."""
910
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
911
    WEAVE_SUFFIX = '.weave'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
912
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
913
    def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
1563.2.25 by Robert Collins
Merge in upstream.
914
        """Create a WeaveFile.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
915
1563.2.25 by Robert Collins
Merge in upstream.
916
        :param create: If not True, only open an existing knit.
917
        """
3514.2.2 by John Arbash Meinel
Restore a real weave merge to 'bzr merge --weave'.
918
        super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
919
            allow_reserved=False)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
920
        self._transport = transport
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
921
        self._filemode = filemode
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
922
        try:
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
923
            _read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
924
        except errors.NoSuchFile:
1563.2.25 by Robert Collins
Merge in upstream.
925
            if not create:
926
                raise
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
927
            # new file, save it
928
            self._save()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
929
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
930
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
931
        left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
932
        """Add a version and save the weave."""
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
933
        self.check_not_reserved_id(version_id)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
934
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
935
            parent_texts, left_matching_blocks, nostore_sha, random_id,
936
            check_content)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
937
        self._save()
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
938
        return result
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
939
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
940
    def copy_to(self, name, transport):
941
        """See VersionedFile.copy_to()."""
942
        # as we are all in memory always, just serialise to the new place.
943
        sio = StringIO()
944
        write_weave_v5(self, sio)
945
        sio.seek(0)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
946
        transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
947
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
948
    def _save(self):
949
        """Save the weave."""
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
950
        self._check_write_ok()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
951
        sio = StringIO()
952
        write_weave_v5(self, sio)
953
        sio.seek(0)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
954
        bytes = sio.getvalue()
955
        path = self._weave_name + WeaveFile.WEAVE_SUFFIX
956
        try:
957
            self._transport.put_bytes(path, bytes, self._filemode)
958
        except errors.NoSuchFile:
959
            self._transport.mkdir(dirname(path))
960
            self._transport.put_bytes(path, bytes, self._filemode)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
961
962
    @staticmethod
963
    def get_suffixes():
964
        """See VersionedFile.get_suffixes()."""
965
        return [WeaveFile.WEAVE_SUFFIX]
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
966
3350.3.20 by Robert Collins
Remove more uses of versionedfile.join() and fix a bug with weave's insert_record_stream.
967
    def insert_record_stream(self, stream):
968
        super(WeaveFile, self).insert_record_stream(stream)
969
        self._save()
970
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
971
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.
972
def _reweave(wa, wb, pb=None, msg=None):
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
973
    """Combine two weaves and return the result.
974
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
975
    This works even if a revision R has different parents in
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
976
    wa and wb.  In the resulting weave all the parents are given.
977
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
978
    This is done by just building up a new weave, maintaining ordering
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
979
    of the versions in the two inputs.  More efficient approaches
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
980
    might be possible but it should only be necessary to do
981
    this operation rarely, when a new previously ghost version is
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
982
    inserted.
1551.3.11 by Aaron Bentley
Merge from Robert
983
984
    :param pb: An optional progress bar, indicating how far done we are
985
    :param msg: An optional message for the progress
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
986
    """
987
    wr = Weave()
988
    ia = ib = 0
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
989
    queue_a = range(wa.num_versions())
990
    queue_b = range(wb.num_versions())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
991
    # first determine combined parents of all versions
992
    # map from version name -> all parent names
993
    combined_parents = _reweave_parent_graphs(wa, wb)
994
    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.
995
    order = tsort.topo_sort(combined_parents.iteritems())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
996
    mutter("order to reweave: %r", order)
1551.3.11 by Aaron Bentley
Merge from Robert
997
998
    if pb and not msg:
999
        msg = 'reweave'
1000
1001
    for idx, name in enumerate(order):
1002
        if pb:
1003
            pb.update(msg, idx, len(order))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1004
        if name in wa._name_map:
1005
            lines = wa.get_lines(name)
1006
            if name in wb._name_map:
1551.3.11 by Aaron Bentley
Merge from Robert
1007
                lines_b = wb.get_lines(name)
1008
                if lines != lines_b:
1009
                    mutter('Weaves differ on content. rev_id {%s}', name)
1010
                    mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1011
                    import difflib
1012
                    lines = list(difflib.unified_diff(lines, lines_b,
1013
                            wa._weave_name, wb._weave_name))
1014
                    mutter('lines:\n%s', ''.join(lines))
1015
                    raise errors.WeaveTextDiffers(name, wa, wb)
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1016
        else:
1017
            lines = wb.get_lines(name)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1018
        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
1019
    return wr
1020
4415.1.2 by Martin Pool
Remove code to run weave.py as a script
1021
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1022
def _reweave_parent_graphs(wa, wb):
1023
    """Return combined parent ancestry for two weaves.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1024
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1025
    Returned as a list of (version_name, set(parent_names))"""
1026
    combined = {}
1027
    for weave in [wa, wb]:
1028
        for idx, name in enumerate(weave._names):
1029
            p = combined.setdefault(name, set())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1030
            p.update(map(weave._idx_to_name, weave._parents[idx]))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1031
    return combined