/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1
# Copyright (C) 2005, 2006 by Canonical Ltd
2
# Written by Martin Pool.
3
# Modified by Johan Rydberg <jrydberg@gnu.org>
4
# Modified by Robert Collins <robert.collins@canonical.com>
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
5
# Modified by Aaron Bentley <aaron.bentley@utoronto.ca>
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
6
#
7
# This program is free software; you can redistribute it and/or modify
8
# it under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 2 of the License, or
10
# (at your option) any later version.
11
#
12
# This program is distributed in the hope that it will be useful,
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with this program; if not, write to the Free Software
19
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
21
"""Knit versionedfile implementation.
22
23
A knit is a versioned file implementation that supports efficient append only
24
updates.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
25
26
Knit file layout:
27
lifeless: the data file is made up of "delta records".  each delta record has a delta header 
28
that contains; (1) a version id, (2) the size of the delta (in lines), and (3)  the digest of 
29
the -expanded data- (ie, the delta applied to the parent).  the delta also ends with a 
30
end-marker; simply "end VERSION"
31
32
delta can be line or full contents.a
33
... the 8's there are the index number of the annotation.
34
version robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 7 c7d23b2a5bd6ca00e8e266cec0ec228158ee9f9e
35
59,59,3
36
8
37
8         if ie.executable:
38
8             e.set('executable', 'yes')
39
130,130,2
40
8         if elt.get('executable') == 'yes':
41
8             ie.executable = True
42
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 
43
44
45
whats in an index:
46
09:33 < jrydberg> lifeless: each index is made up of a tuple of; version id, options, position, size, parents
47
09:33 < jrydberg> lifeless: the parents are currently dictionary compressed
48
09:33 < jrydberg> lifeless: (meaning it currently does not support ghosts)
49
09:33 < lifeless> right
50
09:33 < jrydberg> lifeless: the position and size is the range in the data file
51
52
53
so the index sequence is the dictionary compressed sequence number used
54
in the deltas to provide line annotation
55
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
56
"""
57
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
58
# TODOS:
59
# 10:16 < lifeless> make partial index writes safe
60
# 10:16 < lifeless> implement 'knit.check()' like weave.check()
61
# 10:17 < lifeless> record known ghosts so we can detect when they are filled in rather than the current 'reweave 
62
#                    always' approach.
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.
63
# move sha1 out of the content so that join is faster at verifying parents
64
# record content length ?
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
65
                  
66
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
67
from copy import copy
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.
68
from cStringIO import StringIO
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
69
import difflib
1596.2.28 by Robert Collins
more knit profile based tuning.
70
from itertools import izip, chain
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
71
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
72
import os
1628.1.2 by Robert Collins
More knit micro-optimisations.
73
import sys
1756.2.29 by Aaron Bentley
Remove basis knit support
74
import warnings
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
75
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
76
import bzrlib
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.
77
import bzrlib.errors as errors
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
78
from bzrlib.errors import FileExists, NoSuchFile, KnitError, \
79
        InvalidRevisionId, KnitCorrupt, KnitHeaderError, \
80
        RevisionNotPresent, RevisionAlreadyPresent
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
81
from bzrlib.tuned_gzip import GzipFile
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
82
from bzrlib.trace import mutter
83
from bzrlib.osutils import contains_whitespace, contains_linebreaks, \
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
84
     sha_strings
1563.2.13 by Robert Collins
InterVersionedFile implemented.
85
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
1756.2.29 by Aaron Bentley
Remove basis knit support
86
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER, deprecated_passed
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
87
from bzrlib.tsort import topo_sort
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
88
import bzrlib.weave
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
89
90
91
# TODO: Split out code specific to this format into an associated object.
92
93
# TODO: Can we put in some kind of value to check that the index and data
94
# files belong together?
95
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
96
# TODO: accommodate binaries, perhaps by storing a byte count
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
97
98
# TODO: function to check whole file
99
100
# TODO: atomically append data, then measure backwards from the cursor
101
# position after writing to work out where it was located.  we may need to
102
# bypass python file buffering.
103
104
DATA_SUFFIX = '.knit'
105
INDEX_SUFFIX = '.kndx'
106
107
108
class KnitContent(object):
109
    """Content of a knit version to which deltas can be applied."""
110
111
    def __init__(self, lines):
112
        self._lines = lines
113
114
    def annotate_iter(self):
115
        """Yield tuples of (origin, text) for each content line."""
116
        for origin, text in self._lines:
117
            yield origin, text
118
119
    def annotate(self):
120
        """Return a list of (origin, text) tuples."""
121
        return list(self.annotate_iter())
122
123
    def line_delta_iter(self, new_lines):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
124
        """Generate line-based delta from this content to new_lines."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
125
        new_texts = [text for origin, text in new_lines._lines]
126
        old_texts = [text for origin, text in self._lines]
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
127
        s = KnitSequenceMatcher(None, old_texts, new_texts)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
128
        for op in s.get_opcodes():
129
            if op[0] == 'equal':
130
                continue
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
131
            #     ofrom   oto   length        data
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
132
            yield (op[1], op[2], op[4]-op[3], new_lines._lines[op[3]:op[4]])
133
134
    def line_delta(self, new_lines):
135
        return list(self.line_delta_iter(new_lines))
136
137
    def text(self):
138
        return [text for origin, text in self._lines]
139
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
140
    def copy(self):
141
        return KnitContent(self._lines[:])
142
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
143
144
class _KnitFactory(object):
145
    """Base factory for creating content objects."""
146
147
    def make(self, lines, version):
148
        num_lines = len(lines)
149
        return KnitContent(zip([version] * num_lines, lines))
150
151
152
class KnitAnnotateFactory(_KnitFactory):
153
    """Factory for creating annotated Content objects."""
154
155
    annotated = True
156
157
    def parse_fulltext(self, content, version):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
158
        """Convert fulltext to internal representation
159
160
        fulltext content is of the format
161
        revid(utf8) plaintext\n
162
        internal representation is of the format:
163
        (revid, plaintext)
164
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
165
        lines = []
166
        for line in content:
167
            origin, text = line.split(' ', 1)
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
168
            lines.append((origin.decode('utf-8'), text))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
169
        return KnitContent(lines)
170
171
    def parse_line_delta_iter(self, lines):
1628.1.2 by Robert Collins
More knit micro-optimisations.
172
        for result_item in self.parse_line_delta[lines]:
173
            yield result_item
174
175
    def parse_line_delta(self, lines, version):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
176
        """Convert a line based delta into internal representation.
177
178
        line delta is in the form of:
179
        intstart intend intcount
180
        1..count lines:
181
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
182
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
183
        (start, end, count, [1..count tuples (revid, newline)])
184
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
185
        result = []
186
        lines = iter(lines)
187
        next = lines.next
188
        # walk through the lines parsing.
189
        for header in lines:
190
            start, end, count = [int(n) for n in header.split(',')]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
191
            contents = []
1628.1.2 by Robert Collins
More knit micro-optimisations.
192
            remaining = count
193
            while remaining:
194
                origin, text = next().split(' ', 1)
195
                remaining -= 1
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
196
                contents.append((origin.decode('utf-8'), text))
1628.1.2 by Robert Collins
More knit micro-optimisations.
197
            result.append((start, end, count, contents))
198
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
199
200
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
201
        """convert a fulltext content record into a serializable form.
202
203
        see parse_fulltext which this inverts.
204
        """
205
        return ['%s %s' % (o.encode('utf-8'), t) for o, t in content._lines]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
206
207
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
208
        """convert a delta into a serializable form.
209
1628.1.2 by Robert Collins
More knit micro-optimisations.
210
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
211
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
212
        out = []
213
        for start, end, c, lines in delta:
214
            out.append('%d,%d,%d\n' % (start, end, c))
215
            for origin, text in lines:
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
216
                out.append('%s %s' % (origin.encode('utf-8'), text))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
217
        return out
218
219
220
class KnitPlainFactory(_KnitFactory):
221
    """Factory for creating plain Content objects."""
222
223
    annotated = False
224
225
    def parse_fulltext(self, content, version):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
226
        """This parses an unannotated fulltext.
227
228
        Note that this is not a noop - the internal representation
229
        has (versionid, line) - its just a constant versionid.
230
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
231
        return self.make(content, version)
232
233
    def parse_line_delta_iter(self, lines, version):
234
        while lines:
235
            header = lines.pop(0)
236
            start, end, c = [int(n) for n in header.split(',')]
237
            yield start, end, c, zip([version] * c, lines[:c])
238
            del lines[:c]
239
240
    def parse_line_delta(self, lines, version):
241
        return list(self.parse_line_delta_iter(lines, version))
242
    
243
    def lower_fulltext(self, content):
244
        return content.text()
245
246
    def lower_line_delta(self, delta):
247
        out = []
248
        for start, end, c, lines in delta:
249
            out.append('%d,%d,%d\n' % (start, end, c))
250
            out.extend([text for origin, text in lines])
251
        return out
252
253
254
def make_empty_knit(transport, relpath):
255
    """Construct a empty knit at the specified location."""
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
256
    k = KnitVersionedFile(transport, relpath, 'w', KnitPlainFactory)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
257
    k._data._open_file()
258
259
260
class KnitVersionedFile(VersionedFile):
261
    """Weave-like structure with faster random access.
