/brz/remove-bazaar

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