bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
0.1.1
by Martin Pool
 Check in old existing knit code.  | 
1  | 
#! /usr/bin/python
 | 
2  | 
||
3  | 
# Copyright (C) 2005 Canonical Ltd
 | 
|
4  | 
||
| 
0.1.33
by Martin Pool
 add gpl text  | 
5  | 
# This program is free software; you can redistribute it and/or modify
 | 
6  | 
# it under the terms of the GNU General Public License as published by
 | 
|
7  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
8  | 
# (at your option) any later version.
 | 
|
9  | 
||
10  | 
# This program is distributed in the hope that it will be useful,
 | 
|
11  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
12  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
13  | 
# GNU General Public License for more details.
 | 
|
14  | 
||
15  | 
# You should have received a copy of the GNU General Public License
 | 
|
16  | 
# along with this program; if not, write to the Free Software
 | 
|
17  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
| 
0.1.1
by Martin Pool
 Check in old existing knit code.  | 
18  | 
|
19  | 
# Author: Martin Pool <mbp@canonical.com>
 | 
|
20  | 
||
21  | 
||
| 
0.1.38
by Martin Pool
 Rename knit to weave. (I don't think there's an existing module called weave.)  | 
22  | 
"""Weave - storage of related text file versions"""
 | 
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
23  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
24  | 
|
| 
0.1.58
by Martin Pool
 doc  | 
25  | 
# XXX: If we do weaves this way, will a merge still behave the same
 | 
26  | 
# way if it's done in a different order?  That's a pretty desirable
 | 
|
27  | 
# property.
 | 
|
28  | 
||
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
29  | 
# TODO: Nothing here so far assumes the lines are really \n newlines,
 | 
30  | 
# rather than being split up in some other way.  We could accomodate
 | 
|
31  | 
# binaries, perhaps by naively splitting on \n or perhaps using
 | 
|
32  | 
# something like a rolling checksum.
 | 
|
33  | 
||
| 
0.1.85
by Martin Pool
 doc  | 
34  | 
# TODO: End marker for each version so we can stop reading?
 | 
| 
0.1.69
by Martin Pool
 Simple text-based format for storing weaves, cleaner than  | 
35  | 
|
36  | 
# TODO: Check that no insertion occurs inside a deletion that was
 | 
|
37  | 
# active in the version of the insertion.
 | 
|
38  | 
||
| 
912
by Martin Pool
 - update todos for weave  | 
39  | 
# TODO: In addition to the SHA-1 check, perhaps have some code that
 | 
40  | 
# checks structural constraints of the weave: ie that insertions are
 | 
|
41  | 
# properly nested, that there is no text outside of an insertion, that
 | 
|
42  | 
# insertions or deletions are not repeated, etc.
 | 
|
| 
0.1.85
by Martin Pool
 doc  | 
43  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
44  | 
# TODO: Parallel-extract that passes back each line along with a
 | 
45  | 
# description of which revisions include it.  Nice for checking all
 | 
|
| 
1393.1.25
by Martin Pool
 - comments in weave code  | 
46  | 
# shas or calculating stats in parallel.
 | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
47  | 
|
| 
1082
by Martin Pool
 - lift imports  | 
48  | 
# TODO: Using a single _extract routine and then processing the output
 | 
49  | 
# is probably inefficient.  It's simple enough that we can afford to
 | 
|
50  | 
# have slight specializations for different ways its used: annotate,
 | 
|
51  | 
# basis for add, get, etc.
 | 
|
52  | 
||
| 
1185.16.13
by Martin Pool
 todo  | 
53  | 
# TODO: Probably the API should work only in names to hide the integer
 | 
54  | 
# indexes from the user.
 | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
55  | 
|
| 
1328
by Martin Pool
 - slight refactoring of weave code  | 
56  | 
# TODO: Is there any potential performance win by having an add()
 | 
57  | 
# variant that is passed a pre-cooked version of the single basis
 | 
|
58  | 
# version?
 | 
|
59  | 
||
| 
1185.16.13
by Martin Pool
 todo  | 
60  | 
# TODO: Reweave can possibly be made faster by remembering diffs
 | 
61  | 
# where the basis and destination are unchanged.
 | 
|
62  | 
||
63  | 
# FIXME: Sometimes we will be given a parents list for a revision
 | 
|
64  | 
# that includes some redundant parents (i.e. already a parent of 
 | 
|
65  | 
# something in the list.)  We should eliminate them.  This can 
 | 
|
66  | 
# be done fairly efficiently because the sequence numbers constrain
 | 
|
67  | 
# the possible relationships.
 | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
68  | 
|
| 
1082
by Martin Pool
 - lift imports  | 
69  | 
|
| 
1185.50.28
by John Arbash Meinel
 Lots of updates for 'bzr check'  | 
70  | 
import os  | 
| 
1082
by Martin Pool
 - lift imports  | 
71  | 
import sha  | 
| 
1322
by Martin Pool
 - tidy up import  | 
72  | 
from difflib import SequenceMatcher  | 
| 
1237
by Martin Pool
 - allow the same version to be repeatedly added to a weave  | 
73  | 
|
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
74  | 
from bzrlib.trace import mutter  | 
| 
1185.50.23
by John Arbash Meinel
 Adding sha1 check when weave extracts a text.  | 
75  | 
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,  | 
76  | 
WeaveRevisionNotPresent, WeaveRevisionAlreadyPresent)  | 
|
77  | 
import bzrlib.errors as errors  | 
|
| 
1185.16.117
by mbp at sourcefrog
 Reweave in topological-sort order.  | 
78  | 
from bzrlib.tsort import topo_sort  | 
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
79  | 
|
| 
0.1.47
by Martin Pool
 New WeaveError and WeaveFormatError rather than assertions.  | 
80  | 
|
| 
0.1.38
by Martin Pool
 Rename knit to weave. (I don't think there's an existing module called weave.)  | 
81  | 
class Weave(object):  | 
82  | 
"""weave - versioned text file storage.  | 
|
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
83  | 
    
 | 
| 
0.1.72
by Martin Pool
 Go back to weave lines normally having newlines at the end.  | 
84  | 
    A Weave manages versions of line-based text files, keeping track
 | 
85  | 
    of the originating version for each line.
 | 
|
86  | 
||
87  | 
    To clients the "lines" of the file are represented as a list of strings.
 | 
|
88  | 
    These strings  will typically have terminal newline characters, but
 | 
|
89  | 
    this is not required.  In particular files commonly do not have a newline
 | 
|
90  | 
    at the end of the file.
 | 
|
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
91  | 
|
| 
0.1.4
by Martin Pool
 Start indexing knits by both integer and version string.  | 
92  | 
    Texts can be identified in either of two ways:
 | 
93  | 
||
94  | 
    * a nonnegative index number.
 | 
|
95  | 
||
| 
1324
by Martin Pool
 - doc  | 
96  | 
    * a version-id string.
 | 
| 
0.1.4
by Martin Pool
 Start indexing knits by both integer and version string.  | 
97  | 
|
| 
0.1.38
by Martin Pool
 Rename knit to weave. (I don't think there's an existing module called weave.)  | 
98  | 
    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.  | 
99  | 
    the version-id is used to reference it in the larger world.
 | 
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
100  | 
|
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
101  | 
    The weave is represented as a list mixing edit instructions and
 | 
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
102  | 
    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  | 
103  | 
    unicode), or a tuple.  If a string, it means that the given line
 | 
104  | 
    should be output in the currently active revisions.
 | 
|
105  | 
||
106  | 
    If a tuple, it gives a processing instruction saying in which
 | 
|
107  | 
    revisions the enclosed lines are active.  The tuple has the form
 | 
|
108  | 
    (instruction, version).
 | 
|
109  | 
||
110  | 
    The instruction can be '{' or '}' for an insertion block, and '['
 | 
|
111  | 
    and ']' for a deletion block respectively.  The version is the
 | 
|
| 
0.1.45
by Martin Pool
 doc  | 
112  | 
    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  | 
113  | 
    and inserts.  For '}', the end of an insertion, there is no
 | 
114  | 
    version parameter because it always closes the most recently
 | 
|
115  | 
    opened insertion.
 | 
|
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
116  | 
|
| 
0.1.41
by Martin Pool
 Doc  | 
117  | 
    Constraints/notes:
 | 
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
118  | 
|
119  | 
    * A later version can delete lines that were introduced by any
 | 
|
120  | 
      number of ancestor versions; this implies that deletion
 | 
|
121  | 
      instructions can span insertion blocks without regard to the
 | 
|
122  | 
      insertion block's nesting.
 | 
|
123  | 
||
| 
0.1.41
by Martin Pool
 Doc  | 
124  | 
    * Similarly, deletions need not be properly nested with regard to
 | 
125  | 
      each other, because they might have been generated by
 | 
|
126  | 
      independent revisions.
 | 
|
127  | 
||
| 
0.1.45
by Martin Pool
 doc  | 
128  | 
    * Insertions are always made by inserting a new bracketed block
 | 
129  | 
      into a single point in the previous weave.  This implies they
 | 
|
130  | 
      can nest but not overlap, and the nesting must always have later
 | 
|
131  | 
      insertions on the inside.
 | 
|
132  | 
||
| 
0.1.41
by Martin Pool
 Doc  | 
133  | 
    * It doesn't seem very useful to have an active insertion
 | 
134  | 
      inside an inactive insertion, but it might happen.
 | 
|
| 
0.1.45
by Martin Pool
 doc  | 
135  | 
      
 | 
| 
0.1.41
by Martin Pool
 Doc  | 
136  | 
    * Therefore, all instructions are always"considered"; that
 | 
137  | 
      is passed onto and off the stack.  An outer inactive block
 | 
|
138  | 
      doesn't disable an inner block.
 | 
|
139  | 
||
140  | 
    * Lines are enabled if the most recent enclosing insertion is
 | 
|
141  | 
      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  | 
142  | 
|
| 
0.1.49
by Martin Pool
 Add another constraint: revisions should not delete text that they  | 
143  | 
    * There is no point having a deletion directly inside its own
 | 
144  | 
      insertion; you might as well just not write it.  And there
 | 
|
145  | 
      should be no way to get an earlier version deleting a later
 | 
|
146  | 
      version.
 | 
|
147  | 
||
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
148  | 
    _weave
 | 
149  | 
        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.  | 
150  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
151  | 
    _parents
 | 
| 
892
by Martin Pool
 - weave stores only direct parents, and calculates and memoizes expansion as needed  | 
152  | 
        List of parents, indexed by version number.
 | 
153  | 
        It is only necessary to store the minimal set of parents for
 | 
|
154  | 
        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  | 
155  | 
|
| 
0.1.89
by Martin Pool
 Store SHA1 in weave file for later verification  | 
156  | 
    _sha1s
 | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
157  | 
        List of hex SHA-1 of each version.
 | 
158  | 
||
159  | 
    _names
 | 
|
160  | 
        List of symbolic names for each version.  Each should be unique.
 | 
|
161  | 
||
162  | 
    _name_map
 | 
|
163  | 
        For each name, the version number.
 | 
|
| 
1209
by Martin Pool
 - Add Weave._weave_name for debugging purposes  | 
164  | 
|
165  | 
    _weave_name
 | 
|
166  | 
        Descriptive name of this weave; typically the filename if known.
 | 
|
167  | 
        Set by read_weave.
 | 
|
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
168  | 
    """
 | 
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
169  | 
|
| 
1209
by Martin Pool
 - Add Weave._weave_name for debugging purposes  | 