262
263
    A knit stores a number of texts and a summary of the relationships
264
    between them.  Texts are identified by a string version-id.  Texts
265
    are normally stored and retrieved as a series of lines, but can
266
    also be passed as single strings.
267
268
    Lines are stored with the trailing newline (if any) included, to
269
    avoid special cases for files with no final newline.  Lines are
270
    composed of 8-bit characters, not unicode.  The combination of
271
    these approaches should mean any 'binary' file can be safely
272
    stored and retrieved.
273
    """
274
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
275
    def __init__(self, relpath, transport, file_mode=None, access_mode=None, 
1756.2.29 by Aaron Bentley
Remove basis knit support
276
                 factory=None, basis_knit=DEPRECATED_PARAMETER, delta=True,
277
                 create=False):
1563.2.25 by Robert Collins
Merge in upstream.
278
        """Construct a knit at location specified by relpath.
279
        
280
        :param create: If not True, only open an existing knit.
281
        """
1756.2.29 by Aaron Bentley
Remove basis knit support
282
        if deprecated_passed(basis_knit):
283
            warnings.warn("KnitVersionedFile.__(): The basis_knit parameter is"
284
                 " deprecated as of bzr 0.9.",
285
                 DeprecationWarning, stacklevel=2)
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
286
        if access_mode is None:
287
            access_mode = 'w'
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
288
        super(KnitVersionedFile, self).__init__(access_mode)
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
289
        assert access_mode in ('r', 'w'), "invalid mode specified %r" % access_mode
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
290
        self.transport = transport
291
        self.filename = relpath
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
292
        self.factory = factory or KnitAnnotateFactory()
293
        self.writable = (access_mode == 'w')
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
294
        self.delta = delta
295
296
        self._index = _KnitIndex(transport, relpath + INDEX_SUFFIX,
1666.1.6 by Robert Collins
Make knit the default format.
297
            access_mode, create=create, file_mode=file_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
298
        self._data = _KnitData(transport, relpath + DATA_SUFFIX,
1666.1.6 by Robert Collins
Make knit the default format.
299
            access_mode, create=create and not len(self), file_mode=file_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
300
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
301
    def __repr__(self):
302
        return '%s(%s)' % (self.__class__.__name__, 
303
                           self.transport.abspath(self.filename))
304
    
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
305
    def _add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):
306
        """See VersionedFile._add_delta()."""
307
        self._check_add(version_id, []) # should we check the lines ?
308
        self._check_versions_present(parents)
309
        present_parents = []
310
        ghosts = []
311
        parent_texts = {}
312
        for parent in parents:
313
            if not self.has_version(parent):
314
                ghosts.append(parent)
315
            else:
316
                present_parents.append(parent)
317
318
        if delta_parent is None:
319
            # reconstitute as full text.
320
            assert len(delta) == 1 or len(delta) == 0
321
            if len(delta):
322
                assert delta[0][0] == 0
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
323
                assert delta[0][1] == 0, delta[0][1]
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
324
            return super(KnitVersionedFile, self)._add_delta(version_id,
325
                                                             parents,
326
                                                             delta_parent,
327
                                                             sha1,
328
                                                             noeol,
329
                                                             delta)
330
331
        digest = sha1
332
333
        options = []
334
        if noeol:
335
            options.append('no-eol')
336
337
        if delta_parent is not None:
338
            # determine the current delta chain length.
339
            # To speed the extract of texts the delta chain is limited
340
            # to a fixed number of deltas.  This should minimize both
341
            # I/O and the time spend applying deltas.
342
            count = 0
343
            delta_parents = [delta_parent]
344
            while count < 25:
345
                parent = delta_parents[0]
346
                method = self._index.get_method(parent)
347
                if method == 'fulltext':
348
                    break
349
                delta_parents = self._index.get_parents(parent)
350
                count = count + 1
351
            if method == 'line-delta':
352
                # did not find a fulltext in the delta limit.
353
                # just do a normal insertion.
354
                return super(KnitVersionedFile, self)._add_delta(version_id,
355
                                                                 parents,
356
                                                                 delta_parent,
357
                                                                 sha1,
358
                                                                 noeol,
359
                                                                 delta)
360
361
        options.append('line-delta')
362
        store_lines = self.factory.lower_line_delta(delta)
363
364
        where, size = self._data.add_record(version_id, digest, store_lines)
365
        self._index.add_version(version_id, options, where, size, parents)
366
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
367
    def _add_raw_records(self, records, data):
368
        """Add all the records 'records' with data pre-joined in 'data'.
369
370
        :param records: A list of tuples(version_id, options, parents, size).
371
        :param data: The data for the records. When it is written, the records
372
                     are adjusted to have pos pointing into data by the sum of
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
373
                     the preceding records sizes.
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
374
        """
375
        # write all the data
376
        pos = self._data.add_raw_record(data)
377
        index_entries = []
378
        for (version_id, options, parents, size) in records:
379
            index_entries.append((version_id, options, pos, size, parents))
380
            pos += size
381
        self._index.add_versions(index_entries)
382
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
383
    def clear_cache(self):
384
        """Clear the data cache only."""
385
        self._data.clear_cache()
386
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
387
    def copy_to(self, name, transport):
388
        """See VersionedFile.copy_to()."""
389
        # copy the current index to a temp index to avoid racing with local
390
        # writes
1666.1.6 by Robert Collins
Make knit the default format.
391
        transport.put(name + INDEX_SUFFIX + '.tmp', self.transport.get(self._index._filename),)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
392
        # copy the data file
393
        transport.put(name + DATA_SUFFIX, self._data._open_file())
394
        # rename the copied index into place
395
        transport.rename(name + INDEX_SUFFIX + '.tmp', name + INDEX_SUFFIX)
396
1563.2.13 by Robert Collins
InterVersionedFile implemented.
397
    def create_empty(self, name, transport, mode=None):
1563.2.25 by Robert Collins
Merge in upstream.
398
        return KnitVersionedFile(name, transport, factory=self.factory, delta=self.delta, create=True)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
399
    
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
400
    def _fix_parents(self, version, new_parents):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
401
        """Fix the parents list for version.
402
        
403
        This is done by appending a new version to the index
404
        with identical data except for the parents list.
405
        the parents list must be a superset of the current
406
        list.
407
        """
408
        current_values = self._index._cache[version]
409
        assert set(current_values[4]).difference(set(new_parents)) == set()
410
        self._index.add_version(version,
411
                                current_values[1], 
412
                                current_values[2],
413
                                current_values[3],
414
                                new_parents)
415
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
416
    def get_delta(self, version_id):
417
        """Get a delta for constructing version from some other version."""
418
        if not self.has_version(version_id):
419
            raise RevisionNotPresent(version_id, self.filename)
420
        
421
        parents = self.get_parents(version_id)
422
        if len(parents):
423
            parent = parents[0]
424
        else:
425
            parent = None
426
        data_pos, data_size = self._index.get_position(version_id)
427
        data, sha1 = self._data.read_records(((version_id, data_pos, data_size),))[version_id]
428
        version_idx = self._index.lookup(version_id)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
429
        noeol = 'no-eol' in self._index.get_options(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
430
        if 'fulltext' == self._index.get_method(version_id):
431
            new_content = self.factory.parse_fulltext(data, version_idx)
432
            if parent is not None:
433
                reference_content = self._get_content(parent)
434
                old_texts = reference_content.text()
435
            else:
436
                old_texts = []
437
            new_texts = new_content.text()
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
438
            delta_seq = KnitSequenceMatcher(None, old_texts, new_texts)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
439
            return parent, sha1, noeol, self._make_line_delta(delta_seq, new_content)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
440
        else:
441
            delta = self.factory.parse_line_delta(data, version_idx)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
442
            return parent, sha1, noeol, delta
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
443
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
444
    def get_graph_with_ghosts(self):
445
        """See VersionedFile.get_graph_with_ghosts()."""
446
        graph_items = self._index.get_graph()
447
        return dict(graph_items)
448
1666.1.6 by Robert Collins
Make knit the default format.
449
    def get_sha1(self, version_id):
450
        """See VersionedFile.get_sha1()."""
1756.3.22 by Aaron Bentley
Tweaks from review
451
        record_map = self._get_record_map([version_id])
452
        method, content, digest, next = record_map[version_id]
453
        return digest 
1666.1.6 by Robert Collins
Make knit the default format.
454
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
455
    @staticmethod
456
    def get_suffixes():
457
        """See VersionedFile.get_suffixes()."""
458
        return [DATA_SUFFIX, INDEX_SUFFIX]
1563.2.13 by Robert Collins
InterVersionedFile implemented.
459
1594.2.8 by Robert Collins
add ghost aware apis to knits.
460
    def has_ghost(self, version_id):
461
        """True if there is a ghost reference in the file to version_id."""
462
        # maybe we have it
463
        if self.has_version(version_id):
464
            return False
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
465
        # optimisable if needed by memoising the _ghosts set.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
466
        items = self._index.get_graph()
467
        for node, parents in items:
468
            for parent in parents:
469
                if parent not in self._index._cache:
470
                    if parent == version_id:
471
                        return True
472
        return False
473
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
474
    def versions(self):
475
        """See VersionedFile.versions."""
476
        return self._index.get_versions()
477
478
    def has_version(self, version_id):
479
        """See VersionedFile.has_version."""
480
        return self._index.has_version(version_id)
481
482
    __contains__ = has_version
483
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
484
    def _merge_annotations(self, content, parents, parent_texts={},
485
                           delta=None, annotated=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
486
        """Merge annotations for content.  This is done by comparing
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
487
        the annotations based on changed to the text.
