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