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