488
        """
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
489
        if annotated:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
490
            delta_seq = None
491
            for parent_id in parents:
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
492
                merge_content = self._get_content(parent_id, parent_texts)
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
493
                seq = KnitSequenceMatcher(None, merge_content.text(), content.text())
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
494
                if delta_seq is None:
495
                    # setup a delta seq to reuse.
496
                    delta_seq = seq
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
497
                for i, j, n in seq.get_matching_blocks():
498
                    if n == 0:
499
                        continue
500
                    # this appears to copy (origin, text) pairs across to the new
501
                    # content for any line that matches the last-checked parent.
502
                    # FIXME: save the sequence control data for delta compression
503
                    # against the most relevant parent rather than rediffing.
504
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
505
        if delta:
506
            if not annotated:
507
                reference_content = self._get_content(parents[0], parent_texts)
508
                new_texts = content.text()
509
                old_texts = reference_content.text()
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
510
                delta_seq = KnitSequenceMatcher(None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
511
            return self._make_line_delta(delta_seq, content)
512
513
    def _make_line_delta(self, delta_seq, new_content):
514
        """Generate a line delta from delta_seq and new_content."""
515
        diff_hunks = []
516
        for op in delta_seq.get_opcodes():
517
            if op[0] == 'equal':
518
                continue
519
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
520
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
521
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
522
    def _get_components_positions(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
523
        """Produce a map of position data for the components of versions.
524
1756.3.22 by Aaron Bentley
Tweaks from review
525
        This data is intended to be used for retrieving the knit records.
1756.3.19 by Aaron Bentley
Documentation and cleanups
526
527
        A dict of version_id to (method, data_pos, data_size, next) is
528
        returned.
529
        method is the way referenced data should be applied.
530
        data_pos is the position of the data in the knit.
531
        data_size is the size of the data in the knit.
532
        next is the build-parent of the version, or None for fulltexts.
533
        """
1756.3.9 by Aaron Bentley
More optimization refactoring
534
        component_data = {}
535
        for version_id in version_ids:
536
            cursor = version_id
537
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
538
            while cursor is not None and cursor not in component_data:
1756.2.29 by Aaron Bentley
Remove basis knit support
539
                method = self._index.get_method(cursor)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
540
                if method == 'fulltext':
541
                    next = None
542
                else:
1756.2.29 by Aaron Bentley
Remove basis knit support
543
                    next = self.get_parents(cursor)[0]
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
544
                data_pos, data_size = self._index.get_position(cursor)
545
                component_data[cursor] = (method, data_pos, data_size, next)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
546
                cursor = next
547
        return component_data
1756.3.18 by Aaron Bentley
More cleanup
548
       
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
549
    def _get_content(self, version_id, parent_texts={}):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
550
        """Returns a content object that makes up the specified
551
        version."""
552
        if not self.has_version(version_id):
553
            raise RevisionNotPresent(version_id, self.filename)
554
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
555
        cached_version = parent_texts.get(version_id, None)
556
        if cached_version is not None:
557
            return cached_version
558
1756.3.22 by Aaron Bentley
Tweaks from review
559
        text_map, contents_map = self._get_content_maps([version_id])
560
        return contents_map[version_id]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
561
562
    def _check_versions_present(self, version_ids):
563
        """Check that all specified versions are present."""
564
        version_ids = set(version_ids)
565
        for r in list(version_ids):
566
            if self._index.has_version(r):
567
                version_ids.remove(r)
568
        if version_ids:
569
            raise RevisionNotPresent(list(version_ids)[0], self.filename)
570
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
571
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
572
        """See VersionedFile.add_lines_with_ghosts()."""
573
        self._check_add(version_id, lines)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
574
        return self._add(version_id, lines[:], parents, self.delta, parent_texts)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
575
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
576
    def _add_lines(self, version_id, parents, lines, parent_texts):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
577
        """See VersionedFile.add_lines."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
578
        self._check_add(version_id, lines)
579
        self._check_versions_present(parents)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
580
        return self._add(version_id, lines[:], parents, self.delta, parent_texts)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
581
582
    def _check_add(self, version_id, lines):
583
        """check that version_id and lines are safe to add."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
584
        assert self.writable, "knit is not opened for write"
585
        ### FIXME escape. RBC 20060228
586
        if contains_whitespace(version_id):
1668.5.1 by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required
587
            raise InvalidRevisionId(version_id, self.filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
588
        if self.has_version(version_id):
589
            raise RevisionAlreadyPresent(version_id, self.filename)
1666.1.6 by Robert Collins
Make knit the default format.
590
        self._check_lines_not_unicode(lines)
591
        self._check_lines_are_lines(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
592
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
593
    def _add(self, version_id, lines, parents, delta, parent_texts):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
594
        """Add a set of lines on top of version specified by parents.
595
596
        If delta is true, compress the text as a line-delta against
597
        the first parent.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
598
599
        Any versions not present will be converted into ghosts.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
600
        """
1596.2.28 by Robert Collins
more knit profile based tuning.
601
        #  461    0   6546.0390     43.9100   bzrlib.knit:489(_add)
602
        # +400    0    889.4890    418.9790   +bzrlib.knit:192(lower_fulltext)
603
        # +461    0   1364.8070    108.8030   +bzrlib.knit:996(add_record)
604
        # +461    0    193.3940     41.5720   +bzrlib.knit:898(add_version)
605
        # +461    0    134.0590     18.3810   +bzrlib.osutils:361(sha_strings)
606
        # +461    0     36.3420     15.4540   +bzrlib.knit:146(make)
607
        # +1383   0      8.0370      8.0370   +<len>
608
        # +61     0     13.5770      7.9190   +bzrlib.knit:199(lower_line_delta)
609
        # +61     0    963.3470      7.8740   +bzrlib.knit:427(_get_content)
610
        # +61     0    973.9950      5.2950   +bzrlib.knit:136(line_delta)
611
        # +61     0   1918.1800      5.2640   +bzrlib.knit:359(_merge_annotations)
612
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
613
        present_parents = []
1594.2.8 by Robert Collins
add ghost aware apis to knits.
614
        ghosts = []
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
615
        if parent_texts is None:
616
            parent_texts = {}
1594.2.8 by Robert Collins
add ghost aware apis to knits.
617
        for parent in parents:
618
            if not self.has_version(parent):
619
                ghosts.append(parent)
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
620
            else:
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
621
                present_parents.append(parent)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
622
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
623
        if delta and not len(present_parents):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
624
            delta = False
625
626
        digest = sha_strings(lines)
627
        options = []
628
        if lines:
629
            if lines[-1][-1] != '\n':
630
                options.append('no-eol')
631
                lines[-1] = lines[-1] + '\n'
632
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
633
        if len(present_parents) and delta:
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
634
            # To speed the extract of texts the delta chain is limited
635
            # to a fixed number of deltas.  This should minimize both
636
            # I/O and the time spend applying deltas.
637
            count = 0
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
638
            delta_parents = present_parents
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
639
            while count < 25:
640
                parent = delta_parents[0]
641
                method = self._index.get_method(parent)
642
                if method == 'fulltext':
643
                    break
644
                delta_parents = self._index.get_parents(parent)
645
                count = count + 1
646
            if method == 'line-delta':
647
                delta = False
648
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
649
        lines = self.factory.make(lines, version_id)
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
650
        if delta or (self.factory.annotated and len(present_parents) > 0):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
651
            # Merge annotations from parent texts if so is needed.
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
652
            delta_hunks = self._merge_annotations(lines, present_parents, parent_texts,
653
                                                  delta, self.factory.annotated)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
654
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
655
        if delta:
656
            options.append('line-delta')
657
            store_lines = self.factory.lower_line_delta(delta_hunks)
658
        else:
659
            options.append('fulltext')
660
            store_lines = self.factory.lower_fulltext(lines)
661
662
        where, size = self._data.add_record(version_id, digest, store_lines)
663
        self._index.add_version(version_id, options, where, size, parents)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
664
        return lines
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
665
1563.2.19 by Robert Collins
stub out a check for knits.
666
    def check(self, progress_bar=None):
667
        """See VersionedFile.check()."""
668
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
669
    def _clone_text(self, new_version_id, old_version_id, parents):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
670
        """See VersionedFile.clone_text()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
671
        # FIXME RBC 20060228 make fast by only inserting an index with null 
672
        # delta.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
673
        self.add_lines(new_version_id, parents, self.get_lines(old_version_id))
674
675
    def get_lines(self, version_id):
