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