/brz/remove-bazaar

To get this branch, use:
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
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.)
3735.2.5 by Robert Collins
Teach VersionedFiles how to allocate keys based on content hashes.
408
            If None, a name will be allocated based on the hash. (sha1:SHAHASH)
1083 by Martin Pool
- add space to store revision-id in weave files
409
0.1.26 by Martin Pool
Refactor parameters to add command
410
        parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
411
            List or set of direct parent version numbers.
412
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
413
        lines
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
414
            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.
415
416
        :param nostore_sha: See VersionedFile.add_lines.
1323 by Martin Pool
- caller can pass SHA-1 to Weave.add for efficiency
417
        """
1666.1.6 by Robert Collins
Make knit the default format.
418
        self._check_lines_not_unicode(lines)
419
        self._check_lines_are_lines(lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
420
        if not sha1:
421
            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.
422
        if sha1 == nostore_sha:
423
            raise errors.ExistingContent
3735.2.5 by Robert Collins
Teach VersionedFiles how to allocate keys based on content hashes.
424
        if version_id is None:
425
            version_id = "sha1:" + sha1
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
426
        if version_id in self._name_map:
427
            return self._check_repeated_add(version_id, parents, lines, sha1)
1269 by Martin Pool
- some weave operations automatically look up symbolic names if supplied
428
938 by Martin Pool
- various optimizations to weave add code
429
        self._check_versions(parents)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
430
        ## self._check_lines(lines)
944 by Martin Pool
- refactor member names in Weave code
431
        new_version = len(self._parents)
0.1.5 by Martin Pool
Add test for storing two text versions.
432
1083 by Martin Pool
- add space to store revision-id in weave files
433
        # if we abort after here the (in-memory) weave will be corrupt because only
434
        # some fields are updated
1570.1.12 by Robert Collins
Add a FIXME for weave.add and remove some extraneous whitespace.
435
        # XXX: FIXME implement a succeed-or-fail of the rest of this routine.
436
        #      - Robert Collins 20060226
1083 by Martin Pool
- add space to store revision-id in weave files
437
        self._parents.append(parents[:])
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
438
        self._sha1s.append(sha1)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
439
        self._names.append(version_id)
440
        self._name_map[version_id] = new_version
938 by Martin Pool
- various optimizations to weave add code
441
442
            
443
        if not parents:
444
            # special case; adding with no parents revision; can do
445
            # this more quickly by just appending unconditionally.
446
            # even more specially, if we're adding an empty text we
447
            # need do nothing at all.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
448
            if lines:
944 by Martin Pool
- refactor member names in Weave code
449
                self._weave.append(('{', new_version))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
450
                self._weave.extend(lines)
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
451
                self._weave.append(('}', None))
938 by Martin Pool
- various optimizations to weave add code
452
            return new_version
453
941 by Martin Pool
- allow for parents specified to Weave.add to be a set
454
        if len(parents) == 1:
455
            pv = list(parents)[0]
456
            if sha1 == self._sha1s[pv]:
457
                # special case: same as the single parent
458
                return new_version
938 by Martin Pool
- various optimizations to weave add code
459
            
460
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
461
        ancestors = self._inclusions(parents)
938 by Martin Pool
- various optimizations to weave add code
462
944 by Martin Pool
- refactor member names in Weave code
463
        l = self._weave
938 by Martin Pool
- various optimizations to weave add code
464
465
        # basis a list of (origin, lineno, line)
466
        basis_lineno = []
467
        basis_lines = []
468
        for origin, lineno, line in self._extract(ancestors):
469
            basis_lineno.append(lineno)
470
            basis_lines.append(line)
471
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
472
        # another small special case: a merge, producing the same text
473
        # as auto-merge
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
474
        if lines == basis_lines:
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
475
            return new_version
938 by Martin Pool
- various optimizations to weave add code
476
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
477
        # add a sentinel, because we can also match against the final line
944 by Martin Pool
- refactor member names in Weave code
478
        basis_lineno.append(len(self._weave))
938 by Martin Pool
- various optimizations to weave add code
479
480
        # XXX: which line of the weave should we really consider
481
        # matches the end of the file?  the current code says it's the
482
        # last line of the weave?
483
484
        #print 'basis_lines:', basis_lines
485
        #print 'new_lines:  ', lines
486
1185.81.17 by Aaron Bentley
Merged latest bzr.dev
487
        s = self._matcher(None, basis_lines, lines)
938 by Martin Pool
- various optimizations to weave add code
488
489
        # offset gives the number of lines that have been inserted
490
        # into the weave up to the current point; if the original edit instruction
491
        # says to change line A then we actually change (A+offset)
492
        offset = 0
493
494
        for tag, i1, i2, j1, j2 in s.get_opcodes():
495
            # i1,i2 are given in offsets within basis_lines; we need to map them
496
            # back to offsets within the entire weave
497
            #print 'raw match', tag, i1, i2, j1, j2
498
            if tag == 'equal':
499
                continue
500
            i1 = basis_lineno[i1]
501
            i2 = basis_lineno[i2]
502
            # the deletion and insertion are handled separately.
503
            # first delete the region.
504
            if i1 != i2:
944 by Martin Pool
- refactor member names in Weave code
505
                self._weave.insert(i1+offset, ('[', new_version))
506
                self._weave.insert(i2+offset+1, (']', new_version))
938 by Martin Pool
- various optimizations to weave add code
507
                offset += 2
508
509
            if j1 != j2:
510
                # there may have been a deletion spanning up to
511
                # i2; we want to insert after this region to make sure
512
                # we don't destroy ourselves
513
                i = i2 + offset
944 by Martin Pool
- refactor member names in Weave code
514
                self._weave[i:i] = ([('{', new_version)] 
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
515
                                    + lines[j1:j2] 
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
516
                                    + [('}', None)])
938 by Martin Pool
- various optimizations to weave add code
517
                offset += 2 + (j2 - j1)
518
        return new_version
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
519
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
520
    def _inclusions(self, versions):
893 by Martin Pool
- Refactor weave calculation of inclusions
521
        """Return set of all ancestors of given version(s)."""
1563.2.29 by Robert Collins
Remove all but fetch references to repository.revision_store.
522
        if not len(versions):
523
            return []
928 by Martin Pool
- go back to using plain builtin set()
524
        i = set(versions)
1328 by Martin Pool
- slight refactoring of weave code
525
        for v in xrange(max(versions), 0, -1):
526
            if v in i:
527
                # include all its parents
528
                i.update(self._parents[v])
529
        return i
530
        ## except IndexError:
531
        ##     raise ValueError("version %d not present in weave" % v)
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
532
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
533
    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.
534
        """See VersionedFile.get_ancestry."""
535
        if isinstance(version_ids, basestring):
536
            version_ids = [version_ids]
537
        i = self._inclusions([self._lookup(v) for v in version_ids])
538
        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
539
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
540
    def _check_lines(self, text):
541
        if not isinstance(text, list):
542
            raise ValueError("text should be a list, not %s" % type(text))
543
544
        for l in text:
545
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
546
                raise ValueError("text line should be a string or unicode, not %s"
547
                                 % type(l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
548
        
549
550
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
551
    def _check_versions(self, indexes):
552
        """Check everything in the sequence of indexes is valid"""
553
        for i in indexes:
554
            try:
944 by Martin Pool
- refactor member names in Weave code
555
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
556
            except IndexError:
557
                raise IndexError("invalid version number %r" % i)
558
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
559
    def _compatible_parents(self, my_parents, other_parents):
560
        """During join check that other_parents are joinable with my_parents.