676
        """See VersionedFile.get_lines()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
677
        return self.get_line_list([version_id])[0]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
678
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
679
    def _get_record_map(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
680
        """Produce a dictionary of knit records.
681
        
682
        The keys are version_ids, the values are tuples of (method, content,
683
        digest, next).
684
        method is the way the content should be applied.  
685
        content is a KnitContent object.
686
        digest is the SHA1 digest of this version id after all steps are done
687
        next is the build-parent of the version, i.e. the leftmost ancestor.
688
        If the method is fulltext, next will be None.
689
        """
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
690
        position_map = self._get_components_positions(version_ids)
1756.3.22 by Aaron Bentley
Tweaks from review
691
        # c = component_id, m = method, p = position, s = size, n = next
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
692
        records = [(c, p, s) for c, (m, p, s, n) in position_map.iteritems()]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
693
        record_map = {}
694
        for component_id, content, digest in\
695
            self._data.read_records_iter(records): 
696
            method, position, size, next = position_map[component_id]
697
            record_map[component_id] = method, content, digest, next
698
                          
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
699
        return record_map
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
700
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
701
    def get_text(self, version_id):
702
        """See VersionedFile.get_text"""
703
        return self.get_texts([version_id])[0]
704
1756.2.1 by Aaron Bentley
Implement get_texts
705
    def get_texts(self, version_ids):
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
706
        return [''.join(l) for l in self.get_line_list(version_ids)]
707
708
    def get_line_list(self, version_ids):
1756.2.1 by Aaron Bentley
Implement get_texts
709
        """Return the texts of listed versions as a list of strings."""
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
710
        text_map, content_map = self._get_content_maps(version_ids)
711
        return [text_map[v] for v in version_ids]
712
713
    def _get_content_maps(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
714
        """Produce maps of text and KnitContents
715
        
716
        :return: (text_map, content_map) where text_map contains the texts for
717
        the requested versions and content_map contains the KnitContents.
1756.3.22 by Aaron Bentley
Tweaks from review
718
        Both dicts take version_ids as their keys.
1756.3.19 by Aaron Bentley
Documentation and cleanups
719
        """
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
720
        for version_id in version_ids:
1756.2.1 by Aaron Bentley
Implement get_texts
721
            if not self.has_version(version_id):
722
                raise RevisionNotPresent(version_id, self.filename)
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
723
        record_map = self._get_record_map(version_ids)
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
724
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
725
        text_map = {}
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
726
        content_map = {}
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
727
        final_content = {}
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
728
        for version_id in version_ids:
729
            components = []
730
            cursor = version_id
731
            while cursor is not None:
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
732
                method, data, digest, next = record_map[cursor]
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
733
                components.append((cursor, method, data, digest))
734
                if cursor in content_map:
735
                    break
736
                cursor = next
737
1756.2.1 by Aaron Bentley
Implement get_texts
738
            content = None
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
739
            for component_id, method, data, digest in reversed(components):
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
740
                if component_id in content_map:
741
                    content = content_map[component_id]
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
742
                else:
743
                    version_idx = self._index.lookup(component_id)
744
                    if method == 'fulltext':
745
                        assert content is None
746
                        content = self.factory.parse_fulltext(data, version_idx)
747
                    elif method == 'line-delta':
748
                        delta = self.factory.parse_line_delta(data[:], 
749
                                                              version_idx)
750
                        content = content.copy()
751
                        content._lines = self._apply_delta(content._lines, 
752
                                                           delta)
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
753
                    content_map[component_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
754
755
            if 'no-eol' in self._index.get_options(version_id):
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
756
                content = content.copy()
1756.2.1 by Aaron Bentley
Implement get_texts
757
                line = content._lines[-1][1].rstrip('\n')
758
                content._lines[-1] = (content._lines[-1][0], line)
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
759
            final_content[version_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
760
761
            # digest here is the digest from the last applied component.
1756.3.6 by Aaron Bentley
More multi-text extraction
762
            text = content.text()
763
            if sha_strings(text) != digest:
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
764
                raise KnitCorrupt(self.filename, 
765
                                  'sha-1 does not match %s' % version_id)
1756.2.1 by Aaron Bentley
Implement get_texts
766
1756.3.6 by Aaron Bentley
More multi-text extraction
767
            text_map[version_id] = text 
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
768
        return text_map, final_content 
1756.2.1 by Aaron Bentley
Implement get_texts
769
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
770
    def iter_lines_added_or_present_in_versions(self, version_ids=None):
771
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
772
        if version_ids is None:
773
            version_ids = self.versions()
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
774
        # we don't care about inclusions, the caller cares.
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
775
        # but we need to setup a list of records to visit.
776
        # we need version_id, position, length
777
        version_id_records = []
1594.3.1 by Robert Collins
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit.
778
        requested_versions = list(version_ids)
779
        # filter for available versions
780
        for version_id in requested_versions:
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
781
            if not self.has_version(version_id):
782
                raise RevisionNotPresent(version_id, self.filename)
1594.3.1 by Robert Collins
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit.
783
        # get a in-component-order queue:
784
        version_ids = []
785
        for version_id in self.versions():
786
            if version_id in requested_versions:
787
                version_ids.append(version_id)
788
                data_pos, length = self._index.get_position(version_id)
789
                version_id_records.append((version_id, data_pos, length))
790
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
791
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
792
        count = 0
793
        total = len(version_id_records)
794
        try:
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
795
            pb.update('Walking content.', count, total)
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
796
            for version_id, data, sha_value in \
797
                self._data.read_records_iter(version_id_records):
798
                pb.update('Walking content.', count, total)
799
                method = self._index.get_method(version_id)
800
                version_idx = self._index.lookup(version_id)
801
                assert method in ('fulltext', 'line-delta')
802
                if method == 'fulltext':
803
                    content = self.factory.parse_fulltext(data, version_idx)
804
                    for line in content.text():
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
805
                        yield line
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
806
                else:
807
                    delta = self.factory.parse_line_delta(data, version_idx)
808
                    for start, end, count, lines in delta:
809
                        for origin, line in lines:
810
                            yield line
811
                count +=1
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
812
            pb.update('Walking content.', total, total)
813
            pb.finished()
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
814
        except:
815
            pb.update('Walking content.', total, total)
816
            pb.finished()
817
            raise
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
818
        
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
819
    def num_versions(self):
820
        """See VersionedFile.num_versions()."""
821
        return self._index.num_versions()
822
823
    __len__ = num_versions
824
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
825
    def annotate_iter(self, version_id):
826
        """See VersionedFile.annotate_iter."""
827
        content = self._get_content(version_id)
828
        for origin, text in content.annotate_iter():
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
829
            yield origin, text
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
830
831
    def get_parents(self, version_id):
832
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
833
        # perf notes:
834
        # optimism counts!
835
        # 52554 calls in 1264 872 internal down from 3674
836
        try:
837
            return self._index.get_parents(version_id)
838
        except KeyError:
839
            raise RevisionNotPresent(version_id, self.filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
840
1594.2.8 by Robert Collins
add ghost aware apis to knits.
841
    def get_parents_with_ghosts(self, version_id):
842
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
843
        try:
844
            return self._index.get_parents_with_ghosts(version_id)
845
        except KeyError:
846
            raise RevisionNotPresent(version_id, self.filename)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
847
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
848
    def get_ancestry(self, versions):
849
        """See VersionedFile.get_ancestry."""
850
        if isinstance(versions, basestring):
851
            versions = [versions]
852
        if not versions:
853
            return []
854
        self._check_versions_present(versions)
855
        return self._index.get_ancestry(versions)
856
1594.2.8 by Robert Collins
add ghost aware apis to knits.
857
    def get_ancestry_with_ghosts(self, versions):
858
        """See VersionedFile.get_ancestry_with_ghosts."""
859
        if isinstance(versions, basestring):
860
            versions = [versions]
861
        if not versions:
862
            return []
863
        self._check_versions_present(versions)
864
        return self._index.get_ancestry_with_ghosts(versions)
865
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
866
    #@deprecated_method(zero_eight)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
867
    def walk(self, version_ids):
868
        """See VersionedFile.walk."""
869
        # We take the short path here, and extract all relevant texts
870
        # and put them in a weave and let that do all the work.  Far
871
        # from optimal, but is much simpler.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
872
        # FIXME RB 20060228 this really is inefficient!
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
873
        from bzrlib.weave import Weave
874
875
        w = Weave(self.filename)
876
        ancestry = self.get_ancestry(version_ids)
877
        sorted_graph = topo_sort(self._index.get_graph())
878
        version_list = [vid for vid in sorted_graph if vid in ancestry]
879
        
880
        for version_id in version_list:
881
            lines = self.get_lines(version_id)
882
            w.add_lines(version_id, self.get_parents(version_id), lines)
883
884
        for lineno, insert_id, dset, line in w.walk(version_ids):
885
            yield lineno, insert_id, dset, line
886
1664.2.3 by Aaron Bentley
Add failing test case
887
    def plan_merge(self, ver_a, ver_b):
1664.2.11 by Aaron Bentley
Clarifications from merge review
888
        """See VersionedFile.plan_merge."""
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
889
        ancestors_b = set(self.get_ancestry(ver_b))
890
        def status_a(revision, text):
891
            if revision in ancestors_b:
892
                return 'killed-b', text
893
            else:
894
                return 'new-a', text
895
        
896
        ancestors_a = set(self.get_ancestry(ver_a))
897
        def status_b(revision, text):
898
            if revision in ancestors_a:
899
                return 'killed-a', text
900
            else:
901
                return 'new-b', text
902
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
903
        annotated_a = self.annotate(ver_a)
904
        annotated_b = self.annotate(ver_b)
1664.2.11 by Aaron Bentley
Clarifications from merge review
905
        plain_a = [t for (a, t) in annotated_a]
906
        plain_b = [t for (a, t) in annotated_b]
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
907
        blocks = KnitSequenceMatcher(None, plain_a, plain_b).get_matching_blocks()
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
908
        a_cur = 0
909
        b_cur = 0
910
        for ai, bi, l in blocks:
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
911
            # process all mismatched sections
912
            # (last mismatched section is handled because blocks always
913
            # includes a 0-length last block)
914
            for revision, text in annotated_a[a_cur:ai]:
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
915
                yield status_a(revision, text)
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
916
            for revision, text in annotated_b[b_cur:bi]:
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
917
                yield status_b(revision, text)
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
918
1664.2.11 by Aaron Bentley
Clarifications from merge review
919
            # and now the matched section
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
920
            a_cur = ai + l
921
            b_cur = bi + l
922
            for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]):
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
923
                assert text_a == text_b
924
                yield "unchanged", text_a
925
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
926
927
class _KnitComponentFile(object):
928
    """One of the files used to implement a knit database"""
929
1666.1.6 by Robert Collins
Make knit the default format.
930
    def __init__(self, transport, filename, mode, file_mode=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
931
        self._transport = transport
932
        self._filename = filename
933
        self._mode = mode
1666.1.6 by Robert Collins
Make knit the default format.
934
        self._file_mode=file_mode
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
935
936
    def write_header(self):
1666.1.6 by Robert Collins
Make knit the default format.
937
        if self._transport.append(self._filename, StringIO(self.HEADER),
938
            mode=self._file_mode):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
939
            raise KnitCorrupt(self._filename, 'misaligned after writing header')
940
941
    def check_header(self, fp):
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
942
        line = fp.readline()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
943
        if line != self.HEADER:
944
            raise KnitHeaderError(badline=line)
945
946
    def commit(self):
947
        """Commit is a nop."""
948
949
    def __repr__(self):
950
        return '%s(%s)' % (self.__class__.__name__, self._filename)
951
952
953
class _KnitIndex(_KnitComponentFile):
954
    """Manages knit index file.