170  | 
__slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map',  | 
171  | 
'_weave_name']  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
172  | 
|
| 
1209
by Martin Pool
 - Add Weave._weave_name for debugging purposes  | 
173  | 
def __init__(self, weave_name=None):  | 
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
174  | 
self._weave = []  | 
175  | 
self._parents = []  | 
|
| 
0.1.89
by Martin Pool
 Store SHA1 in weave file for later verification  | 
176  | 
self._sha1s = []  | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
177  | 
self._names = []  | 
178  | 
self._name_map = {}  | 
|
| 
1209
by Martin Pool
 - Add Weave._weave_name for debugging purposes  | 
179  | 
self._weave_name = weave_name  | 
| 
0.1.60
by Martin Pool
 Weave eq and ne methods  | 
180  | 
|
| 
1185.35.41
by Aaron Bentley
 Added repr for Weave  | 
181  | 
def __repr__(self):  | 
182  | 
return "Weave(%r)" % self._weave_name  | 
|
183  | 
||
| 
0.1.60
by Martin Pool
 Weave eq and ne methods  | 
184  | 
|
| 
1393.1.51
by Martin Pool
 - new Weave.copy()  | 
185  | 
def copy(self):  | 
186  | 
"""Return a deep copy of self.  | 
|
187  | 
        
 | 
|
188  | 
        The copy can be modified without affecting the original weave."""
 | 
|
189  | 
other = Weave()  | 
|
190  | 
other._weave = self._weave[:]  | 
|
191  | 
other._parents = self._parents[:]  | 
|
192  | 
other._sha1s = self._sha1s[:]  | 
|
193  | 
other._names = self._names[:]  | 
|
194  | 
other._name_map = self._name_map.copy()  | 
|
195  | 
other._weave_name = self._weave_name  | 
|
196  | 
return other  | 
|
197  | 
||
| 
0.1.60
by Martin Pool
 Weave eq and ne methods  | 
198  | 
def __eq__(self, other):  | 
199  | 
if not isinstance(other, Weave):  | 
|
200  | 
return False  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
201  | 
return self._parents == other._parents \  | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
202  | 
and self._weave == other._weave \  | 
203  | 
and self._sha1s == other._sha1s  | 
|
204  | 
||
| 
0.1.60
by Martin Pool
 Weave eq and ne methods  | 
205  | 
|
206  | 
def __ne__(self, other):  | 
|
207  | 
return not self.__eq__(other)  | 
|
208  | 
||
| 
1185.16.124
by Martin Pool
 Add Weave.__contains__.  | 
209  | 
def __contains__(self, name):  | 
210  | 
return self._name_map.has_key(name)  | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
211  | 
|
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
212  | 
def maybe_lookup(self, name_or_index):  | 
213  | 
"""Convert possible symbolic name to index, or pass through indexes."""  | 
|
214  | 
if isinstance(name_or_index, (int, long)):  | 
|
215  | 
return name_or_index  | 
|
216  | 
else:  | 
|
217  | 
return self.lookup(name_or_index)  | 
|
218  | 
||
219  | 
||
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
220  | 
def lookup(self, name):  | 
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
221  | 
"""Convert symbolic version name to index."""  | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
222  | 
try:  | 
223  | 
return self._name_map[name]  | 
|
224  | 
except KeyError:  | 
|
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
225  | 
raise WeaveRevisionNotPresent(name, self)  | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
226  | 
|
| 
1185.16.104
by mbp at sourcefrog
 Add Weave.names()  | 
227  | 
def names(self):  | 
| 
1185.16.105
by mbp at sourcefrog
 - fix Weave.names()  | 
228  | 
return self._names[:]  | 
| 
1229
by Martin Pool
 - new Weave.idx_to_name and .parents methods  | 
229  | 
|
| 
1393.1.49
by Martin Pool
 - add Weave._check_consistent_with  | 
230  | 
def iter_names(self):  | 
231  | 
"""Yield a list of all names in this weave."""  | 
|
232  | 
return iter(self._names)  | 
|
233  | 
||
| 
1229
by Martin Pool
 - new Weave.idx_to_name and .parents methods  | 
234  | 
def idx_to_name(self, version):  | 
235  | 
return self._names[version]  | 
|
236  | 
||
| 
1323
by Martin Pool
 - caller can pass SHA-1 to Weave.add for efficiency  | 
237  | 
def _check_repeated_add(self, name, parents, text, sha1):  | 
| 
1237
by Martin Pool
 - allow the same version to be repeatedly added to a weave  | 
238  | 
"""Check that a duplicated add is OK.  | 
239  | 
||
240  | 
        If it is, return the (old) index; otherwise raise an exception.
 | 
|
241  | 
        """
 | 
|
242  | 
idx = self.lookup(name)  | 
|
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
243  | 
if sorted(self._parents[idx]) != sorted(parents) \  | 
244  | 
or sha1 != self._sha1s[idx]:  | 
|
245  | 
raise WeaveRevisionAlreadyPresent(name, self)  | 
|
| 
1237
by Martin Pool
 - allow the same version to be repeatedly added to a weave  | 
246  | 
return idx  | 
247  | 
||
| 
1323
by Martin Pool
 - caller can pass SHA-1 to Weave.add for efficiency  | 
248  | 
def add(self, name, parents, text, sha1=None):  | 
| 
0.1.4
by Martin Pool
 Start indexing knits by both integer and version string.  | 
249  | 
"""Add a single text on top of the weave.  | 
| 
0.1.36
by Martin Pool
 doc  | 
250  | 
  
 | 
| 
0.1.26
by Martin Pool
 Refactor parameters to add command  | 
251  | 
        Returns the index number of the newly added version.
 | 
252  | 
||
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
253  | 
        name
 | 
254  | 
            Symbolic name for this version.
 | 
|
255  | 
            (Typically the revision-id of the revision that added it.)
 | 
|
256  | 
||
| 
0.1.26
by Martin Pool
 Refactor parameters to add command  | 
257  | 
        parents
 | 
| 
892
by Martin Pool
 - weave stores only direct parents, and calculates and memoizes expansion as needed  | 
258  | 
            List or set of direct parent version numbers.
 | 
259  | 
            
 | 
|
| 
0.1.26
by Martin Pool
 Refactor parameters to add command  | 
260  | 
        text
 | 
| 
1323
by Martin Pool
 - caller can pass SHA-1 to Weave.add for efficiency  | 
261  | 
            Sequence of lines to be added in the new version.
 | 
262  | 
||
263  | 
        sha -- SHA-1 of the file, if known.  This is trusted to be
 | 
|
264  | 
            correct if supplied.
 | 
|
265  | 
        """
 | 
|
| 
1393.1.4
by Martin Pool
 - weave tool now finds bzrlib if it's not on the default path  | 
266  | 
from bzrlib.osutils import sha_strings  | 
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
267  | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
268  | 
assert isinstance(name, basestring)  | 
| 
1323
by Martin Pool
 - caller can pass SHA-1 to Weave.add for efficiency  | 
269  | 
if sha1 is None:  | 
270  | 
sha1 = sha_strings(text)  | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
271  | 
if name in self._name_map:  | 
| 
1323
by Martin Pool
 - caller can pass SHA-1 to Weave.add for efficiency  | 
272  | 
return self._check_repeated_add(name, parents, text, sha1)  | 
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
273  | 
|
274  | 
parents = map(self.maybe_lookup, parents)  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
275  | 
self._check_versions(parents)  | 
| 
0.1.82
by Martin Pool
 Small weave optimizations  | 
276  | 
        ## self._check_lines(text)
 | 
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
277  | 
new_version = len(self._parents)  | 
| 
0.1.5
by Martin Pool
 Add test for storing two text versions.  | 
278  | 
|
| 
0.1.89
by Martin Pool
 Store SHA1 in weave file for later verification  | 
279  | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
280  | 
        # if we abort after here the (in-memory) weave will be corrupt because only
 | 
281  | 
        # some fields are updated
 | 
|
282  | 
self._parents.append(parents[:])  | 
|
| 
0.1.89
by Martin Pool
 Store SHA1 in weave file for later verification  | 
283  | 
self._sha1s.append(sha1)  | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
284  | 
self._names.append(name)  | 
285  | 
self._name_map[name] = new_version  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
286  | 
|
287  | 
||
288  | 
if not parents:  | 
|
289  | 
            # special case; adding with no parents revision; can do
 | 
|
290  | 
            # this more quickly by just appending unconditionally.
 | 
|
291  | 
            # even more specially, if we're adding an empty text we
 | 
|
292  | 
            # need do nothing at all.
 | 
|
293  | 
if text:  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
294  | 
self._weave.append(('{', new_version))  | 
295  | 
self._weave.extend(text)  | 
|
| 
1075
by Martin Pool
 - don't store redundant version number at end of insert blocks  | 
296  | 
self._weave.append(('}', None))  | 
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
297  | 
|
298  | 
return new_version  | 
|
299  | 
||
| 
941
by Martin Pool
 - allow for parents specified to Weave.add to be a set  | 
300  | 
if len(parents) == 1:  | 
301  | 
pv = list(parents)[0]  | 
|
302  | 
if sha1 == self._sha1s[pv]:  | 
|
303  | 
                # special case: same as the single parent
 | 
|
304  | 
return new_version  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
305  | 
|
306  | 
||
307  | 
ancestors = self.inclusions(parents)  | 
|
308  | 
||
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
309  | 
l = self._weave  | 
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
310  | 
|
311  | 
        # basis a list of (origin, lineno, line)
 | 
