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