955
956
    The index is already kept in memory and read on startup, to enable
957
    fast lookups of revision information.  The cursor of the index
958
    file is always pointing to the end, making it easy to append
959
    entries.
960
961
    _cache is a cache for fast mapping from version id to a Index
962
    object.
963
964
    _history is a cache for fast mapping from indexes to version ids.
965
966
    The index data format is dictionary compressed when it comes to
967
    parent references; a index entry may only have parents that with a
968
    lover index number.  As a result, the index is topological sorted.
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.
969
970
    Duplicate entries may be written to the index for a single version id
971
    if this is done then the latter one completely replaces the former:
972
    this allows updates to correct version and parent information. 
973
    Note that the two entries may share the delta, and that successive
974
    annotations and references MUST point to the first entry.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
975
976
    The index file on disc contains a header, followed by one line per knit
977
    record. The same revision can be present in an index file more than once.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
978
    The first occurrence gets assigned a sequence number starting from 0. 
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
979
    
980
    The format of a single line is
981
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
982
    REVISION_ID is a utf8-encoded revision id
983
    FLAGS is a comma separated list of flags about the record. Values include 
984
        no-eol, line-delta, fulltext.
985
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
986
        that the the compressed data starts at.
987
    LENGTH is the ascii representation of the length of the data file.
988
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
989
        REVISION_ID.
990
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
991
        revision id already in the knit that is a parent of REVISION_ID.
992
    The ' :' marker is the end of record marker.
993
    
994
    partial writes:
995
    when a write is interrupted to the index file, it will result in a line that
996
    does not end in ' :'. If the ' :' is not present at the end of a line, or at
997
    the end of the file, then the record that is missing it will be ignored by
998
    the parser.
999
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1000
    When writing new records to the index file, the data is preceded by '\n'
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1001
    to ensure that records always start on new lines even if the last write was
1002
    interrupted. As a result its normal for the last line in the index to be
1003
    missing a trailing newline. One can be added with no harmful effects.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1004
    """
1005
1666.1.6 by Robert Collins
Make knit the default format.
1006
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1007
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1008
    # speed of knit parsing went from 280 ms to 280 ms with slots addition.
1009
    # __slots__ = ['_cache', '_history', '_transport', '_filename']
1010
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1011
    def _cache_version(self, version_id, options, pos, size, parents):
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1012
        """Cache a version record in the history array and index cache.
1013
        
1014
        This is inlined into __init__ for performance. KEEP IN SYNC.
1015
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1016
         indexes).
1017
        """
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1018
        # only want the _history index to reference the 1st index entry
1019
        # for version_id
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1020
        if version_id not in self._cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1021
            index = len(self._history)
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1022
            self._history.append(version_id)
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1023
        else:
1024
            index = self._cache[version_id][5]
1025
        self._cache[version_id] = (version_id, 
1026
                                   options,
1027
                                   pos,
1028
                                   size,
1029
                                   parents,
1030
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1031
1666.1.6 by Robert Collins
Make knit the default format.
1032
    def __init__(self, transport, filename, mode, create=False, file_mode=None):
1033
        _KnitComponentFile.__init__(self, transport, filename, mode, file_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1034
        self._cache = {}
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.
1035
        # position in _history is the 'official' index for a revision
1036
        # but the values may have come from a newer entry.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1037
        # so - wc -l of a knit index is != the number of unique names
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1038
        # in the knit.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1039
        self._history = []
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1040
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1041
        try:
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1042
            count = 0
1043
            total = 1
1044
            try:
1045
                pb.update('read knit index', count, total)
1046
                fp = self._transport.get(self._filename)
1047
                self.check_header(fp)
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1048
                # readlines reads the whole file at once:
1049
                # bad for transports like http, good for local disk
1050
                # we save 60 ms doing this one change (
1051
                # from calling readline each time to calling
1052
                # readlines once.
1053
                # probably what we want for nice behaviour on
1054
                # http is a incremental readlines that yields, or
1055
                # a check for local vs non local indexes,
1056
                for l in fp.readlines():
1057
                    rec = l.split()
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1058
                    if len(rec) < 5 or rec[-1] != ':':
1059
                        # corrupt line.
1060
                        # FIXME: in the future we should determine if its a
1061
                        # short write - and ignore it 
1062
                        # or a different failure, and raise. RBC 20060407
1063
                        continue
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1064
                    count += 1
1065
                    total += 1
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1066
                    #pb.update('read knit index', count, total)
1067
                    # See self._parse_parents
1068
                    parents = []
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1069
                    for value in rec[4:-1]:
1596.2.19 by Robert Collins
Shave 20% off id2path.
1070
                        if '.' == value[0]:
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1071
                            # uncompressed reference
1072
                            parents.append(value[1:])
1073
                        else:
1074
                            # this is 15/4000ms faster than isinstance,
1075
                            # (in lsprof)
1076
                            # this function is called thousands of times a 
1077
                            # second so small variations add up.
1078
                            assert value.__class__ is str
1079
                            parents.append(self._history[int(value)])
1080
                    # end self._parse_parents
1081
                    # self._cache_version(rec[0], 
1082
                    #                     rec[1].split(','),
1083
                    #                     int(rec[2]),
1084
                    #                     int(rec[3]),
1085
                    #                     parents)
1086
                    # --- self._cache_version
1087
                    # only want the _history index to reference the 1st 
1088
                    # index entry for version_id
1089
                    version_id = rec[0]
1090
                    if version_id not in self._cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1091
                        index = len(self._history)
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1092
                        self._history.append(version_id)
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1093
                    else:
1094
                        index = self._cache[version_id][5]
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1095
                    self._cache[version_id] = (version_id,
1096
                                               rec[1].split(','),
1097
                                               int(rec[2]),
1098
                                               int(rec[3]),
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1099
                                               parents,
1100
                                               index)
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1101
                    # --- self._cache_version 
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1102
            except NoSuchFile, e:
1103
                if mode != 'w' or not create:
1104
                    raise
1105
                self.write_header()
1106
        finally:
1107
            pb.update('read knit index', total, total)
1108
            pb.finished()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1109
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1110
    def _parse_parents(self, compressed_parents):
1111
        """convert a list of string parent values into version ids.
1112
1113
        ints are looked up in the index.
1114
        .FOO values are ghosts and converted in to FOO.
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1115
1116
        NOTE: the function is retained here for clarity, and for possible
1117
              use in partial index reads. However bulk processing now has
