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