|
312  | 
basis_lineno = []  | 
|
313  | 
basis_lines = []  | 
|
314  | 
for origin, lineno, line in self._extract(ancestors):  | 
|
315  | 
basis_lineno.append(lineno)  | 
|
316  | 
basis_lines.append(line)  | 
|
317  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
318  | 
        # another small special case: a merge, producing the same text
 | 
319  | 
        # as auto-merge
 | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
320  | 
if text == basis_lines:  | 
321  | 
return new_version  | 
|
322  | 
||
323  | 
        # add a sentinal, because we can also match against the final line
 | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
324  | 
basis_lineno.append(len(self._weave))  | 
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
325  | 
|
326  | 
        # XXX: which line of the weave should we really consider
 | 
|
327  | 
        # matches the end of the file?  the current code says it's the
 | 
|
328  | 
        # last line of the weave?
 | 
|
329  | 
||
330  | 
        #print 'basis_lines:', basis_lines
 | 
|
331  | 
        #print 'new_lines:  ', lines
 | 
|
332  | 
||
333  | 
s = SequenceMatcher(None, basis_lines, text)  | 
|
334  | 
||
335  | 
        # offset gives the number of lines that have been inserted
 | 
|
336  | 
        # into the weave up to the current point; if the original edit instruction
 | 
|
337  | 
        # says to change line A then we actually change (A+offset)
 | 
|
338  | 
offset = 0  | 
|
339  | 
||
340  | 
for tag, i1, i2, j1, j2 in s.get_opcodes():  | 
|
341  | 
            # i1,i2 are given in offsets within basis_lines; we need to map them
 | 
|
342  | 
            # back to offsets within the entire weave
 | 
|
343  | 
            #print 'raw match', tag, i1, i2, j1, j2
 | 
|
344  | 
if tag == 'equal':  | 
|
345  | 
                continue
 | 
|
346  | 
||
347  | 
i1 = basis_lineno[i1]  | 
|
348  | 
i2 = basis_lineno[i2]  | 
|
349  | 
||
350  | 
assert 0 <= j1 <= j2 <= len(text)  | 
|
351  | 
||
352  | 
            #print tag, i1, i2, j1, j2
 | 
|
353  | 
||
354  | 
            # the deletion and insertion are handled separately.
 | 
|
355  | 
            # first delete the region.
 | 
|
356  | 
if i1 != i2:  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
357  | 
self._weave.insert(i1+offset, ('[', new_version))  | 
358  | 
self._weave.insert(i2+offset+1, (']', new_version))  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
359  | 
offset += 2  | 
360  | 
||
361  | 
if j1 != j2:  | 
|
362  | 
                # there may have been a deletion spanning up to
 | 
|
363  | 
                # i2; we want to insert after this region to make sure
 | 
|
364  | 
                # we don't destroy ourselves
 | 
|
365  | 
i = i2 + offset  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
366  | 
self._weave[i:i] = ([('{', new_version)]  | 
| 
1075
by Martin Pool
 - don't store redundant version number at end of insert blocks  | 
367  | 
+ text[j1:j2]  | 
368  | 
+ [('}', None)])  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
369  | 
offset += 2 + (j2 - j1)  | 
370  | 
||
371  | 
return new_version  | 
|
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
372  | 
|
| 
1092.2.22
by Robert Collins
 text_version and name_version unification looking reasonable  | 
373  | 
def add_identical(self, old_rev_id, new_rev_id, parents):  | 
374  | 
"""Add an identical text to old_rev_id as new_rev_id."""  | 
|
375  | 
old_lines = self.get(self.lookup(old_rev_id))  | 
|
376  | 
self.add(new_rev_id, parents, old_lines)  | 
|
| 
0.1.27
by Martin Pool
 Check that version numbers passed in are reasonable  | 
377  | 
|
| 
0.1.78
by Martin Pool
 Rename Weave.get_included to inclusions and getiter to get_iter  | 
378  | 
def inclusions(self, versions):  | 
| 
893
by Martin Pool
 - Refactor weave calculation of inclusions  | 
379  | 
"""Return set of all ancestors of given version(s)."""  | 
| 
928
by Martin Pool
 - go back to using plain builtin set()  | 
380  | 
i = set(versions)  | 
| 
1328
by Martin Pool
 - slight refactoring of weave code  | 
381  | 
for v in xrange(max(versions), 0, -1):  | 
382  | 
if v in i:  | 
|
383  | 
                # include all its parents
 | 
|
384  | 
i.update(self._parents[v])  | 
|
385  | 
return i  | 
|
386  | 
        ## except IndexError:
 | 
|
387  | 
        ##     raise ValueError("version %d not present in weave" % v)
 | 
|
| 
0.1.77
by Martin Pool
 New Weave.get_included() does transitive expansion  | 
388  | 
|
389  | 
||
| 
1229
by Martin Pool
 - new Weave.idx_to_name and .parents methods  | 
390  | 
def parents(self, version):  | 
391  | 
return self._parents[version]  | 
|
392  | 
||
393  | 
||
| 
1393.1.69
by Martin Pool
 - new Weave.parent_names  | 
394  | 
def parent_names(self, version):  | 
395  | 
"""Return version names for parents of a version."""  | 
|
396  | 
return map(self.idx_to_name, self._parents[self.lookup(version)])  | 
|
397  | 
||
398  | 
||
| 
890
by Martin Pool
 - weave info should show minimal expression of parents  | 
399  | 
def minimal_parents(self, version):  | 
400  | 
"""Find the minimal set of parents for the version."""  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
401  | 
included = self._parents[version]  | 
| 
890
by Martin Pool
 - weave info should show minimal expression of parents  | 
402  | 
if not included:  | 
403  | 
return []  | 
|
404  | 
||
405  | 
li = list(included)  | 
|
| 
893
by Martin Pool
 - Refactor weave calculation of inclusions  | 
406  | 
li.sort(reverse=True)  | 
| 
890
by Martin Pool
 - weave info should show minimal expression of parents  | 
407  | 
|
408  | 
mininc = []  | 
|
| 
928
by Martin Pool
 - go back to using plain builtin set()  | 
409  | 
gotit = set()  | 
| 
890
by Martin Pool
 - weave info should show minimal expression of parents  | 
410  | 
|
411  | 
for pv in li:  | 
|
412  | 
if pv not in gotit:  | 
|
413  | 
mininc.append(pv)  | 
|
| 
893
by Martin Pool
 - Refactor weave calculation of inclusions  | 
414  | 
gotit.update(self.inclusions(pv))  | 
| 
890
by Martin Pool
 - weave info should show minimal expression of parents  | 
415  | 
|
416  | 
assert mininc[0] >= 0  | 
|
417  | 
assert mininc[-1] < version  | 
|
418  | 
return mininc  | 
|
419  | 
||
420  | 
||
| 
0.1.75
by Martin Pool
 Remove VerInfo class; just store sets directly in the list of  | 
421  | 
|
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
422  | 
def _check_lines(self, text):  | 
423  | 
if not isinstance(text, list):  | 
|
424  | 
raise ValueError("text should be a list, not %s" % type(text))  | 
|
425  | 
||
426  | 
for l in text:  | 
|
427  | 
if not isinstance(l, basestring):  | 
|
| 
869
by Martin Pool
 - more weave.py command line options  | 
428  | 
raise ValueError("text line should be a string or unicode, not %s"  | 
429  | 
% type(l))  | 
|
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
430  | 
|
431  | 
||
432  | 
||
| 
0.1.27
by Martin Pool
 Check that version numbers passed in are reasonable  | 
433  | 
def _check_versions(self, indexes):  | 
434  | 
"""Check everything in the sequence of indexes is valid"""  | 
|
435  | 
for i in indexes:  | 
|
436  | 
try:  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
437  | 
self._parents[i]  | 
| 
0.1.27
by Martin Pool
 Check that version numbers passed in are reasonable  | 
438  | 
except IndexError:  | 
439  | 
raise IndexError("invalid version number %r" % i)  | 
|
440  | 
||
| 
0.1.2
by Martin Pool
 Import testsweet module adapted from bzr.  | 
441  | 
|
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
442  | 
def annotate(self, name_or_index):  | 
443  | 
return list(self.annotate_iter(name_or_index))  | 
|
444  | 
||
445  | 
||
446  | 
def annotate_iter(self, name_or_index):  | 
|
| 
0.1.7
by Martin Pool
 Add trivial annotate text  | 
447  | 
"""Yield list of (index-id, line) pairs for the specified version.  | 
448  | 
||
449  | 
        The index indicates when the line originated in the weave."""
 | 
|
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
450  | 
incls = [self.maybe_lookup(name_or_index)]  | 
451  | 
for origin, lineno, text in self._extract(incls):  | 
|
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
452  | 
yield origin, text  | 
| 
0.1.22
by Martin Pool
 Calculate delta for new versions relative to a set of parent versions.  | 
453  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
454  | 
def _walk(self):  | 
455  | 
"""Walk the weave.  | 
|
456  | 
||
457  | 
        Yields sequence of
 | 
|
458  | 
        (lineno, insert, deletes, text)
 | 
|
459  | 
        for each literal line.
 | 
|
460  | 
        """
 | 
|
461  | 
||
462  | 
istack = []  | 
|
| 
928
by Martin Pool
 - go back to using plain builtin set()  | 
463  | 
dset = set()  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
464  | 
|
465  | 
lineno = 0 # line of weave, 0-based  | 
|
466  | 
||
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
467  | 
for l in self._weave:  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
468  | 
if isinstance(l, tuple):  | 
469  | 
c, v = l  | 
|
470  | 
isactive = None  | 
|
471  | 
if c == '{':  | 
|
472  | 
istack.append(v)  | 
|
473  | 
elif c == '}':  | 
|
| 
1075
by Martin Pool
 - don't store redundant version number at end of insert blocks  | 
474  | 
istack.pop()  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
475  | 
elif c == '[':  | 
| 
926
by Martin Pool
 - update more weave code to use intsets  | 
476  | 
assert v not in dset  | 
477  | 
dset.add(v)  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
478  | 
elif c == ']':  | 
| 
926
by Martin Pool
 - update more weave code to use intsets  | 
479  | 
dset.remove(v)  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
480  | 
else:  | 
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
481  | 
raise WeaveFormatError('unexpected instruction %r' % v)  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
482  | 
else:  | 
483  | 
assert isinstance(l, basestring)  | 
|
484  | 
assert istack  | 
|
485  | 
yield lineno, istack[-1], dset, l  | 
|
486  | 
lineno += 1  | 
|
487  | 
||
| 
1185.50.27
by John Arbash Meinel
 Cleaned up the check code by using self._walk() instead of manually writing the loop.  | 