1118
              it inlined in __init__ for inner-loop optimisation.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1119
        """
1120
        result = []
1121
        for value in compressed_parents:
1596.2.15 by Robert Collins
Microprofiling of knit parsing.
1122
            if value[-1] == '.':
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1123
                # uncompressed reference
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1124
                result.append(value[1:])
1125
            else:
1596.2.15 by Robert Collins
Microprofiling of knit parsing.
1126
                # this is 15/4000ms faster than isinstance,
1127
                # this function is called thousands of times a 
1128
                # second so small variations add up.
1129
                assert value.__class__ is str
1596.2.11 by Robert Collins
Remove utf8 debugging code
1130
                result.append(self._history[int(value)])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1131
        return result
1132
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1133
    def get_graph(self):
1134
        graph = []
1135
        for version_id, index in self._cache.iteritems():
1136
            graph.append((version_id, index[4]))
1137
        return graph
1138
1139
    def get_ancestry(self, versions):
1140
        """See VersionedFile.get_ancestry."""
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1141
        # get a graph of all the mentioned versions:
1142
        graph = {}
1143
        pending = set(versions)
1144
        while len(pending):
1145
            version = pending.pop()
1146
            parents = self._cache[version][4]
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1147
            # got the parents ok
1148
            # trim ghosts
1149
            parents = [parent for parent in parents if parent in self._cache]
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1150
            for parent in parents:
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1151
                # if not completed and not a ghost
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1152
                if parent not in graph:
1153
                    pending.add(parent)
1154
            graph[version] = parents
1155
        return topo_sort(graph.items())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1156
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1157
    def get_ancestry_with_ghosts(self, versions):
1158
        """See VersionedFile.get_ancestry_with_ghosts."""
1159
        # get a graph of all the mentioned versions:
1160
        graph = {}
1161
        pending = set(versions)
1162
        while len(pending):
1163
            version = pending.pop()
1164
            try:
1165
                parents = self._cache[version][4]
1166
            except KeyError:
1167
                # ghost, fake it
1168
                graph[version] = []
1169
                pass
1170
            else:
1171
                # got the parents ok
1172
                for parent in parents:
1173
                    if parent not in graph:
1174
                        pending.add(parent)
1175
                graph[version] = parents
1176
        return topo_sort(graph.items())
1177
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1178
    def num_versions(self):
1179
        return len(self._history)
1180
1181
    __len__ = num_versions
1182
1183
    def get_versions(self):
1184
        return self._history
1185
1186
    def idx_to_name(self, idx):
1187
        return self._history[idx]
1188
1189
    def lookup(self, version_id):
1190
        assert version_id in self._cache
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1191
        return self._cache[version_id][5]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1192
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1193
    def _version_list_to_index(self, versions):
1194
        result_list = []
1195
        for version in versions:
1196
            if version in self._cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1197
                # -- inlined lookup() --
1198
                result_list.append(str(self._cache[version][5]))
1199
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1200
            else:
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
1201
                result_list.append('.' + version.encode('utf-8'))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1202
        return ' '.join(result_list)
1203
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1204
    def add_version(self, version_id, options, pos, size, parents):
1205
        """Add a version record to the index."""
1692.4.1 by Robert Collins
Multiple merges:
1206
        self.add_versions(((version_id, options, pos, size, parents),))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1207
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1208
    def add_versions(self, versions):
1209
        """Add multiple versions to the index.
1210
        
1211
        :param versions: a list of tuples:
1212
                         (version_id, options, pos, size, parents).
1213
        """
1214
        lines = []
1215
        for version_id, options, pos, size, parents in versions:
1216
            line = "\n%s %s %s %s %s :" % (version_id.encode('utf-8'),
1217
                                           ','.join(options),
1218
                                           pos,
1219
                                           size,
1220
                                           self._version_list_to_index(parents))
1692.4.1 by Robert Collins
Multiple merges:
1221
            assert isinstance(line, str), \
1222
                'content must be utf-8 encoded: %r' % (line,)
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1223
            lines.append(line)
1224
        self._transport.append(self._filename, StringIO(''.join(lines)))
1225
        # cache after writing, so that a failed write leads to missing cache
1226
        # entries not extra ones. XXX TODO: RBC 20060502 in the event of a 
1227
        # failure, reload the index or flush it or some such, to prevent
1228
        # writing records that did complete twice.
1229
        for version_id, options, pos, size, parents in versions:
1230
            self._cache_version(version_id, options, pos, size, parents)
1231
        
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1232
    def has_version(self, version_id):
1233
        """True if the version is in the index."""
1234
        return self._cache.has_key(version_id)
1235
1236
    def get_position(self, version_id):
1237
        """Return data position and size of specified version."""
1238
        return (self._cache[version_id][2], \
1239
                self._cache[version_id][3])
1240
1241
    def get_method(self, version_id):
1242
        """Return compression method of specified version."""
1243
        options = self._cache[version_id][1]
1244
        if 'fulltext' in options:
1245
            return 'fulltext'
1246
        else:
1247
            assert 'line-delta' in options
1248
            return 'line-delta'
1249
1250
    def get_options(self, version_id):
1251
        return self._cache[version_id][1]
1252
1253
    def get_parents(self, version_id):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1254
        """Return parents of specified version ignoring ghosts."""
1255
        return [parent for parent in self._cache[version_id][4] 
1256
                if parent in self._cache]
1257
1258
    def get_parents_with_ghosts(self, version_id):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1259
        """Return parents of specified version with ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1260
        return self._cache[version_id][4] 
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1261
1262
    def check_versions_present(self, version_ids):
1263
        """Check that all specified versions are present."""
1264
        version_ids = set(version_ids)
1265
        for version_id in list(version_ids):
1266
            if version_id in self._cache:
1267
                version_ids.remove(version_id)
1268
        if version_ids:
1269
            raise RevisionNotPresent(list(version_ids)[0], self.filename)
1270
1271
1272
class _KnitData(_KnitComponentFile):
1273
    """Contents of the knit data file"""
1274
1666.1.6 by Robert Collins
Make knit the default format.
1275
    HEADER = "# bzr knit data 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1276
