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