488  | 
if istack:  | 
489  | 
raise WeaveFormatError("unclosed insertion blocks "  | 
|
490  | 
"at end of weave: %s" % istack)  | 
|
491  | 
if dset:  | 
|
492  | 
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"  | 
|
493  | 
% dset)  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
494  | 
|
| 
893
by Martin Pool
 - Refactor weave calculation of inclusions  | 
495  | 
def _extract(self, versions):  | 
| 
0.1.20
by Martin Pool
 Factor out Knit.extract() method  | 
496  | 
"""Yield annotation of lines in included set.  | 
497  | 
||
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
498  | 
        Yields a sequence of tuples (origin, lineno, text), where
 | 
499  | 
        origin is the origin version, lineno the index in the weave,
 | 
|
500  | 
        and text the text of the line.
 | 
|
501  | 
||
| 
0.1.20
by Martin Pool
 Factor out Knit.extract() method  | 
502  | 
        The set typically but not necessarily corresponds to a version.
 | 
503  | 
        """
 | 
|
| 
1196
by Martin Pool
 - [WIP] retrieve historical texts from weaves  | 
504  | 
for i in versions:  | 
505  | 
if not isinstance(i, int):  | 
|
506  | 
raise ValueError(i)  | 
|
507  | 
||
| 
893
by Martin Pool
 - Refactor weave calculation of inclusions  | 
508  | 
included = self.inclusions(versions)  | 
| 
881
by Martin Pool
 - faster weave extraction  | 
509  | 
|
510  | 
istack = []  | 
|
| 
928
by Martin Pool
 - go back to using plain builtin set()  | 
511  | 
dset = set()  | 
| 
0.1.48
by Martin Pool
 Basic parsing of delete instructions.  | 
512  | 
|
513  | 
lineno = 0 # line of weave, 0-based  | 
|
| 
891
by Martin Pool
 - fix up refactoring of weave  | 
514  | 
|
| 
894
by Martin Pool
 - small optimization for weave extract  | 
515  | 
isactive = None  | 
| 
0.1.85
by Martin Pool
 doc  | 
516  | 
|
| 
931
by Martin Pool
 - experiment with making Weave._extract() return a list, not a generator - slightly faster  | 
517  | 
result = []  | 
518  | 
||
| 
0.1.63
by Martin Pool
 Abbreviate WeaveFormatError in some code  | 
519  | 
WFE = WeaveFormatError  | 
| 
0.1.95
by Martin Pool
 - preliminary merge conflict detection  | 
520  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
521  | 
for l in self._weave:  | 
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
522  | 
if isinstance(l, tuple):  | 
523  | 
c, v = l  | 
|
| 
894
by Martin Pool
 - small optimization for weave extract  | 
524  | 
isactive = None  | 
| 
891
by Martin Pool
 - fix up refactoring of weave  | 
525  | 
if c == '{':  | 
526  | 
assert v not in istack  | 
|
527  | 
istack.append(v)  | 
|
528  | 
elif c == '}':  | 
|
| 
1075
by Martin Pool
 - don't store redundant version number at end of insert blocks  | 
529  | 
istack.pop()  | 
| 
891
by Martin Pool
 - fix up refactoring of weave  | 
530  | 
elif c == '[':  | 
531  | 
if v in included:  | 
|
| 
881
by Martin Pool
 - faster weave extraction  | 
532  | 
assert v not in dset  | 
| 
0.1.48
by Martin Pool
 Basic parsing of delete instructions.  | 
533  | 
dset.add(v)  | 
| 
891
by Martin Pool
 - fix up refactoring of weave  | 
534  | 
else:  | 
535  | 
assert c == ']'  | 
|
536  | 
if v in included:  | 
|
| 
881
by Martin Pool
 - faster weave extraction  | 
537  | 
assert v in dset  | 
| 
0.1.48
by Martin Pool
 Basic parsing of delete instructions.  | 
538  | 
dset.remove(v)  | 
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
539  | 
else:  | 
540  | 
assert isinstance(l, basestring)  | 
|
| 
894
by Martin Pool
 - small optimization for weave extract  | 
541  | 
if isactive is None:  | 
542  | 
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  | 
543  | 
if isactive:  | 
| 
931
by Martin Pool
 - experiment with making Weave._extract() return a list, not a generator - slightly faster  | 
544  | 
result.append((istack[-1], lineno, l))  | 
| 
0.1.39
by Martin Pool
 Change to a more realistic weave structure which can represent insertions and  | 
545  | 
lineno += 1  | 
| 
0.1.46
by Martin Pool
 More constraints on structure of weave, and checks that they work  | 
546  | 
if istack:  | 
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
547  | 
raise WeaveFormatError("unclosed insertion blocks "  | 
548  | 
"at end of weave: %s" % istack)  | 
|
| 
0.1.48
by Martin Pool
 Basic parsing of delete instructions.  | 
549  | 
if dset:  | 
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
550  | 
raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"  | 
551  | 
% dset)  | 
|
| 
931
by Martin Pool
 - experiment with making Weave._extract() return a list, not a generator - slightly faster  | 
552  | 
return result  | 
553  | 
||
| 
0.1.7
by Martin Pool
 Add trivial annotate text  | 
554  | 
|
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
555  | 
def get_iter(self, name_or_index):  | 
| 
0.1.5
by Martin Pool
 Add test for storing two text versions.  | 
556  | 
"""Yield lines for the specified version."""  | 
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
557  | 
incls = [self.maybe_lookup(name_or_index)]  | 
| 
1185.50.23
by John Arbash Meinel
 Adding sha1 check when weave extracts a text.  | 
558  | 
if len(incls) == 1:  | 
| 
1185.50.29
by John Arbash Meinel
 Whitespace and other formatting cleanups suggested by Robert.  | 
559  | 
index = incls[0]  | 
560  | 
cur_sha = sha.new()  | 
|
| 
1185.50.23
by John Arbash Meinel
 Adding sha1 check when weave extracts a text.  | 
561  | 
else:  | 
562  | 
            # We don't have sha1 sums for multiple entries
 | 
|
| 
1185.50.29
by John Arbash Meinel
 Whitespace and other formatting cleanups suggested by Robert.  | 
563  | 
cur_sha = None  | 
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
564  | 
for origin, lineno, line in self._extract(incls):  | 
| 
1185.50.29
by John Arbash Meinel
 Whitespace and other formatting cleanups suggested by Robert.  | 
565  | 
if cur_sha:  | 
566  | 
cur_sha.update(line)  | 
|
| 
0.1.8
by Martin Pool
 Unify get/annotate code  | 
567  | 
yield line  | 
| 
1185.50.29
by John Arbash Meinel
 Whitespace and other formatting cleanups suggested by Robert.  | 
568  | 
if cur_sha:  | 
| 
1185.50.23
by John Arbash Meinel
 Adding sha1 check when weave extracts a text.  | 
569  | 
expected_sha1 = self._sha1s[index]  | 
| 
1185.50.29
by John Arbash Meinel
 Whitespace and other formatting cleanups suggested by Robert.  | 
570  | 
measured_sha1 = cur_sha.hexdigest()  | 
| 
1185.50.23
by John Arbash Meinel
 Adding sha1 check when weave extracts a text.  | 
571  | 
if measured_sha1 != expected_sha1:  | 
572  | 
raise errors.WeaveInvalidChecksum(  | 
|
573  | 
'file %s, revision %s, expected: %s, measured %s'  | 
|
574  | 
% (self._weave_name, self._names[index],  | 
|
575  | 
expected_sha1, measured_sha1))  | 
|
| 
0.1.5
by Martin Pool
 Add test for storing two text versions.  | 
576  | 
|
577  | 
||
| 
1369
by Martin Pool
 - try to avoid redundant conversion of strings when retrieving from weaves  | 
578  | 
def get_text(self, name_or_index):  | 
579  | 
return ''.join(self.get_iter(name_or_index))  | 
|
580  | 
assert isinstance(version, int)  | 
|
581  | 
||
582  | 
||
583  | 
def get_lines(self, name_or_index):  | 
|
| 
1269
by Martin Pool
 - some weave operations automatically look up symbolic names if supplied  | 
584  | 
return list(self.get_iter(name_or_index))  | 
| 
0.1.1
by Martin Pool
 Check in old existing knit code.  | 
585  | 
|
586  | 
||
| 
1369
by Martin Pool
 - try to avoid redundant conversion of strings when retrieving from weaves  | 
587  | 
get = get_lines  | 
588  | 
||
589  | 
||
| 
1185.50.28
by John Arbash Meinel
 Lots of updates for 'bzr check'  | 
590  | 
def get_sha1(self, name):  | 
591  | 
"""Get the stored sha1 sum for the given revision.  | 
|
592  | 
        
 | 
|
593  | 
        :param name: The name of the version to lookup
 | 
|
594  | 
        """
 | 
|
595  | 
return self._sha1s[self.lookup(name)]  | 
|
596  | 
||
| 
0.1.95
by Martin Pool
 - preliminary merge conflict detection  | 
597  | 
def mash_iter(self, included):  | 
| 
0.1.65
by Martin Pool
 Add Weave.merge_iter to get automerged lines  | 
598  | 
"""Return composed version of multiple included versions."""  | 
| 
1338
by Martin Pool
 - Weave.mash_iter optionally takes names rather than indexes  | 
599  | 
included = map(self.maybe_lookup, included)  | 
| 
893
by Martin Pool
 - Refactor weave calculation of inclusions  | 
600  | 
for origin, lineno, text in self._extract(included):  | 
| 
0.1.65
by Martin Pool
 Add Weave.merge_iter to get automerged lines  | 
601  | 
yield text  | 
602  | 
||
603  | 
||
| 
0.1.11
by Martin Pool
 Add Knit.dump method  | 
604  | 
def dump(self, to_file):  | 
605  | 
from pprint import pprint  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
606  | 
print >>to_file, "Weave._weave = ",  | 
607  | 
pprint(self._weave, to_file)  | 
|
608  | 
print >>to_file, "Weave._parents = ",  | 
|
609  | 
pprint(self._parents, to_file)  | 
|
| 
0.1.11
by Martin Pool
 Add Knit.dump method  | 