1666.1.6 by Robert Collins
Make knit the default format.
1277
    def __init__(self, transport, filename, mode, create=False, file_mode=None):
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
1278
        _KnitComponentFile.__init__(self, transport, filename, mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1279
        self._file = None
1280
        self._checked = False
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1281
        if create:
1666.1.6 by Robert Collins
Make knit the default format.
1282
            self._transport.put(self._filename, StringIO(''), mode=file_mode)
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1283
1284
    def clear_cache(self):
1285
        """Clear the record cache."""
1756.3.23 by Aaron Bentley
Remove knit caches
1286
        pass
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1287
1288
    def _open_file(self):
1289
        if self._file is None:
1290
            try:
1291
                self._file = self._transport.get(self._filename)
1292
            except NoSuchFile:
1293
                pass
1294
        return self._file
1295
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1296
    def _record_to_data(self, version_id, digest, lines):
1297
        """Convert version_id, digest, lines into a raw data block.
1298
        
1299
        :return: (len, a StringIO instance with the raw data ready to read.)
1300
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1301
        sio = StringIO()
1302
        data_file = GzipFile(None, mode='wb', fileobj=sio)
1596.2.28 by Robert Collins
more knit profile based tuning.
1303
        data_file.writelines(chain(
1304
            ["version %s %d %s\n" % (version_id.encode('utf-8'), 
1305
                                     len(lines),
1306
                                     digest)],
1307
            lines,
1628.1.2 by Robert Collins
More knit micro-optimisations.
1308
            ["end %s\n" % version_id.encode('utf-8')]))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1309
        data_file.close()
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1310
        length= sio.tell()
1596.2.28 by Robert Collins
more knit profile based tuning.
1311
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1312
        sio.seek(0)
1313
        return length, sio
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1314
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1315
    def add_raw_record(self, raw_data):
1692.4.1 by Robert Collins
Multiple merges:
1316
        """Append a prepared record to the data file.
1317
        
1318
        :return: the offset in the data file raw_data was written.
1319
        """
1596.2.9 by Robert Collins
Utf8 safety in knit indexes.
1320
        assert isinstance(raw_data, str), 'data must be plain bytes'
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1321
        return self._transport.append(self._filename, StringIO(raw_data))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1322
        
1323
    def add_record(self, version_id, digest, lines):
1324
        """Write new text record to disk.  Returns the position in the
1325
        file where it was written."""
1326
        size, sio = self._record_to_data(version_id, digest, lines)
1327
        # write to disk
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1328
        start_pos = self._transport.append(self._filename, sio)
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1329
        return start_pos, size
1330
1331
    def _parse_record_header(self, version_id, raw_data):
1332
        """Parse a record header for consistency.
1333
1334
        :return: the header and the decompressor stream.
1335
                 as (stream, header_record)
1336
        """
1337
        df = GzipFile(mode='rb', fileobj=StringIO(raw_data))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1338
        rec = df.readline().split()
1339
        if len(rec) != 4:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1340
            raise KnitCorrupt(self._filename, 'unexpected number of elements in record header')
1596.2.9 by Robert Collins
Utf8 safety in knit indexes.
1341
        if rec[1].decode('utf-8')!= version_id:
1594.3.3 by Robert Collins
Bugfix error message output in knit error raising.
1342
            raise KnitCorrupt(self._filename, 
1594.3.4 by Robert Collins
Change urllib ranges implementation to be one coalesced range per http request.
1343
                              'unexpected version, wanted %r, got %r' % (
1344
                                version_id, rec[1]))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1345
        return df, rec
1346
1347
    def _parse_record(self, version_id, data):
1628.1.2 by Robert Collins
More knit micro-optimisations.
1348
        # profiling notes:
1349
        # 4168 calls in 2880 217 internal
1350
        # 4168 calls to _parse_record_header in 2121
1351
        # 4168 calls to readlines in 330
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1352
        df, rec = self._parse_record_header(version_id, data)
1628.1.2 by Robert Collins
More knit micro-optimisations.
1353
        record_contents = df.readlines()
1354
        l = record_contents.pop()
1355
        assert len(record_contents) == int(rec[2])
1596.2.9 by Robert Collins
Utf8 safety in knit indexes.
1356
        if l.decode('utf-8') != 'end %s\n' % version_id:
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1357
            raise KnitCorrupt(self._filename, 'unexpected version end line %r, wanted %r' 
1358
                        % (l, version_id))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1359
        df.close()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1360
        return record_contents, rec[3]
1361
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1362
    def read_records_iter_raw(self, records):
1363
        """Read text records from data file and yield raw data.
1364
1365
        This unpacks enough of the text record to validate the id is
1366
        as expected but thats all.
1367
1368
        It will actively recompress currently cached records on the
1369
        basis that that is cheaper than I/O activity.
1370
        """
1371
        # setup an iterator of the external records:
1372
        # uses readv so nice and fast we hope.
1756.3.23 by Aaron Bentley
Remove knit caches
1373
        if len(records):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1374
            # grab the disk data needed.
1375
            raw_records = self._transport.readv(self._filename,
1756.3.23 by Aaron Bentley
Remove knit caches
1376
                [(pos, size) for version_id, pos, size in records])
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1377
1378
        for version_id, pos, size in records:
1756.3.23 by Aaron Bentley
Remove knit caches
1379
            pos, data = raw_records.next()
1380
            # validate the header
1381
            df, rec = self._parse_record_header(version_id, data)
1382
            df.close()
1383
            yield version_id, data
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1384
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1385
    def read_records_iter(self, records):
1386
        """Read text records from data file and yield result.
1387
1388
        Each passed record is a tuple of (version_id, pos, len) and
1389
        will be read in the given order.  Yields (version_id,
1390
        contents, digest).
1391
        """
1756.3.23 by Aaron Bentley
Remove knit caches
1392
        if len(records) == 0:
1393
            return
1628.1.2 by Robert Collins
More knit micro-optimisations.
1394
        # profiling notes:
1395
        # 60890  calls for 4168 extractions in 5045, 683 internal.
1396
        # 4168   calls to readv              in 1411
1397
        # 4168   calls to parse_record       in 2880
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1398
1756.3.23 by Aaron Bentley
Remove knit caches
1399
        # Get unique records, sorted by position
1400
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1401
1402
        # We take it that the transport optimizes the fetching as good
1403
        # as possible (ie, reads continuous ranges.)
1404
        response = self._transport.readv(self._filename,
1405
            [(pos, size) for version_id, pos, size in needed_records])
1406
1407
        record_map = {}
1408
        for (record_id, pos, size), (pos, data) in \
1409
            izip(iter(needed_records), response):
1410
            content, digest = self._parse_record(record_id, data)
1411
            record_map[record_id] = (digest, content)
1412
1413
        for version_id, pos, size in records:
1414
            digest, content = record_map[version_id]
1415
            yield version_id, content, digest
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1416
1417
    def read_records(self, records):
1418
        """Read records into a dictionary."""
1419
        components = {}
1420
        for record_id, content, digest in self.read_records_iter(records):
1421
            components[record_id] = (content, digest)
1422
        return components
1423
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1424
1425
class InterKnit(InterVersionedFile):
1426
    """Optimised code paths for knit to knit operations."""
1427
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1428
    _matching_file_from_factory = KnitVersionedFile
1429
    _matching_file_to_factory = KnitVersionedFile
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1430
    
1431
    @staticmethod
1432
    def is_compatible(source, target):
1433
        """Be compatible with knits.  """
1434
        try:
1435
            return (isinstance(source, KnitVersionedFile) and
1436
                    isinstance(target, KnitVersionedFile))
1437
        except AttributeError:
1438
            return False
1439
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1440
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1441
        """See InterVersionedFile.join."""
1442
        assert isinstance(self.source, KnitVersionedFile)
1443
        assert isinstance(self.target, KnitVersionedFile)
1444
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
1445
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1446
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1447
        if not version_ids:
1448
            return 0
1449
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1450
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1451
        try:
1452
            version_ids = list(version_ids)
1453
            if None in version_ids:
1454
                version_ids.remove(None)
1455
    
1456
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
1457
            this_versions = set(self.target._index.get_versions())
1458
            needed_versions = self.source_ancestry - this_versions
1459
            cross_check_versions = self.source_ancestry.intersection(this_versions)
1460
            mismatched_versions = set()
1461
            for version in cross_check_versions:
1462
                # scan to include needed parents.
1463
                n1 = set(self.target.get_parents_with_ghosts(version))
1464
                n2 = set(self.source.get_parents_with_ghosts(version))
1465
                if n1 != n2:
1466
                    # FIXME TEST this check for cycles being introduced works
1467
                    # the logic is we have a cycle if in our graph we are an
1468
                    # ancestor of any of the n2 revisions.
1469
                    for parent in n2:
1470
                        if parent in n1:
1471
                            # safe
1472
                            continue
1473
                        else:
1474
                            parent_ancestors = self.source.get_ancestry(parent)
1475
                            if version in parent_ancestors:
1476
                                raise errors.GraphCycleError([parent, version])
1477
                    # ensure this parent will be available later.
1478
                    new_parents = n2.difference(n1)
1479
                    needed_versions.update(new_parents.difference(this_versions))
1480
                    mismatched_versions.add(version)
1481
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1482
            if not needed_versions and not mismatched_versions:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1483
                return 0
1484
            full_list = topo_sort(self.source.get_graph())
1485
    
1486
            version_list = [i for i in full_list if (not self.target.has_version(i)
1487
                            and i in needed_versions)]
1488
    
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1489
            # plan the join:
1490
            copy_queue = []
1491
            copy_queue_records = []
1492
            copy_set = set()
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1493
            for version_id in version_list:
1494
                options = self.source._index.get_options(version_id)
1495
                parents = self.source._index.get_parents_with_ghosts(version_id)
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1496
                # check that its will be a consistent copy:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1497
                for parent in parents:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1498
                    # if source has the parent, we must :
1499
                    # * already have it or
1500
                    # * have it scheduled already
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1501
                    # otherwise we don't care
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1502
                    assert (self.target.has_version(parent) or
1503
                            parent in copy_set or
1504
                            not self.source.has_version(parent))
1505
                data_pos, data_size = self.source._index.get_position(version_id)
1506
                copy_queue_records.append((version_id, data_pos, data_size))
1507
                copy_queue.append((version_id, options, parents))
1508
                copy_set.add(version_id)
1509
1510
            # data suck the join:
1511
            count = 0
1512
            total = len(version_list)
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1513
            raw_datum = []
1514
            raw_records = []
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1515
            for (version_id, raw_data), \
1516
                (version_id2, options, parents) in \
1517
                izip(self.source._data.read_records_iter_raw(copy_queue_records),
1518
                     copy_queue):
1519
                assert version_id == version_id2, 'logic error, inconsistent results'
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1520
                count = count + 1
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1521
                pb.update("Joining knit", count, total)
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1522
                raw_records.append((version_id, options, parents, len(raw_data)))
1523
                raw_datum.append(raw_data)
1524
            self.target._add_raw_records(raw_records, ''.join(raw_datum))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1525
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1526
            for version in mismatched_versions:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1527
                # FIXME RBC 20060309 is this needed?
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1528
                n1 = set(self.target.get_parents_with_ghosts(version))
1529
                n2 = set(self.source.get_parents_with_ghosts(version))
1530
                # write a combined record to our history preserving the current 
1531
                # parents as first in the list
1532
                new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1))
1533
                self.target.fix_parents(version, new_parents)
1534
            return count
1535
        finally:
1536
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1537
1538
1539
InterVersionedFile.register_optimiser(InterKnit)
1596.2.24 by Robert Collins
Gzipfile was slightly slower than ideal.
1540
1541
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1542
class WeaveToKnit(InterVersionedFile):
1543
    """Optimised code paths for weave to knit operations."""
1544
    
1545
    _matching_file_from_factory = bzrlib.weave.WeaveFile
1546
    _matching_file_to_factory = KnitVersionedFile
1547
    
1548
    @staticmethod
1549
    def is_compatible(source, target):
1550
        """Be compatible with weaves to knits."""
1551
        try:
1552
            return (isinstance(source, bzrlib.weave.Weave) and
1553
                    isinstance(target, KnitVersionedFile))
1554
        except AttributeError:
1555
            return False
1556
1557
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1558
        """See InterVersionedFile.join."""
1559
        assert isinstance(self.source, bzrlib.weave.Weave)
1560
        assert isinstance(self.target, KnitVersionedFile)
1561
1562
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1563
1564
        if not version_ids:
1565
            return 0
1566
1567
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1568
        try:
1569
            version_ids = list(version_ids)
1570
    
1571
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
1572
            this_versions = set(self.target._index.get_versions())
1573
            needed_versions = self.source_ancestry - this_versions
1574
            cross_check_versions = self.source_ancestry.intersection(this_versions)
1575
            mismatched_versions = set()
1576
            for version in cross_check_versions:
1577
                # scan to include needed parents.
1578
                n1 = set(self.target.get_parents_with_ghosts(version))
1579
                n2 = set(self.source.get_parents(version))
1580
                # if all of n2's parents are in n1, then its fine.
1581
                if n2.difference(n1):
1582
                    # FIXME TEST this check for cycles being introduced works
1583
                    # the logic is we have a cycle if in our graph we are an
1584
                    # ancestor of any of the n2 revisions.
1585
                    for parent in n2:
1586
                        if parent in n1:
1587
                            # safe
1588
                            continue
1589
                        else:
1590
                            parent_ancestors = self.source.get_ancestry(parent)
1591
                            if version in parent_ancestors:
1592
                                raise errors.GraphCycleError([parent, version])
1593
                    # ensure this parent will be available later.
1594
                    new_parents = n2.difference(n1)
1595
                    needed_versions.update(new_parents.difference(this_versions))
1596
                    mismatched_versions.add(version)
1597
    
1598
            if not needed_versions and not mismatched_versions:
1599
                return 0
1600
            full_list = topo_sort(self.source.get_graph())
1601
    
1602
            version_list = [i for i in full_list if (not self.target.has_version(i)
1603
                            and i in needed_versions)]
1604
    
1605
            # do the join:
1606
            count = 0
1607
            total = len(version_list)
1608
            for version_id in version_list:
1609
                pb.update("Converting to knit", count, total)
1610
                parents = self.source.get_parents(version_id)
1611
                # check that its will be a consistent copy:
1612
                for parent in parents:
1613
                    # if source has the parent, we must already have it
1614
                    assert (self.target.has_version(parent))
1615
                self.target.add_lines(
1616
                    version_id, parents, self.source.get_lines(version_id))
1617
                count = count + 1
1618
1619
            for version in mismatched_versions:
1620
                # FIXME RBC 20060309 is this needed?
1621
                n1 = set(self.target.get_parents_with_ghosts(version))
1622
                n2 = set(self.source.get_parents(version))
1623
                # write a combined record to our history preserving the current 
1624
                # parents as first in the list
1625
                new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1))
1626
                self.target.fix_parents(version, new_parents)
1627
            return count
1628
        finally:
1629
            pb.finished()
1630
1631
1632
InterVersionedFile.register_optimiser(WeaveToKnit)
1633
1634
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
1635
class KnitSequenceMatcher(difflib.SequenceMatcher):
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
1636
    """Knit tuned sequence matcher.
1637
1638
    This is based on profiling of difflib which indicated some improvements
1639
    for our usage pattern.
1640
    """
1641
1642
    def find_longest_match(self, alo, ahi, blo, bhi):
1643
        """Find longest matching block in a[alo:ahi] and b[blo:bhi].
1644
1645
        If isjunk is not defined:
1646
1647
        Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
1648
            alo <= i <= i+k <= ahi
1649
            blo <= j <= j+k <= bhi
1650
        and for all (i',j',k') meeting those conditions,
1651
            k >= k'
1652
            i <= i'
1653
            and if i == i', j <= j'
1654
1655
        In other words, of all maximal matching blocks, return one that
1656
        starts earliest in a, and of all those maximal matching blocks that
1657
        start earliest in a, return the one that starts earliest in b.
1658
1659
        >>> s = SequenceMatcher(None, " abcd", "abcd abcd")
1660
        >>> s.find_longest_match(0, 5, 0, 9)
1661
        (0, 4, 5)
1662
1663
        If isjunk is defined, first the longest matching block is
1664
        determined as above, but with the additional restriction that no
1665
        junk element appears in the block.  Then that block is extended as
1666
        far as possible by matching (only) junk elements on both sides.  So
1667
        the resulting block never matches on junk except as identical junk
1668
        happens to be adjacent to an "interesting" match.
1669
1670
        Here's the same example as before, but considering blanks to be
1671
        junk.  That prevents " abcd" from matching the " abcd" at the tail
1672
        end of the second sequence directly.  Instead only the "abcd" can
1673
        match, and matches the leftmost "abcd" in the second sequence:
1674
1675
        >>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
1676
        >>> s.find_longest_match(0, 5, 0, 9)
1677
        (1, 0, 4)
1678
1679
        If no blocks match, return (alo, blo, 0).
1680
1681
        >>> s = SequenceMatcher(None, "ab", "c")
1682
        >>> s.find_longest_match(0, 2, 0, 1)
1683
        (0, 0, 0)
1684
        """
1685
1686
        # CAUTION:  stripping common prefix or suffix would be incorrect.
1687
        # E.g.,
1688
        #    ab
1689
        #    acab
1690
        # Longest matching block is "ab", but if common prefix is
1691
        # stripped, it's "a" (tied with "b").  UNIX(tm) diff does so
1692
        # strip, so ends up claiming that ab is changed to acab by
1693
        # inserting "ca" in the middle.  That's minimal but unintuitive:
1694
        # "it's obvious" that someone inserted "ac" at the front.
1695
        # Windiff ends up at the same place as diff, but by pairing up
1696
        # the unique 'b's and then matching the first two 'a's.
1697
1698
        a, b, b2j, isbjunk = self.a, self.b, self.b2j, self.isbjunk
1699
        besti, bestj, bestsize = alo, blo, 0
1700
        # find longest junk-free match
1701
        # during an iteration of the loop, j2len[j] = length of longest
1702
        # junk-free match ending with a[i-1] and b[j]
1703
        j2len = {}
1704
        # nothing = []
1705
        b2jget = b2j.get
1706
        for i in xrange(alo, ahi):
1707
            # look at all instances of a[i] in b; note that because
1708
            # b2j has no junk keys, the loop is skipped if a[i] is junk
1709
            j2lenget = j2len.get
1710
            newj2len = {}
1711
            
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1712
            # changing b2j.get(a[i], nothing) to a try:KeyError pair produced the
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
1713
            # following improvement
1714
            #     704  0   4650.5320   2620.7410   bzrlib.knit:1336(find_longest_match)
1715
            # +326674  0   1655.1210   1655.1210   +<method 'get' of 'dict' objects>
1716
            #  +76519  0    374.6700    374.6700   +<method 'has_key' of 'dict' objects>
1717
            # to 
1718
            #     704  0   3733.2820   2209.6520   bzrlib.knit:1336(find_longest_match)
1719
            #  +211400 0   1147.3520   1147.3520   +<method 'get' of 'dict' objects>
1720
            #  +76519  0    376.2780    376.2780   +<method 'has_key' of 'dict' objects>
1721
1722
            try:
1723
                js = b2j[a[i]]
1724
            except KeyError:
1725
                pass
1726
            else:
1727
                for j in js:
1728
                    # a[i] matches b[j]
1729
                    if j >= blo:
1730
                        if j >= bhi:
1731
                            break
1732
                        k = newj2len[j] = 1 + j2lenget(-1 + j, 0)
1733
                        if k > bestsize:
1734
                            besti, bestj, bestsize = 1 + i-k, 1 + j-k, k
1735
            j2len = newj2len
1736
1737
        # Extend the best by non-junk elements on each end.  In particular,
1738
        # "popular" non-junk elements aren't in b2j, which greatly speeds
1739
        # the inner loop above, but also means "the best" match so far
1740
        # doesn't contain any junk *or* popular non-junk elements.
1741
        while besti > alo and bestj > blo and \
1742
              not isbjunk(b[bestj-1]) and \
1743
              a[besti-1] == b[bestj-1]:
1744
            besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
1745
        while besti+bestsize < ahi and bestj+bestsize < bhi and \
1746
              not isbjunk(b[bestj+bestsize]) and \
1747
              a[besti+bestsize] == b[bestj+bestsize]:
1748
            bestsize += 1
1749
1750
        # Now that we have a wholly interesting match (albeit possibly
1751
        # empty!), we may as well suck up the matching junk on each
1752
        # side of it too.  Can't think of a good reason not to, and it
1753
        # saves post-processing the (possibly considerable) expense of
1754
        # figuring out what to do with it.  In the case of an empty
1755
        # interesting match, this is clearly the right thing to do,
1756
        # because no other kind of match is possible in the regions.
1757
        while besti > alo and bestj > blo and \
1758
              isbjunk(b[bestj-1]) and \
1759
              a[besti-1] == b[bestj-1]:
1760
            besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
1761
        while besti+bestsize < ahi and bestj+bestsize < bhi and \
1762
              isbjunk(b[bestj+bestsize]) and \
1763
              a[besti+bestsize] == b[bestj+bestsize]:
1764
            bestsize = bestsize + 1
1765
1766
        return besti, bestj, bestsize
1767