~bzr-pqm/bzr/bzr.dev

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