610  | 
|
611  | 
||
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
612  | 
|
613  | 
def numversions(self):  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
614  | 
l = len(self._parents)  | 
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
615  | 
assert l == len(self._sha1s)  | 
616  | 
return l  | 
|
617  | 
||
618  | 
||
| 
946
by Martin Pool
 - weave info only shows the weave headers, doesn't extract every version:  | 
619  | 
def __len__(self):  | 
620  | 
return self.numversions()  | 
|
621  | 
||
| 
894
by Martin Pool
 - small optimization for weave extract  | 
622  | 
def check(self, progress_bar=None):  | 
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
623  | 
        # check no circular inclusions
 | 
624  | 
for version in range(self.numversions()):  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
625  | 
inclusions = list(self._parents[version])  | 
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
626  | 
if inclusions:  | 
627  | 
inclusions.sort()  | 
|
628  | 
if inclusions[-1] >= version:  | 
|
| 
0.1.47
by Martin Pool
 New WeaveError and WeaveFormatError rather than assertions.  | 
629  | 
raise WeaveFormatError("invalid included version %d for index %d"  | 
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
630  | 
% (inclusions[-1], version))  | 
631  | 
||
| 
1185.50.26
by John Arbash Meinel
 Change Weave.check() so that it checks all revisions in parallel.  | 
632  | 
        # try extracting all versions; parallel extraction is used
 | 
| 
894
by Martin Pool
 - small optimization for weave extract  | 
633  | 
nv = self.numversions()  | 
| 
1185.50.26
by John Arbash Meinel
 Change Weave.check() so that it checks all revisions in parallel.  | 
634  | 
sha1s = [sha.new() for i in range(nv)]  | 
635  | 
texts = [[] for i in range(nv)]  | 
|
636  | 
inclusions = []  | 
|
637  | 
for i in range(nv):  | 
|
638  | 
            # For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
 | 
|
639  | 
            # The problem is that set membership is much more expensive
 | 
|
640  | 
new_inc = set([i])  | 
|
641  | 
for p in self._parents[i]:  | 
|
642  | 
new_inc.update(inclusions[p])  | 
|
643  | 
||
644  | 
            #assert set(new_inc) == self.inclusions([i]), 'failed %s != %s' % (new_inc, self.inclusions([i]))
 | 
|
645  | 
inclusions.append(new_inc)  | 
|
646  | 
||
647  | 
nlines = len(self._weave)  | 
|
| 
1185.50.28
by John Arbash Meinel
 Lots of updates for 'bzr check'  | 
648  | 
|
649  | 
update_text = 'checking weave'  | 
|
650  | 
if self._weave_name:  | 
|
651  | 
short_name = os.path.basename(self._weave_name)  | 
|
652  | 
update_text = 'checking %s' % (short_name,)  | 
|
653  | 
update_text = update_text[:25]  | 
|
654  | 
||
| 
1185.50.27
by John Arbash Meinel
 Cleaned up the check code by using self._walk() instead of manually writing the loop.  | 
655  | 
for lineno, insert, deleteset, line in self._walk():  | 
| 
1185.50.26
by John Arbash Meinel
 Change Weave.check() so that it checks all revisions in parallel.  | 
656  | 
if progress_bar:  | 
| 
1185.50.28
by John Arbash Meinel
 Lots of updates for 'bzr check'  | 
657  | 
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.  | 
658  | 
|
659  | 
for j, j_inc in enumerate(inclusions):  | 
|
660  | 
                # The active inclusion must be an ancestor,
 | 
|
661  | 
                # and no ancestors must have deleted this line,
 | 
|
662  | 
                # because we don't support resurrection.
 | 
|
663  | 
if (insert in j_inc) and not (deleteset & j_inc):  | 
|
664  | 
sha1s[j].update(line)  | 
|
| 
1185.50.26
by John Arbash Meinel
 Change Weave.check() so that it checks all revisions in parallel.  | 
665  | 
|
| 
894
by Martin Pool
 - small optimization for weave extract  | 
666  | 
for version in range(nv):  | 
| 
1185.50.26
by John Arbash Meinel
 Change Weave.check() so that it checks all revisions in parallel.  | 
667  | 
hd = sha1s[version].hexdigest()  | 
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
668  | 
expected = self._sha1s[version]  | 
669  | 
if hd != expected:  | 
|
| 
1185.50.26
by John Arbash Meinel
 Change Weave.check() so that it checks all revisions in parallel.  | 
670  | 
raise errors.WeaveInvalidChecksum(  | 
671  | 
"mismatched sha1 for version %s: "  | 
|
672  | 
"got %s, expected %s"  | 
|
673  | 
% (self._names[version], hd, expected))  | 
|
| 
0.1.18
by Martin Pool
 Better Knit.dump method  | 
674  | 
|
| 
881
by Martin Pool
 - faster weave extraction  | 
675  | 
        # TODO: check insertions are properly nested, that there are
 | 
676  | 
        # no lines outside of insertion blocks, that deletions are
 | 
|
677  | 
        # properly paired, etc.
 | 
|
678  | 
||
| 
0.1.21
by Martin Pool
 Start computing a delta to insert a new revision  | 
679  | 
def _delta(self, included, lines):  | 
680  | 
"""Return changes from basis to new revision.  | 
|
681  | 
||
682  | 
        The old text for comparison is the union of included revisions.
 | 
|
683  | 
||
684  | 
        This is used in inserting a new text.
 | 
|
| 
0.1.22
by Martin Pool
 Calculate delta for new versions relative to a set of parent versions.  | 
685  | 
|
| 
0.1.55
by Martin Pool
 doc  | 
686  | 
        Delta is returned as a sequence of
 | 
687  | 
        (weave1, weave2, newlines).
 | 
|
688  | 
||
689  | 
        This indicates that weave1:weave2 of the old weave should be
 | 
|
| 
0.1.22
by Martin Pool
 Calculate delta for new versions relative to a set of parent versions.  | 
690  | 
        replaced by the sequence of lines in newlines.  Note that
 | 
691  | 
        these line numbers are positions in the total weave and don't
 | 
|
692  | 
        correspond to the lines in any extracted version, or even the
 | 
|
693  | 
        extracted union of included versions.
 | 
|
694  | 
||
695  | 
        If line1=line2, this is a pure insert; if newlines=[] this is a
 | 
|
696  | 
        pure delete.  (Similar to difflib.)
 | 
|
| 
0.1.21
by Martin Pool
 Start computing a delta to insert a new revision  | 
697  | 
        """
 | 
| 
1393.1.47
by Martin Pool
 - Weave._delta is not implemented at the moment  | 
698  | 
raise NotImplementedError()  | 
| 
0.1.1
by Martin Pool
 Check in old existing knit code.  | 
699  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
700  | 
|
701  | 
def plan_merge(self, ver_a, ver_b):  | 
|
702  | 
"""Return pseudo-annotation indicating how the two versions merge.  | 
|
703  | 
||
704  | 
        This is computed between versions a and b and their common
 | 
|
705  | 
        base.
 | 
|
706  | 
||
707  | 
        Weave lines present in none of them are skipped entirely.
 | 
|
708  | 
        """
 | 
|
| 
926
by Martin Pool
 - update more weave code to use intsets  | 
709  | 
inc_a = self.inclusions([ver_a])  | 
710  | 
inc_b = self.inclusions([ver_b])  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
711  | 
inc_c = inc_a & inc_b  | 
712  | 
||
713  | 
for lineno, insert, deleteset, line in self._walk():  | 
|
714  | 
if deleteset & inc_c:  | 
|
715  | 
                # killed in parent; can't be in either a or b
 | 
|
716  | 
                # not relevant to our work
 | 
|
717  | 
yield 'killed-base', line  | 
|
| 
926
by Martin Pool
 - update more weave code to use intsets  | 
718  | 
elif insert in inc_c:  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
719  | 
                # was inserted in base
 | 
720  | 
killed_a = bool(deleteset & inc_a)  | 
|
721  | 
killed_b = bool(deleteset & inc_b)  | 
|
722  | 
if killed_a and killed_b:  | 
|
723  | 
yield 'killed-both', line  | 
|
724  | 
elif killed_a:  | 
|
725  | 
yield 'killed-a', line  | 
|
726  | 
elif killed_b:  | 
|
727  | 
yield 'killed-b', line  | 
|
728  | 
else:  | 
|
729  | 
yield 'unchanged', line  | 
|
| 
926
by Martin Pool
 - update more weave code to use intsets  | 
730  | 
elif insert in inc_a:  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
731  | 
if deleteset & inc_a:  | 
732  | 
yield 'ghost-a', line  | 
|
733  | 
else:  | 
|
734  | 
                    # new in A; not in B
 | 
|
735  | 
yield 'new-a', line  | 
|
| 
926
by Martin Pool
 - update more weave code to use intsets  | 
736  | 
elif insert in inc_b:  | 
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
737  | 
if deleteset & inc_b:  | 
738  | 
yield 'ghost-b', line  | 
|
739  | 
else:  | 
|
740  | 
yield 'new-b', line  | 
|
741  | 
else:  | 
|
742  | 
                # not in either revision
 | 
|
743  | 
yield 'irrelevant', line  | 
|
744  | 
||
| 
919
by Martin Pool
 - more development of weave-merge  | 
745  | 
yield 'unchanged', '' # terminator  | 
746  | 
||
747  | 
||
748  | 
||
749  | 
def weave_merge(self, plan):  | 
|
750  | 
lines_a = []  | 
|
751  | 
lines_b = []  | 
|
752  | 
ch_a = ch_b = False  | 
|
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
753  | 
        # TODO: Return a structured form of the conflicts (e.g. 2-tuples for
 | 
754  | 
        # conflicted regions), rather than just inserting the markers.
 | 
|
755  | 
        # 
 | 
|
756  | 
        # TODO: Show some version information (e.g. author, date) on 
 | 
|
757  | 
        # conflicted regions.
 | 
|
| 
919
by Martin Pool
 - more development of weave-merge  | 
758  | 
for state, line in plan:  | 
759  | 
if state == 'unchanged' or state == 'killed-both':  | 
|
760  | 
                # resync and flush queued conflicts changes if any
 | 
|
761  | 
if not lines_a and not lines_b:  | 
|
762  | 
                    pass
 | 
|
763  | 
elif ch_a and not ch_b:  | 
|
764  | 
                    # one-sided change:                    
 | 