561
562
        Joinable is defined as 'is a subset of' - supersets may require 
563
        regeneration of diffs, but subsets do not.
564
        """
565
        return len(other_parents.difference(my_parents)) == 0
566
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
567
    def annotate(self, version_id):
568
        """Return a list of (version-id, line) tuples for version_id.
0.1.7 by Martin Pool
Add trivial annotate text
569
570
        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.
571
        incls = [self._lookup(version_id)]
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
572
        return [(self._idx_to_name(origin), text) for origin, lineno, text in
573
            self._extract(incls)]
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
574
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
575
    def iter_lines_added_or_present_in_versions(self, version_ids=None,
576
                                                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.
577
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
578
        if version_ids is None:
579
            version_ids = self.versions()
580
        version_ids = set(version_ids)
581
        for lineno, inserted, deletes, line in self._walk_internal(version_ids):
582
            # if inserted not in version_ids then it was inserted before the
583
            # versions we care about, but because weaves cannot represent ghosts
584
            # properly, we do not filter down to that
585
            # if inserted not in version_ids: continue
586
            if line[-1] != '\n':
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
587
                yield line + '\n', inserted
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
588
            else:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
589
                yield line, inserted
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
590
591
    def _walk_internal(self, version_ids=None):
592
        """Helper method for weave actions."""
918 by Martin Pool
- start doing new weave-merge algorithm
593
        
594
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
595
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
596
597
        lineno = 0         # line of weave, 0-based
598
944 by Martin Pool
- refactor member names in Weave code
599
        for l in self._weave:
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
600
            if l.__class__ == tuple:
918 by Martin Pool
- start doing new weave-merge algorithm
601
                c, v = l
602
                isactive = None
603
                if c == '{':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
604
                    istack.append(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
605
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
606
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
607
                elif c == '[':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
608
                    dset.add(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
609
                elif c == ']':
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
610
                    dset.remove(self._names[v])
918 by Martin Pool
- start doing new weave-merge algorithm
611
                else:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
612
                    raise WeaveFormatError('unexpected instruction %r' % v)
918 by Martin Pool
- start doing new weave-merge algorithm
613
            else:
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
614
                yield lineno, istack[-1], frozenset(dset), l
918 by Martin Pool
- start doing new weave-merge algorithm
615
            lineno += 1
616
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
617
        if istack:
618
            raise WeaveFormatError("unclosed insertion blocks "
619
                    "at end of weave: %s" % istack)
620
        if dset:
621
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
622
                                   % dset)
918 by Martin Pool
- start doing new weave-merge algorithm
623
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
624
    def plan_merge(self, ver_a, ver_b):
625
        """Return pseudo-annotation indicating how the two versions merge.
626
627
        This is computed between versions a and b and their common
628
        base.
629
630
        Weave lines present in none of them are skipped entirely.
631
        """
632
        inc_a = set(self.get_ancestry([ver_a]))
633
        inc_b = set(self.get_ancestry([ver_b]))
634
        inc_c = inc_a & inc_b
635
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
636
        for lineno, insert, deleteset, line in self._walk_internal([ver_a, ver_b]):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
637
            if deleteset & inc_c:
638
                # killed in parent; can't be in either a or b
639
                # not relevant to our work
640
                yield 'killed-base', line
641
            elif insert in inc_c:
642
                # was inserted in base
643
                killed_a = bool(deleteset & inc_a)
644
                killed_b = bool(deleteset & inc_b)
645
                if killed_a and killed_b:
646
                    yield 'killed-both', line
647
                elif killed_a:
648
                    yield 'killed-a', line
649
                elif killed_b:
650
                    yield 'killed-b', line
651
                else:
652
                    yield 'unchanged', line
653
            elif insert in inc_a:
654
                if deleteset & inc_a:
655
                    yield 'ghost-a', line
656
                else:
657
                    # new in A; not in B
658
                    yield 'new-a', line
659
            elif insert in inc_b:
660
                if deleteset & inc_b:
661
                    yield 'ghost-b', line
662
                else:
663
                    yield 'new-b', line
664
            else:
665
                # not in either revision
666
                yield 'irrelevant', line
667
893 by Martin Pool
- Refactor weave calculation of inclusions
668
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
669
        """Yield annotation of lines in included set.
670
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
671
        Yields a sequence of tuples (origin, lineno, text), where
672
        origin is the origin version, lineno the index in the weave,
673
        and text the text of the line.
674
0.1.20 by Martin Pool
Factor out Knit.extract() method
675
        The set typically but not necessarily corresponds to a version.
676
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
677
        for i in versions:
678
            if not isinstance(i, int):
679
                raise ValueError(i)
680
            
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
681
        included = self._inclusions(versions)
881 by Martin Pool
- faster weave extraction
682
683
        istack = []
1596.2.25 by Robert Collins
Weave._extract should be faster
684
        iset = set()
928 by Martin Pool
- go back to using plain builtin set()
685
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
686
687
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
688
894 by Martin Pool
- small optimization for weave extract
689
        isactive = None
0.1.85 by Martin Pool
doc
690
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
691
        result = []
692
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
693
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
694
1596.2.25 by Robert Collins
Weave._extract should be faster
695
        # wow. 
696
        #  449       0   4474.6820   2356.5590   bzrlib.weave:556(_extract)
697
        #  +285282   0   1676.8040   1676.8040   +<isinstance>
698
        # 1.6 seconds in 'isinstance'.
699
        # changing the first isinstance:
700
        #  449       0   2814.2660   1577.1760   bzrlib.weave:556(_extract)
701
        #  +140414   0    762.8050    762.8050   +<isinstance>
702
        # note that the inline time actually dropped (less function calls)
703
        # and total processing time was halved.
704
        # we're still spending ~1/4 of the method in isinstance though.
705
        # so lets hard code the acceptable string classes we expect:
706
        #  449       0   1202.9420    786.2930   bzrlib.weave:556(_extract)
707
        # +71352     0    377.5560    377.5560   +<method 'append' of 'list' 
708
        #                                          objects>
709
        # yay, down to ~1/4 the initial extract time, and our inline time
710
        # has shrunk again, with isinstance no longer dominating.
711
        # tweaking the stack inclusion test to use a set gives:
712
        #  449       0   1122.8030    713.0080   bzrlib.weave:556(_extract)
713
        # +71352     0    354.9980    354.9980   +<method 'append' of 'list' 
714
        #                                          objects>
715
        # - a 5% win, or possibly just noise. However with large istacks that
716
        # 'in' test could dominate, so I'm leaving this change in place -
717
        # when its fast enough to consider profiling big datasets we can review.
718
719
              
720
             
721
944 by Martin Pool
- refactor member names in Weave code
722
        for l in self._weave:
1596.2.25 by Robert Collins
Weave._extract should be faster
723
            if l.__class__ == tuple:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
724
                c, v = l
894 by Martin Pool
- small optimization for weave extract
725
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
726
                if c == '{':
727
                    istack.append(v)
1596.2.25 by Robert Collins
Weave._extract should be faster
728
                    iset.add(v)
891 by Martin Pool
- fix up refactoring of weave
729
                elif c == '}':
1596.2.25 by Robert Collins
Weave._extract should be faster
730
                    iset.remove(istack.pop())
891 by Martin Pool
- fix up refactoring of weave
731
                elif c == '[':
732
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
733
                        dset.add(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
734
                elif c == ']':
891 by Martin Pool
- fix up refactoring of weave
735
                    if v in included:
0.1.48 by Martin Pool
Basic parsing of delete instructions.
736
                        dset.remove(v)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
737
                else:
738
                    raise AssertionError()
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
739
            else:
894 by Martin Pool
- small optimization for weave extract
740
                if isactive is None:
741
                    isactive = (not dset) and istack and (istack[-1] in included)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
742
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
743
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
744
            lineno += 1
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
745
        if istack:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
746
            raise WeaveFormatError("unclosed insertion blocks "
747
                    "at end of weave: %s" % istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
748
        if dset:
1185.16.116 by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system.
749
            raise WeaveFormatError("unclosed deletion blocks at end of weave: %s"
750
                                   % dset)
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
751
        return result
752
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
753
    def _maybe_lookup(self, name_or_index):
754
        """Convert possible symbolic name to index, or pass through indexes.
755
        
756
        NOT FOR PUBLIC USE.
757
        """
758
        if isinstance(name_or_index, (int, long)):
759
            return name_or_index
760
        else:
761
            return self._lookup(name_or_index)
762
763
    def get_lines(self, version_id):
764
        """See VersionedFile.get_lines()."""
1596.2.30 by Robert Collins
Unbreak backwards compatability on weave.get_lines.
765
        int_index = self._maybe_lookup(version_id)
1596.2.29 by Robert Collins
Make weave.get_lines faster.
766
        result = [line for (origin, lineno, line) in self._extract([int_index])]
767
        expected_sha1 = self._sha1s[int_index]
768
        measured_sha1 = sha_strings(result)
769
        if measured_sha1 != expected_sha1:
770
            raise errors.WeaveInvalidChecksum(
771
                    'file %s, revision %s, expected: %s, measured %s' 
772
                    % (self._weave_name, version_id,
773
                       expected_sha1, measured_sha1))
774
        return result
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
775
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
776
    def get_sha1s(self, version_ids):
777
        """See VersionedFile.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
778
        result = {}
779
        for v in version_ids:
780
            result[v] = self._sha1s[self._lookup(v)]
781
        return result
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
782
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
783
    def num_versions(self):
784
        """How many versions are in this weave?"""
944 by Martin Pool
- refactor member names in Weave code
785
        l = len(self._parents)
0.1.91 by Martin Pool
Update Weave.check
786
        return l
787
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
788
    __len__ = num_versions
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
789
894 by Martin Pool
- small optimization for weave extract
790
    def check(self, progress_bar=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
791
        # TODO evaluate performance hit of using string sets in this routine.
1616.1.5 by Martin Pool
Cleanup and document some check code
792
        # TODO: check no circular inclusions
793
        # TODO: create a nested progress bar
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
794
        for version in range(self.num_versions()):
944 by Martin Pool
- refactor member names in Weave code
795
            inclusions = list(self._parents[version])
0.1.91 by Martin Pool
Update Weave.check
796
            if inclusions:
797
                inclusions.sort()
798
                if inclusions[-1] >= version:
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
799
                    raise WeaveFormatError("invalid included version %d for index %d"
0.1.91 by Martin Pool
Update Weave.check
800
                                           % (inclusions[-1], version))
801
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
802
        # try extracting all versions; parallel extraction is used
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
803
        nv = self.num_versions()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
804
        sha1s = {}
805
        texts = {}
806
        inclusions = {}
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
807
        for i in range(nv):
808
            # For creating the ancestry, IntSet is much faster (3.7s vs 0.17s)
809
            # The problem is that set membership is much more expensive
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
810
            name = self._idx_to_name(i)
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
811
            sha1s[name] = sha()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
812
            texts[name] = []
813
            new_inc = set([name])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
814
            for p in self._parents[i]:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
815
                new_inc.update(inclusions[self._idx_to_name(p)])
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
816
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
817
            if set(new_inc) != set(self.get_ancestry(name)):
818
                raise AssertionError(
819
                    'failed %s != %s' 
820
                    % (set(new_inc), set(self.get_ancestry(name))))
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
821
            inclusions[name] = new_inc
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
822
823
        nlines = len(self._weave)
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
824
825
        update_text = 'checking weave'
826
        if self._weave_name:
827
            short_name = os.path.basename(self._weave_name)
828
            update_text = 'checking %s' % (short_name,)
829
            update_text = update_text[:25]
830
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
831
        for lineno, insert, deleteset, line in self._walk_internal():
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
832
            if progress_bar:
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
833
                progress_bar.update(update_text, lineno, nlines)
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
834
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
835
            for name, name_inclusions in inclusions.items():
1185.50.27 by John Arbash Meinel
Cleaned up the check code by using self._walk() instead of manually writing the loop.
836
                # The active inclusion must be an ancestor,
837
                # and no ancestors must have deleted this line,
838
                # because we don't support resurrection.
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
839
                if (insert in name_inclusions) and not (deleteset & name_inclusions):
840
                    sha1s[name].update(line)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
841
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
842
        for i in range(nv):
843
            version = self._idx_to_name(i)
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
844
            hd = sha1s[version].hexdigest()
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
845
            expected = self._sha1s[i]
0.1.91 by Martin Pool
Update Weave.check
846
            if hd != expected:
1185.50.26 by John Arbash Meinel
Change Weave.check() so that it checks all revisions in parallel.
847
                raise errors.WeaveInvalidChecksum(
848
                        "mismatched sha1 for version %s: "
849
                        "got %s, expected %s"
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
850
                        % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
851
881 by Martin Pool
- faster weave extraction
852
        # TODO: check insertions are properly nested, that there are
853
        # no lines outside of insertion blocks, that deletions are
854
        # properly paired, etc.
855
1393.1.51 by Martin Pool
- new Weave.copy()
856
    def _imported_parents(self, other, other_idx):
857
        """Return list of parents in self corresponding to indexes in other."""
858
        new_parents = []
859
        for parent_idx in other._parents[other_idx]:
860
            parent_name = other._names[parent_idx]
1596.2.31 by Robert Collins
Remove a list __contains__ usage in weave operations.
861
            if parent_name not in self._name_map:
1393.1.51 by Martin Pool
- new Weave.copy()
862
                # should not be possible
863
                raise WeaveError("missing parent {%s} of {%s} in %r" 
864
                                 % (parent_name, other._name_map[other_idx], self))
865
            new_parents.append(self._name_map[parent_name])
866
        return new_parents
867
1393.1.50 by Martin Pool
- more development of Weave.join()
868
    def _check_version_consistent(self, other, other_idx, name):
869
        """Check if a version in consistent in this and other.
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
870
871
        To be consistent it must have:
872
873
         * the same text
874
         * the same direct parents (by name, not index, and disregarding
875
           order)
1393.1.50 by Martin Pool
- more development of Weave.join()
876
        
877
        If present & correct return True;
878
        if not present in self return False; 
879
        if inconsistent raise error."""
880
        this_idx = self._name_map.get(name, -1)
881
        if this_idx != -1:
882
            if self._sha1s[this_idx] != other._sha1s[other_idx]:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
883
                raise errors.WeaveTextDiffers(name, self, other)
1393.1.66 by Martin Pool
- fix join of weaves where parents occur at different offsets
884
            self_parents = self._parents[this_idx]
885
            other_parents = other._parents[other_idx]
1551.3.11 by Aaron Bentley
Merge from Robert
886
            n1 = set([self._names[i] for i in self_parents])
887
            n2 = set([other._names[i] for i in other_parents])
1563.2.24 by Robert Collins
Make join cheaper for compatibly inconsistent parents.
888
            if not self._compatible_parents(n1, n2):
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
889
                raise WeaveParentMismatch("inconsistent parents "
890
                    "for version {%s}: %s vs %s" % (name, n1, n2))
1393.1.50 by Martin Pool
- more development of Weave.join()
891
            else:
892
                return True         # ok!
893
        else:
894
            return False
918 by Martin Pool
- start doing new weave-merge algorithm
895
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
896
    def _reweave(self, other, pb, msg):
897
        """Reweave self with other - internal helper for join().
1551.3.11 by Aaron Bentley
Merge from Robert
898
899
        :param other: The other weave to merge
900
        :param pb: An optional progress bar, indicating how far done we are
901
        :param msg: An optional message for the progress
902
        """
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
903
        new_weave = _reweave(self, other, pb=pb, msg=msg)
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
904
        self._copy_weave_content(new_weave)
905
906
    def _copy_weave_content(self, otherweave):
907
        """adsorb the content from otherweave."""
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
908
        for attr in self.__slots__:
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
909
            if attr != '_weave_name':
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
910
                setattr(self, attr, copy(getattr(otherweave, attr)))
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
911
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
912
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
913
class WeaveFile(Weave):
914
    """A WeaveFile represents a Weave on disk and writes on change."""
915
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
916
    WEAVE_SUFFIX = '.weave'
917
    
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
918
    def __init__(self, name, transport, filemode=None, create=False, access_mode='w', get_scope=None):
1563.2.25 by Robert Collins
Merge in upstream.
919
        """Create a WeaveFile.
920
        
921
        :param create: If not True, only open an existing knit.
922
        """
3514.2.2 by John Arbash Meinel
Restore a real weave merge to 'bzr merge --weave'.
923
        super(WeaveFile, self).__init__(name, access_mode, get_scope=get_scope,
924
            allow_reserved=False)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
925
        self._transport = transport
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
926
        self._filemode = filemode
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
927
        try:
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
928
            _read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
929
        except errors.NoSuchFile:
1563.2.25 by Robert Collins
Merge in upstream.
930
            if not create:
931
                raise
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
932
            # new file, save it
933
            self._save()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
934
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
935
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
936
        left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
937
        """Add a version and save the weave."""
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
938
        self.check_not_reserved_id(version_id)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
939
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
940
            parent_texts, left_matching_blocks, nostore_sha, random_id,
941
            check_content)
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
942
        self._save()
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
943
        return result
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
944
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
945
    def copy_to(self, name, transport):
946
        """See VersionedFile.copy_to()."""
947
        # as we are all in memory always, just serialise to the new place.
948
        sio = StringIO()
949
        write_weave_v5(self, sio)
950
        sio.seek(0)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
951
        transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
952
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
953
    def _save(self):
954
        """Save the weave."""
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
955
        self._check_write_ok()
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
956
        sio = StringIO()
957
        write_weave_v5(self, sio)
958
        sio.seek(0)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
959
        bytes = sio.getvalue()
960
        path = self._weave_name + WeaveFile.WEAVE_SUFFIX
961
        try:
962
            self._transport.put_bytes(path, bytes, self._filemode)
963
        except errors.NoSuchFile:
964
            self._transport.mkdir(dirname(path))
965
            self._transport.put_bytes(path, bytes, self._filemode)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
966
967
    @staticmethod
968
    def get_suffixes():
969
        """See VersionedFile.get_suffixes()."""
970
        return [WeaveFile.WEAVE_SUFFIX]
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
971
3350.3.20 by Robert Collins
Remove more uses of versionedfile.join() and fix a bug with weave's insert_record_stream.
972
    def insert_record_stream(self, stream):
973
        super(WeaveFile, self).insert_record_stream(stream)
974
        self._save()
975
976
    @deprecated_method(one_five)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
977
    def join(self, other, pb=None, msg=None, version_ids=None,
978
             ignore_missing=False):
1563.2.9 by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation.
979
        """Join other into self and save."""
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
980
        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.
981
        self._save()
982
983
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.
984
def _reweave(wa, wb, pb=None, msg=None):
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
985
    """Combine two weaves and return the result.
986
987
    This works even if a revision R has different parents in 
988
    wa and wb.  In the resulting weave all the parents are given.
989
990
    This is done by just building up a new weave, maintaining ordering 
991
    of the versions in the two inputs.  More efficient approaches
992
    might be possible but it should only be necessary to do 
993
    this operation rarely, when a new previously ghost version is 
994
    inserted.
1551.3.11 by Aaron Bentley
Merge from Robert
995
996
    :param pb: An optional progress bar, indicating how far done we are
997
    :param msg: An optional message for the progress
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
998
    """
999
    wr = Weave()
1000
    ia = ib = 0
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1001
    queue_a = range(wa.num_versions())
1002
    queue_b = range(wb.num_versions())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1003
    # first determine combined parents of all versions
1004
    # map from version name -> all parent names
1005
    combined_parents = _reweave_parent_graphs(wa, wb)
1006
    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.
1007
    order = tsort.topo_sort(combined_parents.iteritems())
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1008
    mutter("order to reweave: %r", order)
1551.3.11 by Aaron Bentley
Merge from Robert
1009
1010
    if pb and not msg:
1011
        msg = 'reweave'
1012
1013
    for idx, name in enumerate(order):
1014
        if pb:
1015
            pb.update(msg, idx, len(order))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1016
        if name in wa._name_map:
1017
            lines = wa.get_lines(name)
1018
            if name in wb._name_map:
1551.3.11 by Aaron Bentley
Merge from Robert
1019
                lines_b = wb.get_lines(name)
1020
                if lines != lines_b:
1021
                    mutter('Weaves differ on content. rev_id {%s}', name)
1022
                    mutter('weaves: %s, %s', wa._weave_name, wb._weave_name)
1023
                    import difflib
1024
                    lines = list(difflib.unified_diff(lines, lines_b,
1025
                            wa._weave_name, wb._weave_name))
1026
                    mutter('lines:\n%s', ''.join(lines))
1027
                    raise errors.WeaveTextDiffers(name, wa, wb)
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1028
        else:
1029
            lines = wb.get_lines(name)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1030
        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
1031
    return wr
1032
1033
def _reweave_parent_graphs(wa, wb):
1034
    """Return combined parent ancestry for two weaves.
1035
    
1036
    Returned as a list of (version_name, set(parent_names))"""
1037
    combined = {}
1038
    for weave in [wa, wb]:
1039
        for idx, name in enumerate(weave._names):
1040
            p = combined.setdefault(name, set())
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1041
            p.update(map(weave._idx_to_name, weave._parents[idx]))
1393.1.68 by Martin Pool
- add reweave that joins with ghosts
1042
    return combined
1043
1044
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1045
def weave_toc(w):
1046
    """Show the weave's table-of-contents"""
1083 by Martin Pool
- add space to store revision-id in weave files
1047
    print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
1048
    for i in (6, 50, 10, 10):
870 by Martin Pool
- better weave info display
1049
        print '-' * i,
1050
    print
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1051
    for i in range(w.num_versions()):
0.1.91 by Martin Pool
Update Weave.check
1052
        sha1 = w._sha1s[i]
1083 by Martin Pool
- add space to store revision-id in weave files
1053
        name = w._names[i]
1054
        parent_str = ' '.join(map(str, w._parents[i]))
1055
        print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
0.1.88 by Martin Pool
Add weave info command.
1056
869 by Martin Pool
- more weave.py command line options
1057
1058
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1059
def weave_stats(weave_file, pb):
947 by Martin Pool
- new 'weave stats' command
1060
    from bzrlib.weavefile import read_weave
1061
1062
    wf = file(weave_file, 'rb')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1063
    w = read_weave(wf)
947 by Martin Pool
- new 'weave stats' command
1064
    # FIXME: doesn't work on pipes
1065
    weave_size = wf.tell()
1066
1067
    total = 0
1068
    vers = len(w)
1069
    for i in range(vers):
1070
        pb.update('checking sizes', i, vers)
1393.1.24 by Martin Pool
- slight speedup for weave stats
1071
        for origin, lineno, line in w._extract([i]):
947 by Martin Pool
- new 'weave stats' command
1072
            total += len(line)
1073
1074
    pb.clear()
1075
1076
    print 'versions          %9d' % vers
1077
    print 'weave file        %9d bytes' % weave_size
1078
    print 'total contents    %9d bytes' % total
1079
    print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1080
    if vers:
1081
        avg = total/vers
1082
        print 'average size      %9d bytes' % avg
1083
        print 'relative size     %9.2fx' % (float(weave_size) / float(avg))
947 by Martin Pool
- new 'weave stats' command
1084
1085
869 by Martin Pool
- more weave.py command line options
1086
def usage():
871 by Martin Pool
- add command for merge-based weave
1087
    print """bzr weave tool
1088
1089
Experimental tool for weave algorithm.
1090
869 by Martin Pool
- more weave.py command line options
1091
usage:
1092
    weave init WEAVEFILE
1093
        Create an empty weave file
1094
    weave get WEAVEFILE VERSION
1095
        Write out specified version.
1096
    weave check WEAVEFILE
1097
        Check consistency of all versions.
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1098
    weave toc WEAVEFILE
869 by Martin Pool
- more weave.py command line options
1099
        Display table of contents.
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1100
    weave add WEAVEFILE NAME [BASE...] < NEWTEXT
869 by Martin Pool
- more weave.py command line options
1101
        Add NEWTEXT, with specified parent versions.
1102
    weave annotate WEAVEFILE VERSION
1103
        Display origin of each line.
1104
    weave merge WEAVEFILE VERSION1 VERSION2 > OUT
1105
        Auto-merge two versions and display conflicts.
1329 by Martin Pool
- add diff command to weave utility
1106
    weave diff WEAVEFILE VERSION1 VERSION2 
1107
        Show differences between two versions.
871 by Martin Pool
- add command for merge-based weave
1108
1109
example:
1110
1111
    % weave init foo.weave
1112
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1113
    % weave add foo.weave ver0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1114
    added version 0
1115
1116
    (create updated version)
1117
    % vi foo.txt
1118
    % weave get foo.weave 0 | diff -u - foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1119
    % weave add foo.weave ver1 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1120
    added version 1
1121
1122
    % weave get foo.weave 0 > foo.txt       (create forked version)
1123
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1124
    % weave add foo.weave ver2 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
1125
    added version 2
1126
1127
    % weave merge foo.weave 1 2 > foo.txt   (merge them)
1128
    % vi foo.txt                            (resolve conflicts)
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1129
    % weave add foo.weave merged 1 2 < foo.txt     (commit merged version)     
871 by Martin Pool
- add command for merge-based weave
1130
    
869 by Martin Pool
- more weave.py command line options
1131
"""
0.1.88 by Martin Pool
Add weave info command.
1132
    
1133
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1134
1135
def main(argv):
1136
    import sys
1137
    import os
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1138
    try:
1139
        import bzrlib
1140
    except ImportError:
1141
        # in case we're run directly from the subdirectory
1142
        sys.path.append('..')
1143
        import bzrlib
1336 by Martin Pool
- tidy up import
1144
    from bzrlib.weavefile import write_weave, read_weave
894 by Martin Pool
- small optimization for weave extract
1145
    from bzrlib.progress import ProgressBar
1146
1078 by Martin Pool
- use psyco for weave if possible
1147
    try:
1148
        import psyco
1149
        psyco.full()
1150
    except ImportError:
1151
        pass
894 by Martin Pool
- small optimization for weave extract
1152
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1153
    if len(argv) < 2:
1154
        usage()
1155
        return 0
1156
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1157
    cmd = argv[1]
869 by Martin Pool
- more weave.py command line options
1158
1159
    def readit():
1160
        return read_weave(file(argv[2], 'rb'))
1161
    
1162
    if cmd == 'help':
1163
        usage()
1164
    elif cmd == 'add':
1165
        w = readit()
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1166
        # at the moment, based on everything in the file
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1167
        name = argv[3]
1168
        parents = map(int, argv[4:])
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1169
        lines = sys.stdin.readlines()
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1170
        ver = w.add(name, parents, lines)
869 by Martin Pool
- more weave.py command line options
1171
        write_weave(w, file(argv[2], 'wb'))
1084 by Martin Pool
- weave add command needs to take a symbolic name too
1172
        print 'added version %r %d' % (name, ver)
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1173
    elif cmd == 'init':
1174
        fn = argv[2]
1175
        if os.path.exists(fn):
1176
            raise IOError("file exists")
1177
        w = Weave()
869 by Martin Pool
- more weave.py command line options
1178
        write_weave(w, file(fn, 'wb'))
1179
    elif cmd == 'get': # get one version
1180
        w = readit()
0.1.94 by Martin Pool
Fix get_iter call
1181
        sys.stdout.writelines(w.get_iter(int(argv[3])))
869 by Martin Pool
- more weave.py command line options
1182
        
1329 by Martin Pool
- add diff command to weave utility
1183
    elif cmd == 'diff':
1184
        w = readit()
1185
        fn = argv[2]
1186
        v1, v2 = map(int, argv[3:5])
1187
        lines1 = w.get(v1)
1188
        lines2 = w.get(v2)
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
1189
        diff_gen = bzrlib.patiencediff.unified_diff(lines1, lines2,
1329 by Martin Pool
- add diff command to weave utility
1190
                                '%s version %d' % (fn, v1),
1191
                                '%s version %d' % (fn, v2))
1192
        sys.stdout.writelines(diff_gen)
1193
            
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1194
    elif cmd == 'annotate':
869 by Martin Pool
- more weave.py command line options
1195
        w = readit()
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
1196
        # newline is added to all lines regardless; too hard to get
1197
        # reasonable formatting otherwise
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1198
        lasto = None
1199
        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.
1200
            text = text.rstrip('\r\n')
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1201
            if origin == lasto:
1202
                print '      | %s' % (text)
1203
            else:
1204
                print '%5d | %s' % (origin, text)
1205
                lasto = origin
871 by Martin Pool
- add command for merge-based weave
1206
                
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
1207
    elif cmd == 'toc':
1208
        weave_toc(readit())
947 by Martin Pool
- new 'weave stats' command
1209
1210
    elif cmd == 'stats':
1393.1.4 by Martin Pool
- weave tool now finds bzrlib if it's not on the default path
1211
        weave_stats(argv[2], ProgressBar())
871 by Martin Pool
- add command for merge-based weave
1212
        
0.1.91 by Martin Pool
Update Weave.check
1213
    elif cmd == 'check':
869 by Martin Pool
- more weave.py command line options
1214
        w = readit()
894 by Martin Pool
- small optimization for weave extract
1215
        pb = ProgressBar()
1216
        w.check(pb)
1217
        pb.clear()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1218
        print '%d versions ok' % w.num_versions()
871 by Martin Pool
- add command for merge-based weave
1219
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
1220
    elif cmd == 'inclusions':
1221
        w = readit()
1222
        print ' '.join(map(str, w.inclusions([int(argv[3])])))
1223
1224
    elif cmd == 'parents':
1225
        w = readit()
944 by Martin Pool
- refactor member names in Weave code
1226
        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
1227
918 by Martin Pool
- start doing new weave-merge algorithm
1228
    elif cmd == 'plan-merge':
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
1229
        # replaced by 'bzr weave-plan-merge'
918 by Martin Pool
- start doing new weave-merge algorithm
1230
        w = readit()
1231
        for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
919 by Martin Pool
- more development of weave-merge
1232
            if line:
1233
                print '%14s | %s' % (state, line),
871 by Martin Pool
- add command for merge-based weave
1234
    elif cmd == 'merge':
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
1235
        # replaced by 'bzr weave-merge-text'
919 by Martin Pool
- more development of weave-merge
1236
        w = readit()
1237
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1238
        sys.stdout.writelines(w.weave_merge(p))
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
1239
    else:
1240
        raise ValueError('unknown command %r' % cmd)
1241
    
1242
1243
if __name__ == '__main__':
1244
    import sys
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1245
    sys.exit(main(sys.argv))