|
765  | 
for l in lines_a: yield l  | 
|
766  | 
elif ch_b and not ch_a:  | 
|
767  | 
for l in lines_b: yield l  | 
|
768  | 
elif lines_a == lines_b:  | 
|
769  | 
for l in lines_a: yield l  | 
|
770  | 
else:  | 
|
| 
1185.12.86
by Aaron Bentley
 Switched to standard 7-char conflict markers  | 
771  | 
yield '<<<<<<<\n'  | 
| 
919
by Martin Pool
 - more development of weave-merge  | 
772  | 
for l in lines_a: yield l  | 
| 
1185.12.86
by Aaron Bentley
 Switched to standard 7-char conflict markers  | 
773  | 
yield '=======\n'  | 
| 
919
by Martin Pool
 - more development of weave-merge  | 
774  | 
for l in lines_b: yield l  | 
| 
1185.12.86
by Aaron Bentley
 Switched to standard 7-char conflict markers  | 
775  | 
yield '>>>>>>>\n'  | 
| 
919
by Martin Pool
 - more development of weave-merge  | 
776  | 
|
777  | 
del lines_a[:]  | 
|
778  | 
del lines_b[:]  | 
|
779  | 
ch_a = ch_b = False  | 
|
780  | 
||
781  | 
if state == 'unchanged':  | 
|
782  | 
if line:  | 
|
783  | 
yield line  | 
|
784  | 
elif state == 'killed-a':  | 
|
785  | 
ch_a = True  | 
|
786  | 
lines_b.append(line)  | 
|
787  | 
elif state == 'killed-b':  | 
|
788  | 
ch_b = True  | 
|
789  | 
lines_a.append(line)  | 
|
790  | 
elif state == 'new-a':  | 
|
791  | 
ch_a = True  | 
|
792  | 
lines_a.append(line)  | 
|
793  | 
elif state == 'new-b':  | 
|
794  | 
ch_b = True  | 
|
795  | 
lines_b.append(line)  | 
|
796  | 
else:  | 
|
| 
920
by Martin Pool
 - add more test cases for weave_merge  | 
797  | 
assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',  | 
798  | 
'killed-both'), \  | 
|
| 
919
by Martin Pool
 - more development of weave-merge  | 
799  | 
                       state
 | 
800  | 
||
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
801  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
802  | 
def join(self, other, pb=None, msg=None):  | 
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
803  | 
import sys, time  | 
| 
1393.1.48
by Martin Pool
 - Add stub Weave.join() method  | 
804  | 
"""Integrate versions from other into this weave.  | 
805  | 
||
| 
1393.1.49
by Martin Pool
 - add Weave._check_consistent_with  | 
806  | 
        The resulting weave contains all the history of both weaves; 
 | 
807  | 
        any version you could retrieve from either self or other can be 
 | 
|
808  | 
        retrieved from self after this call.
 | 
|
| 
1393.1.48
by Martin Pool
 - Add stub Weave.join() method  | 
809  | 
|
| 
1393.1.49
by Martin Pool
 - add Weave._check_consistent_with  | 
810  | 
        It is illegal for the two weaves to contain different values 
 | 
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
811  | 
        or different parents for any version.  See also reweave().
 | 
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
812  | 
|
813  | 
        :param other: The other weave to pull into this one
 | 
|
814  | 
        :param pb: An optional progress bar
 | 
|
815  | 
        :param msg: An optional message to display for progress
 | 
|
| 
1393.1.48
by Martin Pool
 - Add stub Weave.join() method  | 
816  | 
        """
 | 
817  | 
if other.numversions() == 0:  | 
|
818  | 
return # nothing to update, easy  | 
|
| 
1185.13.4
by Robert Collins
 make reweave visible as a weave method, and quickly integrate into fetch  | 
819  | 
        # two loops so that we do not change ourselves before verifying it
 | 
820  | 
        # will be ok
 | 
|
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
821  | 
        # work through in index order to make sure we get all dependencies
 | 
| 
1185.77.1
by John Arbash Meinel
 Simplifying what bzr displays when merging  | 
822  | 
names_to_join = []  | 
823  | 
processed = 0  | 
|
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
824  | 
for other_idx, name in enumerate(other._names):  | 
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
825  | 
self._check_version_consistent(other, other_idx, name)  | 
| 
1185.77.1
by John Arbash Meinel
 Simplifying what bzr displays when merging  | 
826  | 
sha1 = other._sha1s[other_idx]  | 
827  | 
||
828  | 
processed += 1  | 
|
829  | 
||
830  | 
if name in self._name_map:  | 
|
831  | 
idx = self.lookup(name)  | 
|
832  | 
n1 = set(map(other.idx_to_name, other._parents[other_idx]))  | 
|
833  | 
n2 = set(map(self.idx_to_name, self._parents[idx]))  | 
|
834  | 
if sha1 == self._sha1s[idx] and n1 == n2:  | 
|
835  | 
                        continue
 | 
|
836  | 
||
837  | 
names_to_join.append((other_idx, name))  | 
|
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
838  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
839  | 
if pb and not msg:  | 
840  | 
msg = 'weave join'  | 
|
841  | 
||
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
842  | 
merged = 0  | 
843  | 
time0 = time.time( )  | 
|
| 
1185.77.1
by John Arbash Meinel
 Simplifying what bzr displays when merging  | 
844  | 
for other_idx, name in names_to_join:  | 
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
845  | 
            # TODO: If all the parents of the other version are already
 | 
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
846  | 
            # present then we can avoid some work by just taking the delta
 | 
847  | 
            # and adjusting the offsets.
 | 
|
| 
1393.1.51
by Martin Pool
 - new Weave.copy()  | 
848  | 
new_parents = self._imported_parents(other, other_idx)  | 
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
849  | 
sha1 = other._sha1s[other_idx]  | 
850  | 
||
| 
1185.77.1
by John Arbash Meinel
 Simplifying what bzr displays when merging  | 
851  | 
merged += 1  | 
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
852  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
853  | 
if pb:  | 
| 
1185.77.1
by John Arbash Meinel
 Simplifying what bzr displays when merging  | 
854  | 
pb.update(msg, merged, len(names_to_join))  | 
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
855  | 
|
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
856  | 
lines = other.get_lines(other_idx)  | 
857  | 
self.add(name, new_parents, lines, sha1)  | 
|
858  | 
||
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
859  | 
mutter("merged = %d, processed = %d, file_id=%s; deltat=%d"%(  | 
| 
1185.77.1
by John Arbash Meinel
 Simplifying what bzr displays when merging  | 
860  | 
merged, processed, self._weave_name, time.time( )-time0))  | 
| 
1185.33.93
by Martin Pool
 [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)  | 
861  | 
|
| 
1393.1.51
by Martin Pool
 - new Weave.copy()  | 
862  | 
def _imported_parents(self, other, other_idx):  | 
863  | 
"""Return list of parents in self corresponding to indexes in other."""  | 
|
864  | 
new_parents = []  | 
|
865  | 
for parent_idx in other._parents[other_idx]:  | 
|
866  | 
parent_name = other._names[parent_idx]  | 
|
867  | 
if parent_name not in self._names:  | 
|
868  | 
                # should not be possible
 | 
|
869  | 
raise WeaveError("missing parent {%s} of {%s} in %r"  | 
|
870  | 
% (parent_name, other._name_map[other_idx], self))  | 
|
871  | 
new_parents.append(self._name_map[parent_name])  | 
|
872  | 
return new_parents  | 
|
873  | 
||
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
874  | 
def _check_version_consistent(self, other, other_idx, name):  | 
875  | 
"""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  | 
876  | 
|
877  | 
        To be consistent it must have:
 | 
|
878  | 
||
879  | 
         * the same text
 | 
|
880  | 
         * the same direct parents (by name, not index, and disregarding
 | 
|
881  | 
           order)
 | 
|
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
882  | 
        
 | 
883  | 
        If present & correct return True;
 | 
|
884  | 
        if not present in self return False; 
 | 
|
885  | 
        if inconsistent raise error."""
 | 
|
886  | 
this_idx = self._name_map.get(name, -1)  | 
|
887  | 
if this_idx != -1:  | 
|
888  | 
if self._sha1s[this_idx] != other._sha1s[other_idx]:  | 
|
| 
1393.1.66
by Martin Pool
 - fix join of weaves where parents occur at different offsets  | 
889  | 
raise WeaveError("inconsistent texts for version {%s} "  | 
890  | 
                                 "when joining weaves"
 | 
|
891  | 
% (name))  | 
|
892  | 
self_parents = self._parents[this_idx]  | 
|
893  | 
other_parents = other._parents[other_idx]  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
894  | 
n1 = set([self._names[i] for i in self_parents])  | 
895  | 
n2 = set([other._names[i] for i in other_parents])  | 
|
| 
1393.1.66
by Martin Pool
 - fix join of weaves where parents occur at different offsets  | 
896  | 
if n1 != n2:  | 
| 
1185.13.4
by Robert Collins
 make reweave visible as a weave method, and quickly integrate into fetch  | 
897  | 
raise WeaveParentMismatch("inconsistent parents "  | 
898  | 
"for version {%s}: %s vs %s" % (name, n1, n2))  | 
|
| 
1393.1.50
by Martin Pool
 - more development of Weave.join()  | 
899  | 
else:  | 
900  | 
return True # ok!  | 
|
901  | 
else:  | 
|
902  | 
return False  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
903  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
904  | 
def reweave(self, other, pb=None, msg=None):  | 
905  | 
"""Reweave self with other.  | 
|
906  | 
||
907  | 
        :param other: The other weave to merge
 | 
|
908  | 
        :param pb: An optional progress bar, indicating how far done we are
 | 
|
909  | 
        :param msg: An optional message for the progress
 | 
|
910  | 
        """
 | 
|
911  | 
new_weave = reweave(self, other, pb=pb, msg=msg)  | 
|
| 
1185.13.4
by Robert Collins
 make reweave visible as a weave method, and quickly integrate into fetch  | 
912  | 
for attr in self.__slots__:  | 
913  | 
setattr(self, attr, getattr(new_weave, attr))  | 
|
914  | 
||
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
915  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
916  | 
def reweave(wa, wb, pb=None, msg=None):  | 
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
917  | 
"""Combine two weaves and return the result.  | 
918  | 
||
919  | 
    This works even if a revision R has different parents in 
 | 
|
920  | 
    wa and wb.  In the resulting weave all the parents are given.
 | 
|
921  | 
||
922  | 
    This is done by just building up a new weave, maintaining ordering 
 | 
|
923  | 
    of the versions in the two inputs.  More efficient approaches
 | 
|
924  | 
    might be possible but it should only be necessary to do 
 | 
|
925  | 
    this operation rarely, when a new previously ghost version is 
 | 
|
926  | 
    inserted.
 | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
927  | 
|
928  | 
    :param pb: An optional progress bar, indicating how far done we are
 | 
|
929  | 
    :param msg: An optional message for the progress
 | 
|
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
930  | 
    """
 | 
931  | 
wr = Weave()  | 
|
932  | 
ia = ib = 0  | 
|
933  | 
queue_a = range(wa.numversions())  | 
|
934  | 
queue_b = range(wb.numversions())  | 
|
935  | 
    # first determine combined parents of all versions
 | 
|
936  | 
    # map from version name -> all parent names
 | 
|
937  | 
combined_parents = _reweave_parent_graphs(wa, wb)  | 
|
938  | 
mutter("combined parents: %r", combined_parents)  | 
|
| 
1185.16.117
by mbp at sourcefrog
 Reweave in topological-sort order.  | 
939  | 
order = topo_sort(combined_parents.iteritems())  | 
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
940  | 
mutter("order to reweave: %r", order)  | 
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
941  | 
|
942  | 
if pb and not msg:  | 
|
943  | 
msg = 'reweave'  | 
|
944  | 
||
945  | 
for idx, name in enumerate(order):  | 
|
946  | 
if pb:  | 
|
947  | 
pb.update(msg, idx, len(order))  | 
|
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
948  | 
if name in wa._name_map:  | 
949  | 
lines = wa.get_lines(name)  | 
|
950  | 
if name in wb._name_map:  | 
|
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
951  | 
lines_b = wb.get_lines(name)  | 
952  | 
if lines != lines_b:  | 
|
953  | 
mutter('Weaves differ on content. rev_id {%s}', name)  | 
|
954  | 
mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)  | 
|
955  | 
import difflib  | 
|
956  | 
lines = list(difflib.unified_diff(lines, lines_b,  | 
|
957  | 
wa._weave_name, wb._weave_name))  | 
|
958  | 
mutter('lines:\n%s', ''.join(lines))  | 
|
959  | 
raise errors.WeaveTextDiffers(name, wa, wb)  | 
|
| 
1393.1.68
by Martin Pool
 - add reweave that joins with ghosts  | 
960  | 
else:  | 
961  | 
lines = wb.get_lines(name)  | 
|
962  | 
wr.add(name, combined_parents[name], lines)  | 
|
963  | 
return wr  | 
|
964  | 
||
965  | 
||
966  | 
def _reweave_parent_graphs(wa, wb):  | 
|
967  | 
"""Return combined parent ancestry for two weaves.  | 
|
968  | 
    
 | 
|
969  | 
    Returned as a list of (version_name, set(parent_names))"""
 | 
|
970  | 
combined = {}  | 
|
971  | 
for weave in [wa, wb]:  | 
|
972  | 
for idx, name in enumerate(weave._names):  | 
|
973  | 
p = combined.setdefault(name, set())  | 
|
974  | 
p.update(map(weave.idx_to_name, weave._parents[idx]))  | 
|
975  | 
return combined  | 
|
976  | 
||
977  | 
||
| 
1081
by Martin Pool
 - if weave tool is invoked with no arguments, show help  | 
978  | 
def weave_toc(w):  | 
979  | 
"""Show the weave's table-of-contents"""  | 
|
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
980  | 
print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')  | 
981  | 
for i in (6, 50, 10, 10):  | 
|
| 
870
by Martin Pool
 - better weave info display  | 
982  | 
print '-' * i,  | 
983  | 
    print
 | 
|
| 
946
by Martin Pool
 - weave info only shows the weave headers, doesn't extract every version:  | 
984  | 
for i in range(w.numversions()):  | 
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
985  | 
sha1 = w._sha1s[i]  | 
| 
1083
by Martin Pool
 - add space to store revision-id in weave files  | 
986  | 
name = w._names[i]  | 
987  | 
parent_str = ' '.join(map(str, w._parents[i]))  | 
|
988  | 
print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)  | 
|
| 
0.1.88
by Martin Pool
 Add weave info command.  | 
989  | 
|
| 
869
by Martin Pool
 - more weave.py command line options  | 
990  | 
|
991  | 
||
| 
1393.1.4
by Martin Pool
 - weave tool now finds bzrlib if it's not on the default path  | 
992  | 
def weave_stats(weave_file, pb):  | 
| 
947
by Martin Pool
 - new 'weave stats' command  | 
993  | 
from bzrlib.weavefile import read_weave  | 
994  | 
||
995  | 
wf = file(weave_file, 'rb')  | 
|
996  | 
w = read_weave(wf)  | 
|
997  | 
    # FIXME: doesn't work on pipes
 | 
|
998  | 
weave_size = wf.tell()  | 
|
999  | 
||
1000  | 
total = 0  | 
|
1001  | 
vers = len(w)  | 
|
1002  | 
for i in range(vers):  | 
|
1003  | 
pb.update('checking sizes', i, vers)  | 
|
| 
1393.1.24
by Martin Pool
 - slight speedup for weave stats  | 
1004  | 
for origin, lineno, line in w._extract([i]):  | 
| 
947
by Martin Pool
 - new 'weave stats' command  | 
1005  | 
total += len(line)  | 
1006  | 
||
1007  | 
pb.clear()  | 
|
1008  | 
||
1009  | 
print 'versions %9d' % vers  | 
|
1010  | 
print 'weave file %9d bytes' % weave_size  | 
|
1011  | 
print 'total contents %9d bytes' % total  | 
|
1012  | 
print 'compression ratio %9.2fx' % (float(total) / float(weave_size))  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
1013  | 
if vers:  | 
1014  | 
avg = total/vers  | 
|
1015  | 
print 'average size %9d bytes' % avg  | 
|
1016  | 
print 'relative size %9.2fx' % (float(weave_size) / float(avg))  | 
|
| 
947
by Martin Pool
 - new 'weave stats' command  | 
1017  | 
|
1018  | 
||
| 
869
by Martin Pool
 - more weave.py command line options  | 
1019  | 
def usage():  | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1020  | 
print """bzr weave tool  | 
1021  | 
||
1022  | 
Experimental tool for weave algorithm.
 | 
|
1023  | 
||
| 
869
by Martin Pool
 - more weave.py command line options  | 
1024  | 
usage:
 | 
1025  | 
    weave init WEAVEFILE
 | 
|
1026  | 
        Create an empty weave file
 | 
|
1027  | 
    weave get WEAVEFILE VERSION
 | 
|
1028  | 
        Write out specified version.
 | 
|
1029  | 
    weave check WEAVEFILE
 | 
|
1030  | 
        Check consistency of all versions.
 | 
|
| 
1081
by Martin Pool
 - if weave tool is invoked with no arguments, show help  | 
1031  | 
    weave toc WEAVEFILE
 | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1032  | 
        Display table of contents.
 | 
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1033  | 
    weave add WEAVEFILE NAME [BASE...] < NEWTEXT
 | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1034  | 
        Add NEWTEXT, with specified parent versions.
 | 
1035  | 
    weave annotate WEAVEFILE VERSION
 | 
|
1036  | 
        Display origin of each line.
 | 
|
1037  | 
    weave mash WEAVEFILE VERSION...
 | 
|
1038  | 
        Display composite of all selected versions.
 | 
|
1039  | 
    weave merge WEAVEFILE VERSION1 VERSION2 > OUT
 | 
|
1040  | 
        Auto-merge two versions and display conflicts.
 | 
|
| 
1329
by Martin Pool
 - add diff command to weave utility  | 
1041  | 
    weave diff WEAVEFILE VERSION1 VERSION2 
 | 
1042  | 
        Show differences between two versions.
 | 
|
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1043  | 
|
1044  | 
example:
 | 
|
1045  | 
||
1046  | 
    % weave init foo.weave
 | 
|
1047  | 
    % vi foo.txt
 | 
|
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1048  | 
    % weave add foo.weave ver0 < foo.txt
 | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1049  | 
    added version 0
 | 
1050  | 
||
1051  | 
    (create updated version)
 | 
|
1052  | 
    % vi foo.txt
 | 
|
1053  | 
    % weave get foo.weave 0 | diff -u - foo.txt
 | 
|
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1054  | 
    % weave add foo.weave ver1 0 < foo.txt
 | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1055  | 
    added version 1
 | 
1056  | 
||
1057  | 
    % weave get foo.weave 0 > foo.txt       (create forked version)
 | 
|
1058  | 
    % vi foo.txt
 | 
|
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1059  | 
    % weave add foo.weave ver2 0 < foo.txt
 | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1060  | 
    added version 2
 | 
1061  | 
||
1062  | 
    % weave merge foo.weave 1 2 > foo.txt   (merge them)
 | 
|
1063  | 
    % vi foo.txt                            (resolve conflicts)
 | 
|
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1064  | 
    % weave add foo.weave merged 1 2 < foo.txt     (commit merged version)     
 | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1065  | 
    
 | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1066  | 
"""
 | 
| 
0.1.88
by Martin Pool
 Add weave info command.  | 
1067  | 
|
1068  | 
||
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1069  | 
|
1070  | 
def main(argv):  | 
|
1071  | 
import sys  | 
|
1072  | 
import os  | 
|
| 
1393.1.4
by Martin Pool
 - weave tool now finds bzrlib if it's not on the default path  | 
1073  | 
try:  | 
1074  | 
import bzrlib  | 
|
1075  | 
except ImportError:  | 
|
1076  | 
        # in case we're run directly from the subdirectory
 | 
|
1077  | 
sys.path.append('..')  | 
|
1078  | 
import bzrlib  | 
|
| 
1336
by Martin Pool
 - tidy up import  | 
1079  | 
from bzrlib.weavefile import write_weave, read_weave  | 
| 
894
by Martin Pool
 - small optimization for weave extract  | 
1080  | 
from bzrlib.progress import ProgressBar  | 
1081  | 
||
| 
1078
by Martin Pool
 - use psyco for weave if possible  | 
1082  | 
try:  | 
1083  | 
import psyco  | 
|
1084  | 
psyco.full()  | 
|
1085  | 
except ImportError:  | 
|
1086  | 
        pass
 | 
|
| 
894
by Martin Pool
 - small optimization for weave extract  | 
1087  | 
|
| 
1081
by Martin Pool
 - if weave tool is invoked with no arguments, show help  | 
1088  | 
if len(argv) < 2:  | 
1089  | 
usage()  | 
|
1090  | 
return 0  | 
|
1091  | 
||
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1092  | 
cmd = argv[1]  | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1093  | 
|
1094  | 
def readit():  | 
|
1095  | 
return read_weave(file(argv[2], 'rb'))  | 
|
1096  | 
||
1097  | 
if cmd == 'help':  | 
|
1098  | 
usage()  | 
|
1099  | 
elif cmd == 'add':  | 
|
1100  | 
w = readit()  | 
|
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1101  | 
        # at the moment, based on everything in the file
 | 
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1102  | 
name = argv[3]  | 
1103  | 
parents = map(int, argv[4:])  | 
|
| 
0.1.72
by Martin Pool
 Go back to weave lines normally having newlines at the end.  | 
1104  | 
lines = sys.stdin.readlines()  | 
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1105  | 
ver = w.add(name, parents, lines)  | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1106  | 
write_weave(w, file(argv[2], 'wb'))  | 
| 
1084
by Martin Pool
 - weave add command needs to take a symbolic name too  | 
1107  | 
print 'added version %r %d' % (name, ver)  | 
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1108  | 
elif cmd == 'init':  | 
1109  | 
fn = argv[2]  | 
|
1110  | 
if os.path.exists(fn):  | 
|
1111  | 
raise IOError("file exists")  | 
|
1112  | 
w = Weave()  | 
|
| 
869
by Martin Pool
 - more weave.py command line options  | 
1113  | 
write_weave(w, file(fn, 'wb'))  | 
1114  | 
elif cmd == 'get': # get one version  | 
|
1115  | 
w = readit()  | 
|
| 
0.1.94
by Martin Pool
 Fix get_iter call  | 
1116  | 
sys.stdout.writelines(w.get_iter(int(argv[3])))  | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1117  | 
|
1118  | 
elif cmd == 'mash': # get composite  | 
|
1119  | 
w = readit()  | 
|
1120  | 
sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))  | 
|
1121  | 
||
| 
1329
by Martin Pool
 - add diff command to weave utility  | 
1122  | 
elif cmd == 'diff':  | 
1123  | 
from difflib import unified_diff  | 
|
1124  | 
w = readit()  | 
|
1125  | 
fn = argv[2]  | 
|
1126  | 
v1, v2 = map(int, argv[3:5])  | 
|
1127  | 
lines1 = w.get(v1)  | 
|
1128  | 
lines2 = w.get(v2)  | 
|
1129  | 
diff_gen = unified_diff(lines1, lines2,  | 
|
1130  | 
'%s version %d' % (fn, v1),  | 
|
1131  | 
'%s version %d' % (fn, v2))  | 
|
1132  | 
sys.stdout.writelines(diff_gen)  | 
|
1133  | 
||
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1134  | 
elif cmd == 'annotate':  | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1135  | 
w = readit()  | 
| 
0.1.72
by Martin Pool
 Go back to weave lines normally having newlines at the end.  | 
1136  | 
        # newline is added to all lines regardless; too hard to get
 | 
1137  | 
        # reasonable formatting otherwise
 | 
|
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1138  | 
lasto = None  | 
1139  | 
for origin, text in w.annotate(int(argv[3])):  | 
|
| 
0.1.72
by Martin Pool
 Go back to weave lines normally having newlines at the end.  | 
1140  | 
text = text.rstrip('\r\n')  | 
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1141  | 
if origin == lasto:  | 
1142  | 
print ' | %s' % (text)  | 
|
1143  | 
else:  | 
|
1144  | 
print '%5d | %s' % (origin, text)  | 
|
1145  | 
lasto = origin  | 
|
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1146  | 
|
| 
1081
by Martin Pool
 - if weave tool is invoked with no arguments, show help  | 
1147  | 
elif cmd == 'toc':  | 
1148  | 
weave_toc(readit())  | 
|
| 
947
by Martin Pool
 - new 'weave stats' command  | 
1149  | 
|
1150  | 
elif cmd == 'stats':  | 
|
| 
1393.1.4
by Martin Pool
 - weave tool now finds bzrlib if it's not on the default path  | 
1151  | 
weave_stats(argv[2], ProgressBar())  | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1152  | 
|
| 
0.1.91
by Martin Pool
 Update Weave.check  | 
1153  | 
elif cmd == 'check':  | 
| 
869
by Martin Pool
 - more weave.py command line options  | 
1154  | 
w = readit()  | 
| 
894
by Martin Pool
 - small optimization for weave extract  | 
1155  | 
pb = ProgressBar()  | 
1156  | 
w.check(pb)  | 
|
1157  | 
pb.clear()  | 
|
| 
938
by Martin Pool
 - various optimizations to weave add code  | 
1158  | 
print '%d versions ok' % w.numversions()  | 
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1159  | 
|
| 
892
by Martin Pool
 - weave stores only direct parents, and calculates and memoizes expansion as needed  | 
1160  | 
elif cmd == 'inclusions':  | 
1161  | 
w = readit()  | 
|
1162  | 
print ' '.join(map(str, w.inclusions([int(argv[3])])))  | 
|
1163  | 
||
1164  | 
elif cmd == 'parents':  | 
|
1165  | 
w = readit()  | 
|
| 
944
by Martin Pool
 - refactor member names in Weave code  | 
1166  | 
print ' '.join(map(str, w._parents[int(argv[3])]))  | 
| 
892
by Martin Pool
 - weave stores only direct parents, and calculates and memoizes expansion as needed  | 
1167  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
1168  | 
elif cmd == 'plan-merge':  | 
1169  | 
w = readit()  | 
|
1170  | 
for state, line in w.plan_merge(int(argv[3]), int(argv[4])):  | 
|
| 
919
by Martin Pool
 - more development of weave-merge  | 
1171  | 
if line:  | 
1172  | 
print '%14s | %s' % (state, line),  | 
|
| 
918
by Martin Pool
 - start doing new weave-merge algorithm  | 
1173  | 
|
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1174  | 
elif cmd == 'merge':  | 
| 
919
by Martin Pool
 - more development of weave-merge  | 
1175  | 
w = readit()  | 
1176  | 
p = w.plan_merge(int(argv[3]), int(argv[4]))  | 
|
1177  | 
sys.stdout.writelines(w.weave_merge(p))  | 
|
1178  | 
||
1179  | 
elif cmd == 'mash-merge':  | 
|
| 
871
by Martin Pool
 - add command for merge-based weave  | 
1180  | 
if len(argv) != 5:  | 
1181  | 
usage()  | 
|
1182  | 
return 1  | 
|
1183  | 
||
1184  | 
w = readit()  | 
|
1185  | 
v1, v2 = map(int, argv[3:5])  | 
|
1186  | 
||
1187  | 
basis = w.inclusions([v1]).intersection(w.inclusions([v2]))  | 
|
1188  | 
||
1189  | 
base_lines = list(w.mash_iter(basis))  | 
|
1190  | 
a_lines = list(w.get(v1))  | 
|
1191  | 
b_lines = list(w.get(v2))  | 
|
1192  | 
||
1193  | 
from bzrlib.merge3 import Merge3  | 
|
1194  | 
m3 = Merge3(base_lines, a_lines, b_lines)  | 
|
1195  | 
||
1196  | 
name_a = 'version %d' % v1  | 
|
1197  | 
name_b = 'version %d' % v2  | 
|
1198  | 
sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))  | 
|
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1199  | 
else:  | 
1200  | 
raise ValueError('unknown command %r' % cmd)  | 
|
1201  | 
||
1202  | 
||
| 
1076
by Martin Pool
 - add code to run weave utility under profiler  | 
1203  | 
|
1204  | 
def profile_main(argv):  | 
|
1205  | 
import tempfile, hotshot, hotshot.stats  | 
|
1206  | 
||
1207  | 
prof_f = tempfile.NamedTemporaryFile()  | 
|
1208  | 
||
1209  | 
prof = hotshot.Profile(prof_f.name)  | 
|
1210  | 
||
1211  | 
ret = prof.runcall(main, argv)  | 
|
1212  | 
prof.close()  | 
|
1213  | 
||
1214  | 
stats = hotshot.stats.load(prof_f.name)  | 
|
1215  | 
    #stats.strip_dirs()
 | 
|
| 
1079
by Martin Pool
 - weavefile can just use lists for read-in ancestry, not frozensets  | 
1216  | 
stats.sort_stats('cumulative')  | 
| 
1076
by Martin Pool
 - add code to run weave utility under profiler  | 
1217  | 
    ## XXX: Might like to write to stderr or the trace file instead but
 | 
1218  | 
    ## print_stats seems hardcoded to stdout
 | 
|
1219  | 
stats.print_stats(20)  | 
|
1220  | 
||
1221  | 
return ret  | 
|
1222  | 
||
1223  | 
||
| 
1185.33.85
by Martin Pool
 New --lsprof option from Denys Duchier  | 
1224  | 
def lsprofile_main(argv):  | 
1225  | 
from bzrlib.lsprof import profile  | 
|
1226  | 
ret,stats = profile(main, argv)  | 
|
1227  | 
stats.sort()  | 
|
1228  | 
stats.pprint()  | 
|
1229  | 
return ret  | 
|
1230  | 
||
1231  | 
||
| 
0.1.62
by Martin Pool
 Lame command-line client for reading and writing weaves.  | 
1232  | 
if __name__ == '__main__':  | 
1233  | 
import sys  | 
|
| 
1081
by Martin Pool
 - if weave tool is invoked with no arguments, show help  | 
1234  | 
if '--profile' in sys.argv:  | 
| 
1078
by Martin Pool
 - use psyco for weave if possible  | 
1235  | 
args = sys.argv[:]  | 
| 
1081
by Martin Pool
 - if weave tool is invoked with no arguments, show help  | 
1236  | 
args.remove('--profile')  | 
| 
1078
by Martin Pool
 - use psyco for weave if possible  | 
1237  | 
sys.exit(profile_main(args))  | 
| 
1185.33.85
by Martin Pool
 New --lsprof option from Denys Duchier  | 
1238  | 
elif '--lsprof' in sys.argv:  | 
1239  | 
args = sys.argv[:]  | 
|
1240  | 
args.remove('--lsprof')  | 
|
1241  | 
sys.exit(lsprofile_main(args))  | 
|
| 
1078
by Martin Pool
 - use psyco for weave if possible  | 
1242  | 
else:  | 
1243  | 
sys.exit(main(sys.argv))  | 
|
| 
1076
by Martin Pool
 - add code to run weave utility under profiler  | 
1244  |