~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
1596.2.28 by Robert Collins
more knit profile based tuning.
65
from itertools import izip, chain
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
66
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
67
import os
1628.1.2 by Robert Collins
More knit micro-optimisations.
68
import sys
1756.2.29 by Aaron Bentley
Remove basis knit support
69
import warnings
2762.3.1 by Robert Collins
* The compression used within the bzr repository has changed from zlib
70
from zlib import Z_DEFAULT_COMPRESSION
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
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import (
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
76
    annotate,
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
77
    lru_cache,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
78
    pack,
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
79
    trace,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
80
    )
81
""")
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
82
from bzrlib import (
83
    cache_utf8,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
84
    debug,
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
85
    diff,
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
86
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
87
    osutils,
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
88
    patiencediff,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
89
    progress,
1551.15.46 by Aaron Bentley
Move plan merge to tree
90
    merge,
2196.2.1 by John Arbash Meinel
Merge Dmitry's optimizations and minimize the actual diff.
91
    ui,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
92
    )
93
from bzrlib.errors import (
94
    FileExists,
95
    NoSuchFile,
96
    KnitError,
97
    InvalidRevisionId,
98
    KnitCorrupt,
99
    KnitHeaderError,
100
    RevisionNotPresent,
101
    RevisionAlreadyPresent,
102
    )
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
103
from bzrlib.tuned_gzip import GzipFile, bytes_to_gzip
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
104
from bzrlib.osutils import (
105
    contains_whitespace,
106
    contains_linebreaks,
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
107
    sha_string,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
108
    sha_strings,
109
    )
1756.2.29 by Aaron Bentley
Remove basis knit support
110
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.
111
from bzrlib.tsort import topo_sort
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
112
import bzrlib.ui
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
113
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
114
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
115
116
117
# TODO: Split out code specific to this format into an associated object.
118
119
# TODO: Can we put in some kind of value to check that the index and data
120
# files belong together?
121
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
122
# 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.
123
124
# TODO: function to check whole file
125
126
# TODO: atomically append data, then measure backwards from the cursor
127
# position after writing to work out where it was located.  we may need to
128
# bypass python file buffering.
129
130
DATA_SUFFIX = '.knit'
131
INDEX_SUFFIX = '.kndx'
132
133
134
class KnitContent(object):
135
    """Content of a knit version to which deltas can be applied."""
136
137
    def annotate(self):
138
        """Return a list of (origin, text) tuples."""
139
        return list(self.annotate_iter())
140
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
141
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
142
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
143
        raise NotImplementedError(self.apply_delta)
144
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
145
    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.
146
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
147
        new_texts = new_lines.text()
148
        old_texts = self.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
149
        s = patiencediff.PatienceSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
150
        for tag, i1, i2, j1, j2 in s.get_opcodes():
151
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
152
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
153
            # ofrom, oto, length, data
154
            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.
155
156
    def line_delta(self, new_lines):
157
        return list(self.line_delta_iter(new_lines))
158
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
159
    @staticmethod
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
160
    def get_line_delta_blocks(knit_delta, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
161
        """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
162
        target_len = len(target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
163
        s_pos = 0
164
        t_pos = 0
165
        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
166
            true_n = s_begin - s_pos
167
            n = true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
168
            if n > 0:
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
169
                # knit deltas do not provide reliable info about whether the
170
                # last line of a file matches, due to eol handling.
171
                if source[s_pos + n -1] != target[t_pos + n -1]:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
172
                    n-=1
173
                if n > 0:
174
                    yield s_pos, t_pos, n
175
            t_pos += t_len + true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
176
            s_pos = s_end
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
177
        n = target_len - t_pos
178
        if n > 0:
179
            if source[s_pos + n -1] != target[t_pos + n -1]:
180
                n-=1
181
            if n > 0:
182
                yield s_pos, t_pos, n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
183
        yield s_pos + (target_len - t_pos), target_len, 0
184
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
185
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
186
class AnnotatedKnitContent(KnitContent):
187
    """Annotated content."""
188
189
    def __init__(self, lines):
190
        self._lines = lines
191
192
    def annotate_iter(self):
193
        """Yield tuples of (origin, text) for each content line."""
194
        return iter(self._lines)
195
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
196
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
197
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
198
        offset = 0
199
        lines = self._lines
200
        for start, end, count, delta_lines in delta:
201
            lines[offset+start:offset+end] = delta_lines
202
            offset = offset + (start - end) + count
203
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
204
    def strip_last_line_newline(self):
205
        line = self._lines[-1][1].rstrip('\n')
206
        self._lines[-1] = (self._lines[-1][0], line)
207
208
    def text(self):
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
209
        try:
210
            return [text for origin, text in self._lines]
211
        except ValueError, e:
212
            # most commonly (only?) caused by the internal form of the knit
213
            # missing annotation information because of a bug - see thread
214
            # around 20071015
215
            raise KnitCorrupt(self,
216
                "line in annotated knit missing annotation information: %s"
217
                % (e,))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
218
219
    def copy(self):
220
        return AnnotatedKnitContent(self._lines[:])
221
222
223
class PlainKnitContent(KnitContent):
2794.1.3 by Robert Collins
Review feedback.
224
    """Unannotated content.
225
    
226
    When annotate[_iter] is called on this content, the same version is reported
227
    for all lines. Generally, annotate[_iter] is not useful on PlainKnitContent
228
    objects.
229
    """
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
230
231
    def __init__(self, lines, version_id):
232
        self._lines = lines
233
        self._version_id = version_id
234
235
    def annotate_iter(self):
236
        """Yield tuples of (origin, text) for each content line."""
237
        for line in self._lines:
238
            yield self._version_id, line
239
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
240
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
241
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
242
        offset = 0
243
        lines = self._lines
244
        for start, end, count, delta_lines in delta:
245
            lines[offset+start:offset+end] = delta_lines
246
            offset = offset + (start - end) + count
247
        self._version_id = new_version_id
248
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
249
    def copy(self):
250
        return PlainKnitContent(self._lines[:], self._version_id)
251
252
    def strip_last_line_newline(self):
253
        self._lines[-1] = self._lines[-1].rstrip('\n')
254
255
    def text(self):
256
        return self._lines
257
258
259
class KnitAnnotateFactory(object):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
260
    """Factory for creating annotated Content objects."""
261
262
    annotated = True
263
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
264
    def make(self, lines, version_id):
265
        num_lines = len(lines)
266
        return AnnotatedKnitContent(zip([version_id] * num_lines, lines))
267
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
268
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
269
        """Convert fulltext to internal representation
270
271
        fulltext content is of the format
272
        revid(utf8) plaintext\n
273
        internal representation is of the format:
274
        (revid, plaintext)
275
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
276
        # TODO: jam 20070209 The tests expect this to be returned as tuples,
277
        #       but the code itself doesn't really depend on that.
278
        #       Figure out a way to not require the overhead of turning the
279
        #       list back into tuples.
280
        lines = [tuple(line.split(' ', 1)) for line in content]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
281
        return AnnotatedKnitContent(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
282
283
    def parse_line_delta_iter(self, lines):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
284
        return iter(self.parse_line_delta(lines))
1628.1.2 by Robert Collins
More knit micro-optimisations.
285
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
286
    def parse_line_delta(self, lines, version_id, plain=False):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
287
        """Convert a line based delta into internal representation.
288
289
        line delta is in the form of:
290
        intstart intend intcount
291
        1..count lines:
292
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
293
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
294
        (start, end, count, [1..count tuples (revid, newline)])
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
295
296
        :param plain: If True, the lines are returned as a plain
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
297
            list without annotations, not as a list of (origin, content) tuples, i.e.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
298
            (start, end, count, [1..count newline])
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
299
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
300
        result = []
301
        lines = iter(lines)
302
        next = lines.next
2249.5.1 by John Arbash Meinel
Leave revision-ids in utf-8 when reading.
303
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
304
        cache = {}
305
        def cache_and_return(line):
306
            origin, text = line.split(' ', 1)
307
            return cache.setdefault(origin, origin), text
308
1628.1.2 by Robert Collins
More knit micro-optimisations.
309
        # walk through the lines parsing.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
310
        # Note that the plain test is explicitly pulled out of the
311
        # loop to minimise any performance impact
312
        if plain:
313
            for header in lines:
314
                start, end, count = [int(n) for n in header.split(',')]
315
                contents = [next().split(' ', 1)[1] for i in xrange(count)]
316
                result.append((start, end, count, contents))
317
        else:
318
            for header in lines:
319
                start, end, count = [int(n) for n in header.split(',')]
320
                contents = [tuple(next().split(' ', 1)) for i in xrange(count)]
321
                result.append((start, end, count, contents))
1628.1.2 by Robert Collins
More knit micro-optimisations.
322
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
323
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
324
    def get_fulltext_content(self, lines):
325
        """Extract just the content lines from a fulltext."""
326
        return (line.split(' ', 1)[1] for line in lines)
327
328
    def get_linedelta_content(self, lines):
329
        """Extract just the content from a line delta.
330
331
        This doesn't return all of the extra information stored in a delta.
332
        Only the actual content lines.
333
        """
334
        lines = iter(lines)
335
        next = lines.next
336
        for header in lines:
337
            header = header.split(',')
338
            count = int(header[2])
339
            for i in xrange(count):
340
                origin, text = next().split(' ', 1)
341
                yield text
342
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
343
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
344
        """convert a fulltext content record into a serializable form.
345
346
        see parse_fulltext which this inverts.
347
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
348
        # TODO: jam 20070209 We only do the caching thing to make sure that
349
        #       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.
350
        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.
351
352
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
353
        """convert a delta into a serializable form.
354
1628.1.2 by Robert Collins
More knit micro-optimisations.
355
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
356
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
357
        # TODO: jam 20070209 We only do the caching thing to make sure that
358
        #       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.
359
        out = []
360
        for start, end, c, lines in delta:
361
            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.
362
            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
363
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
364
        return out
365
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
366
    def annotate_iter(self, knit, version_id):
367
        content = knit._get_content(version_id)
2770.1.9 by Aaron Bentley
Simplify annotate iterator
368
        return content.annotate_iter()
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
369
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
370
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
371
class KnitPlainFactory(object):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
372
    """Factory for creating plain Content objects."""
373
374
    annotated = False
375
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
376
    def make(self, lines, version_id):
377
        return PlainKnitContent(lines, version_id)
378
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
379
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
380
        """This parses an unannotated fulltext.
381
382
        Note that this is not a noop - the internal representation
383
        has (versionid, line) - its just a constant versionid.
384
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
385
        return self.make(content, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
386
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
387
    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
388
        cur = 0
389
        num_lines = len(lines)
390
        while cur < num_lines:
391
            header = lines[cur]
392
            cur += 1
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
393
            start, end, c = [int(n) for n in header.split(',')]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
394
            yield start, end, c, lines[cur:cur+c]
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
395
            cur += c
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
396
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
397
    def parse_line_delta(self, lines, version_id):
398
        return list(self.parse_line_delta_iter(lines, version_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
399
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
400
    def get_fulltext_content(self, lines):
401
        """Extract just the content lines from a fulltext."""
402
        return iter(lines)
403
404
    def get_linedelta_content(self, lines):
405
        """Extract just the content from a line delta.
406
407
        This doesn't return all of the extra information stored in a delta.
408
        Only the actual content lines.
409
        """
410
        lines = iter(lines)
411
        next = lines.next
412
        for header in lines:
413
            header = header.split(',')
414
            count = int(header[2])
415
            for i in xrange(count):
416
                yield next()
417
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
418
    def lower_fulltext(self, content):
419
        return content.text()
420
421
    def lower_line_delta(self, delta):
422
        out = []
423
        for start, end, c, lines in delta:
424
            out.append('%d,%d,%d\n' % (start, end, c))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
425
            out.extend(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
426
        return out
427
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
428
    def annotate_iter(self, knit, version_id):
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
429
        return annotate_knit(knit, version_id)
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
430
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
431
432
def make_empty_knit(transport, relpath):
433
    """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.
434
    k = KnitVersionedFile(transport, relpath, 'w', KnitPlainFactory)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
435
436
437
class KnitVersionedFile(VersionedFile):
438
    """Weave-like structure with faster random access.
439
440
    A knit stores a number of texts and a summary of the relationships
441
    between them.  Texts are identified by a string version-id.  Texts
442
    are normally stored and retrieved as a series of lines, but can
443
    also be passed as single strings.
444
445
    Lines are stored with the trailing newline (if any) included, to
446
    avoid special cases for files with no final newline.  Lines are
447
    composed of 8-bit characters, not unicode.  The combination of
448
    these approaches should mean any 'binary' file can be safely
449
    stored and retrieved.
450
    """
451
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
452
    def __init__(self, relpath, transport, file_mode=None, access_mode=None,
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
453
        factory=None, delta=True, create=False, create_parent_dir=False,
454
        delay_create=False, dir_mode=None, index=None, access_method=None):
1563.2.25 by Robert Collins
Merge in upstream.
455
        """Construct a knit at location specified by relpath.
456
        
457
        :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
458
        :param create_parent_dir: If True, create the parent directory if 
459
            creating the file fails. (This is used for stores with 
460
            hash-prefixes that may not exist yet)
461
        :param delay_create: The calling code is aware that the knit won't 
462
            actually be created until the first data is stored.
2592.3.1 by Robert Collins
Allow giving KnitVersionedFile an index object to use rather than implicitly creating one.
463
        :param index: An index to use for the knit.
1563.2.25 by Robert Collins
Merge in upstream.
464
        """
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
465
        if access_mode is None:
466
            access_mode = 'w'
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
467
        super(KnitVersionedFile, self).__init__(access_mode)
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
468
        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.
469
        self.transport = transport
470
        self.filename = relpath
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
471
        self.factory = factory or KnitAnnotateFactory()
472
        self.writable = (access_mode == 'w')
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
473
        self.delta = delta
474
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
475
        self._max_delta_chain = 200
476
2592.3.1 by Robert Collins
Allow giving KnitVersionedFile an index object to use rather than implicitly creating one.
477
        if index is None:
478
            self._index = _KnitIndex(transport, relpath + INDEX_SUFFIX,
479
                access_mode, create=create, file_mode=file_mode,
480
                create_parent_dir=create_parent_dir, delay_create=delay_create,
481
                dir_mode=dir_mode)
482
        else:
483
            self._index = index
2592.3.69 by Robert Collins
Allow specifying an access method to KnitVersionedFile.
484
        if access_method is None:
485
            _access = _KnitAccess(transport, relpath + DATA_SUFFIX, file_mode, dir_mode,
486
                ((create and not len(self)) and delay_create), create_parent_dir)
487
        else:
488
            _access = access_method
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
489
        if create and not len(self) and not delay_create:
490
            _access.create()
491
        self._data = _KnitData(_access)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
492
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
493
    def __repr__(self):
2592.3.159 by Robert Collins
Provide a transport for KnitVersionedFile's __repr__ in pack repositories.
494
        return '%s(%s)' % (self.__class__.__name__,
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
495
                           self.transport.abspath(self.filename))
496
    
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
497
    def _check_should_delta(self, first_parents):
498
        """Iterate back through the parent listing, looking for a fulltext.
499
500
        This is used when we want to decide whether to add a delta or a new
501
        fulltext. It searches for _max_delta_chain parents. When it finds a
502
        fulltext parent, it sees if the total size of the deltas leading up to
503
        it is large enough to indicate that we want a new full text anyway.
504
505
        Return True if we should create a new delta, False if we should use a
506
        full text.
507
        """
508
        delta_size = 0
509
        fulltext_size = None
510
        delta_parents = first_parents
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
511
        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
512
            parent = delta_parents[0]
513
            method = self._index.get_method(parent)
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
514
            index, pos, size = self._index.get_position(parent)
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
515
            if method == 'fulltext':
516
                fulltext_size = size
517
                break
518
            delta_size += size
519
            delta_parents = self._index.get_parents(parent)
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
520
        else:
521
            # 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
522
            return False
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
523
524
        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
525
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
526
    def _add_raw_records(self, records, data):
527
        """Add all the records 'records' with data pre-joined in 'data'.
528
529
        :param records: A list of tuples(version_id, options, parents, size).
530
        :param data: The data for the records. When it is written, the records
531
                     are adjusted to have pos pointing into data by the sum of
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
532
                     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.
533
        """
534
        # write all the data
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
535
        raw_record_sizes = [record[3] for record in records]
536
        positions = self._data.add_raw_records(raw_record_sizes, data)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
537
        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.
538
        index_entries = []
2592.3.68 by Robert Collins
Make knit add_versions calls take access memo tuples rather than just pos and size.
539
        for (version_id, options, parents, size), access_memo in zip(
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
540
            records, positions):
2592.3.68 by Robert Collins
Make knit add_versions calls take access memo tuples rather than just pos and size.
541
            index_entries.append((version_id, options, access_memo, parents))
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
542
            if self._data._do_cache:
543
                self._data._cache[version_id] = data[offset:offset+size]
544
            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.
545
        self._index.add_versions(index_entries)
546
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
547
    def enable_cache(self):
548
        """Start caching data for this knit"""
549
        self._data.enable_cache()
550
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
551
    def clear_cache(self):
552
        """Clear the data cache only."""
553
        self._data.clear_cache()
554
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
555
    def copy_to(self, name, transport):
556
        """See VersionedFile.copy_to()."""
557
        # copy the current index to a temp index to avoid racing with local
558
        # writes
1955.3.30 by John Arbash Meinel
fix small bug
559
        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
560
                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.
561
        # 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()
562
        f = self._data._open_file()
563
        try:
1955.3.8 by John Arbash Meinel
avoid some deprecation warnings in other parts of the code
564
            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()
565
        finally:
566
            f.close()
567
        # move the copied index into place
568
        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.
569
1563.2.13 by Robert Collins
InterVersionedFile implemented.
570
    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
571
        return KnitVersionedFile(name, transport, factory=self.factory,
572
                                 delta=self.delta, create=True)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
573
    
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
574
    def get_data_stream(self, required_versions):
575
        """Get a data stream for the specified versions.
576
577
        Versions may be returned in any order, not necessarily the order
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
578
        specified.  They are returned in a partial order by compression
579
        parent, so that the deltas can be applied as the data stream is
580
        inserted; however note that compression parents will not be sent
581
        unless they were specifically requested, as the client may already
582
        have them.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
583
2670.3.7 by Andrew Bennetts
Tweak docstring as requested in review.
584
        :param required_versions: The exact set of versions to be extracted.
585
            Unlike some other knit methods, this is not used to generate a
586
            transitive closure, rather it is used precisely as given.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
587
        
588
        :returns: format_signature, list of (version, options, length, parents),
589
            reader_callable.
590
        """
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
591
        required_version_set = frozenset(required_versions)
592
        version_index = {}
593
        # list of revisions that can just be sent without waiting for their
594
        # compression parent
595
        ready_to_send = []
596
        # map from revision to the children based on it
597
        deferred = {}
598
        # first, read all relevant index data, enough to sort into the right
599
        # order to return
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
600
        for version_id in required_versions:
601
            options = self._index.get_options(version_id)
602
            parents = self._index.get_parents_with_ghosts(version_id)
2535.3.36 by Andrew Bennetts
Merge bzr.dev
603
            index_memo = self._index.get_position(version_id)
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
604
            version_index[version_id] = (index_memo, options, parents)
3034.3.1 by Martin Pool
Post-review cleanups from Robert for KnitVersionedFile.get_data_stream
605
            if ('line-delta' in options
606
                and parents[0] in required_version_set):
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
607
                # must wait until the parent has been sent
608
                deferred.setdefault(parents[0], []). \
609
                    append(version_id)
610
            else:
611
                # either a fulltext, or a delta whose parent the client did
612
                # not ask for and presumably already has
613
                ready_to_send.append(version_id)
614
        # build a list of results to return, plus instructions for data to
615
        # read from the file
616
        copy_queue_records = []
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
617
        temp_version_list = []
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
618
        while ready_to_send:
619
            # XXX: pushing and popping lists may be a bit inefficient
3023.2.3 by Martin Pool
Update tests for new ordering of results from get_data_stream - the order is not defined by the interface, but is stable
620
            version_id = ready_to_send.pop(0)
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
621
            (index_memo, options, parents) = version_index[version_id]
2535.3.36 by Andrew Bennetts
Merge bzr.dev
622
            copy_queue_records.append((version_id, index_memo))
623
            none, data_pos, data_size = index_memo
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
624
            temp_version_list.append((version_id, options, data_size,
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
625
                parents))
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
626
            if version_id in deferred:
627
                # now we can send all the children of this revision - we could
3023.2.3 by Martin Pool
Update tests for new ordering of results from get_data_stream - the order is not defined by the interface, but is stable
628
                # put them in anywhere, but we hope that sending them soon
629
                # after the fulltext will give good locality in the receiver
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
630
                ready_to_send[:0] = deferred.pop(version_id)
631
        assert len(deferred) == 0, \
632
            "Still have compressed child versions waiting to be sent"
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
633
        # XXX: The stream format is such that we cannot stream it - we have to
634
        # know the length of all the data a-priori.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
635
        raw_datum = []
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
636
        result_version_list = []
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
637
        for (version_id, raw_data), \
638
            (version_id2, options, _, parents) in \
639
            izip(self._data.read_records_iter_raw(copy_queue_records),
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
640
                 temp_version_list):
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
641
            assert version_id == version_id2, \
642
                'logic error, inconsistent results'
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
643
            raw_datum.append(raw_data)
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
644
            result_version_list.append(
645
                (version_id, options, len(raw_data), parents))
646
        # provide a callback to get data incrementally.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
647
        pseudo_file = StringIO(''.join(raw_datum))
648
        def read(length):
649
            if length is None:
650
                return pseudo_file.read()
651
            else:
652
                return pseudo_file.read(length)
653
        return (self.get_format_signature(), result_version_list, read)
654
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
655
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
656
        if self._index.get_method(version_id) != 'line-delta':
657
            return None
658
        parent, sha1, noeol, delta = self.get_delta(version_id)
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
659
        return KnitContent.get_line_delta_blocks(delta, source, target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
660
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
661
    def get_delta(self, version_id):
662
        """Get a delta for constructing version from some other version."""
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
663
        self.check_not_reserved_id(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
664
        parents = self.get_parents(version_id)
665
        if len(parents):
666
            parent = parents[0]
667
        else:
668
            parent = None
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
669
        index_memo = self._index.get_position(version_id)
670
        data, sha1 = self._data.read_records(((version_id, index_memo),))[version_id]
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
671
        noeol = 'no-eol' in self._index.get_options(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
672
        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
673
            new_content = self.factory.parse_fulltext(data, version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
674
            if parent is not None:
675
                reference_content = self._get_content(parent)
676
                old_texts = reference_content.text()
677
            else:
678
                old_texts = []
679
            new_texts = new_content.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
680
            delta_seq = patiencediff.PatienceSequenceMatcher(None, old_texts,
681
                                                             new_texts)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
682
            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.
683
        else:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
684
            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.
685
            return parent, sha1, noeol, delta
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
686
687
    def get_format_signature(self):
688
        """See VersionedFile.get_format_signature()."""
689
        if self.factory.annotated:
690
            annotated_part = "annotated"
691
        else:
692
            annotated_part = "plain"
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
693
        return "knit-%s" % (annotated_part,)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
694
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
695
    def get_graph_with_ghosts(self):
696
        """See VersionedFile.get_graph_with_ghosts()."""
697
        graph_items = self._index.get_graph()
698
        return dict(graph_items)
699
1666.1.6 by Robert Collins
Make knit the default format.
700
    def get_sha1(self, version_id):
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
701
        return self.get_sha1s([version_id])[0]
2520.4.88 by Aaron Bentley
Retrieve all sha1s at once (ftw)
702
703
    def get_sha1s(self, version_ids):
1666.1.6 by Robert Collins
Make knit the default format.
704
        """See VersionedFile.get_sha1()."""
2520.4.88 by Aaron Bentley
Retrieve all sha1s at once (ftw)
705
        record_map = self._get_record_map(version_ids)
706
        # record entry 2 is the 'digest'.
707
        return [record_map[v][2] for v in version_ids]
1666.1.6 by Robert Collins
Make knit the default format.
708
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
709
    @staticmethod
710
    def get_suffixes():
711
        """See VersionedFile.get_suffixes()."""
712
        return [DATA_SUFFIX, INDEX_SUFFIX]
1563.2.13 by Robert Collins
InterVersionedFile implemented.
713
1594.2.8 by Robert Collins
add ghost aware apis to knits.
714
    def has_ghost(self, version_id):
715
        """True if there is a ghost reference in the file to version_id."""
716
        # maybe we have it
717
        if self.has_version(version_id):
718
            return False
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
719
        # optimisable if needed by memoising the _ghosts set.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
720
        items = self._index.get_graph()
721
        for node, parents in items:
722
            for parent in parents:
723
                if parent not in self._index._cache:
724
                    if parent == version_id:
725
                        return True
726
        return False
727
2535.3.30 by Andrew Bennetts
Delete obsolete comments and other cosmetic changes.
728
    def insert_data_stream(self, (format, data_list, reader_callable)):
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
729
        """Insert knit records from a data stream into this knit.
730
2535.3.5 by Andrew Bennetts
Batch writes as much as possible in insert_data_stream.
731
        If a version in the stream is already present in this knit, it will not
732
        be inserted a second time.  It will be checked for consistency with the
733
        stored version however, and may cause a KnitCorrupt error to be raised
734
        if the data in the stream disagrees with the already stored data.
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
735
        
736
        :seealso: get_data_stream
737
        """
738
        if format != self.get_format_signature():
3172.2.1 by Andrew Bennetts
Enable use of smart revision streaming between repos with compatible models, not just between identical format repos.
739
            if 'knit' in debug.debug_flags:
740
                trace.mutter(
741
                    'incompatible format signature inserting to %r', self)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
742
            source = self._knit_from_datastream(
743
                (format, data_list, reader_callable))
744
            self.join(source)
745
            return
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
746
747
        for version_id, options, length, parents in data_list:
748
            if self.has_version(version_id):
749
                # First check: the list of parents.
750
                my_parents = self.get_parents_with_ghosts(version_id)
3184.5.1 by Lukáš Lalinský
Fix handling of some error cases in insert_data_stream
751
                if tuple(my_parents) != tuple(parents):
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
752
                    # XXX: KnitCorrupt is not quite the right exception here.
753
                    raise KnitCorrupt(
754
                        self.filename,
755
                        'parents list %r from data stream does not match '
756
                        'already recorded parents %r for %s'
757
                        % (parents, my_parents, version_id))
758
759
                # Also check the SHA-1 of the fulltext this content will
760
                # produce.
761
                raw_data = reader_callable(length)
762
                my_fulltext_sha1 = self.get_sha1(version_id)
763
                df, rec = self._data._parse_record_header(version_id, raw_data)
764
                stream_fulltext_sha1 = rec[3]
765
                if my_fulltext_sha1 != stream_fulltext_sha1:
766
                    # Actually, we don't know if it's this knit that's corrupt,
767
                    # or the data stream we're trying to insert.
768
                    raise KnitCorrupt(
769
                        self.filename, 'sha-1 does not match %s' % version_id)
770
            else:
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
771
                if 'line-delta' in options:
2535.3.61 by Andrew Bennetts
Clarify sanity checking in insert_data_stream.
772
                    # Make sure that this knit record is actually useful: a
773
                    # line-delta is no use unless we have its parent.
774
                    # Fetching from a broken repository with this problem
775
                    # shouldn't break the target repository.
3040.2.1 by Martin Pool
Give a better message when failing to pull because the source needs to be reconciled
776
                    #
777
                    # See https://bugs.launchpad.net/bzr/+bug/164443
2535.3.61 by Andrew Bennetts
Clarify sanity checking in insert_data_stream.
778
                    if not self._index.has_version(parents[0]):
779
                        raise KnitCorrupt(
780
                            self.filename,
3040.2.1 by Martin Pool
Give a better message when failing to pull because the source needs to be reconciled
781
                            'line-delta from stream '
782
                            'for version %s '
783
                            'references '
784
                            'missing parent %s\n'
3040.2.2 by Martin Pool
Clearer reconcile recommendation message (thanks Matt Nordhoff)
785
                            'Try running "bzr check" '
786
                            'on the source repository, and "bzr reconcile" '
3040.2.1 by Martin Pool
Give a better message when failing to pull because the source needs to be reconciled
787
                            'if necessary.' %
788
                            (version_id, parents[0]))
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
789
                self._add_raw_records(
790
                    [(version_id, options, parents, length)],
791
                    reader_callable(length))
792
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
793
    def _knit_from_datastream(self, (format, data_list, reader_callable)):
794
        """Create a knit object from a data stream.
795
796
        This method exists to allow conversion of data streams that do not
797
        match the signature of this knit. Generally it will be slower and use
798
        more memory to use this method to insert data, but it will work.
799
800
        :seealso: get_data_stream for details on datastreams.
801
        :return: A knit versioned file which can be used to join the datastream
802
            into self.
803
        """
804
        if format == "knit-plain":
805
            factory = KnitPlainFactory()
806
        elif format == "knit-annotated":
807
            factory = KnitAnnotateFactory()
808
        else:
809
            raise errors.KnitDataStreamUnknown(format)
810
        index = _StreamIndex(data_list)
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
811
        access = _StreamAccess(reader_callable, index, self, factory)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
812
        return KnitVersionedFile(self.filename, self.transport,
813
            factory=factory, index=index, access_method=access)
814
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
815
    def versions(self):
816
        """See VersionedFile.versions."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
817
        if 'evil' in debug.debug_flags:
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
818
            trace.mutter_callsite(2, "versions scales with size of history")
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
819
        return self._index.get_versions()
820
821
    def has_version(self, version_id):
822
        """See VersionedFile.has_version."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
823
        if 'evil' in debug.debug_flags:
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
824
            trace.mutter_callsite(2, "has_version is a LBYL scenario")
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
825
        return self._index.has_version(version_id)
826
827
    __contains__ = has_version
828
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
829
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
830
                           delta=None, annotated=None,
831
                           left_matching_blocks=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
832
        """Merge annotations for content.  This is done by comparing
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
833
        the annotations based on changed to the text.
834
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
835
        if left_matching_blocks is not None:
836
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
837
        else:
838
            delta_seq = None
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
839
        if annotated:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
840
            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.
841
                merge_content = self._get_content(parent_id, parent_texts)
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
842
                if (parent_id == parents[0] and delta_seq is not None):
843
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
844
                else:
845
                    seq = patiencediff.PatienceSequenceMatcher(
846
                        None, merge_content.text(), content.text())
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
847
                for i, j, n in seq.get_matching_blocks():
848
                    if n == 0:
849
                        continue
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
850
                    # this appears to copy (origin, text) pairs across to the
851
                    # new content for any line that matches the last-checked
852
                    # parent.
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
853
                    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.
854
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
855
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
856
                reference_content = self._get_content(parents[0], parent_texts)
857
                new_texts = content.text()
858
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
859
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
860
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
861
            return self._make_line_delta(delta_seq, content)
862
863
    def _make_line_delta(self, delta_seq, new_content):
864
        """Generate a line delta from delta_seq and new_content."""
865
        diff_hunks = []
866
        for op in delta_seq.get_opcodes():
867
            if op[0] == 'equal':
868
                continue
869
            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.
870
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
871
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
872
    def _get_components_positions(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
873
        """Produce a map of position data for the components of versions.
874
1756.3.22 by Aaron Bentley
Tweaks from review
875
        This data is intended to be used for retrieving the knit records.
1756.3.19 by Aaron Bentley
Documentation and cleanups
876
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
877
        A dict of version_id to (method, index_memo, next) is
1756.3.19 by Aaron Bentley
Documentation and cleanups
878
        returned.
879
        method is the way referenced data should be applied.
880
        data_pos is the position of the data in the knit.
881
        data_size is the size of the data in the knit.
882
        next is the build-parent of the version, or None for fulltexts.
883
        """
1756.3.9 by Aaron Bentley
More optimization refactoring
884
        component_data = {}
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
885
        pending_components = version_ids
886
        while pending_components:
887
            build_details = self._index.get_build_details(pending_components)
888
            pending_components = set()
889
            for version_id, details in build_details.items():
890
                method, index_memo, compression_parent = details
891
                if compression_parent is not None:
892
                    pending_components.add(compression_parent)
893
                component_data[version_id] = details
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
894
        return component_data
1756.3.18 by Aaron Bentley
More cleanup
895
       
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
896
    def _get_content(self, version_id, parent_texts={}):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
897
        """Returns a content object that makes up the specified
898
        version."""
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
899
        cached_version = parent_texts.get(version_id, None)
900
        if cached_version is not None:
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
901
            if not self.has_version(version_id):
902
                raise RevisionNotPresent(version_id, self.filename)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
903
            return cached_version
904
1756.3.22 by Aaron Bentley
Tweaks from review
905
        text_map, contents_map = self._get_content_maps([version_id])
906
        return contents_map[version_id]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
907
908
    def _check_versions_present(self, version_ids):
909
        """Check that all specified versions are present."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
910
        self._index.check_versions_present(version_ids)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
911
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
912
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
913
        nostore_sha, random_id, check_content):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
914
        """See VersionedFile.add_lines_with_ghosts()."""
2805.6.7 by Robert Collins
Review feedback.
915
        self._check_add(version_id, lines, random_id, check_content)
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
916
        return self._add(version_id, lines, parents, self.delta,
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
917
            parent_texts, None, nostore_sha, random_id)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
918
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
919
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
920
        left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
921
        """See VersionedFile.add_lines."""
2805.6.7 by Robert Collins
Review feedback.
922
        self._check_add(version_id, lines, random_id, check_content)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
923
        self._check_versions_present(parents)
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
924
        return self._add(version_id, lines[:], parents, self.delta,
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
925
            parent_texts, left_matching_blocks, nostore_sha, random_id)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
926
2805.6.7 by Robert Collins
Review feedback.
927
    def _check_add(self, version_id, lines, random_id, check_content):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
928
        """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.
929
        if contains_whitespace(version_id):
1668.5.1 by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required
930
            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
931
        self.check_not_reserved_id(version_id)
2805.6.4 by Robert Collins
Don't check for existing versions when adding texts with random revision ids.
932
        # Technically this could be avoided if we are happy to allow duplicate
933
        # id insertion when other things than bzr core insert texts, but it
934
        # seems useful for folk using the knit api directly to have some safety
935
        # blanket that we can disable.
936
        if not random_id and self.has_version(version_id):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
937
            raise RevisionAlreadyPresent(version_id, self.filename)
2805.6.7 by Robert Collins
Review feedback.
938
        if check_content:
939
            self._check_lines_not_unicode(lines)
940
            self._check_lines_are_lines(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
941
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
942
    def _add(self, version_id, lines, parents, delta, parent_texts,
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
943
        left_matching_blocks, nostore_sha, random_id):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
944
        """Add a set of lines on top of version specified by parents.
945
946
        If delta is true, compress the text as a line-delta against
947
        the first parent.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
948
949
        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.
950
        """
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
951
        # first thing, if the content is something we don't need to store, find
952
        # that out.
953
        line_bytes = ''.join(lines)
954
        digest = sha_string(line_bytes)
955
        if nostore_sha == digest:
956
            raise errors.ExistingContent
1596.2.28 by Robert Collins
more knit profile based tuning.
957
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
958
        present_parents = []
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
959
        if parent_texts is None:
960
            parent_texts = {}
1594.2.8 by Robert Collins
add ghost aware apis to knits.
961
        for parent in parents:
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
962
            if self.has_version(parent):
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
963
                present_parents.append(parent)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
964
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
965
        # can only compress against the left most present parent.
966
        if (delta and
967
            (len(present_parents) == 0 or
968
             present_parents[0] != parents[0])):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
969
            delta = False
970
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
971
        text_length = len(line_bytes)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
972
        options = []
973
        if lines:
974
            if lines[-1][-1] != '\n':
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
975
                # copy the contents of lines.
976
                lines = lines[:]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
977
                options.append('no-eol')
978
                lines[-1] = lines[-1] + '\n'
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
979
                line_bytes += '\n'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
980
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
981
        if delta:
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
982
            # To speed the extract of texts the delta chain is limited
983
            # to a fixed number of deltas.  This should minimize both
984
            # 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
985
            delta = self._check_should_delta(present_parents)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
986
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
987
        assert isinstance(version_id, str)
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
988
        content = 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.
989
        if delta or (self.factory.annotated and len(present_parents) > 0):
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
990
            # Merge annotations from parent texts if needed.
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
991
            delta_hunks = self._merge_annotations(content, present_parents,
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
992
                parent_texts, delta, self.factory.annotated,
993
                left_matching_blocks)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
994
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
995
        if delta:
996
            options.append('line-delta')
997
            store_lines = self.factory.lower_line_delta(delta_hunks)
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
998
            size, bytes = self._data._record_to_data(version_id, digest,
999
                store_lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1000
        else:
1001
            options.append('fulltext')
2888.1.3 by Robert Collins
Review feedback.
1002
            # isinstance is slower and we have no hierarchy.
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
1003
            if self.factory.__class__ == KnitPlainFactory:
2888.1.3 by Robert Collins
Review feedback.
1004
                # Use the already joined bytes saving iteration time in
1005
                # _record_to_data.
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
1006
                size, bytes = self._data._record_to_data(version_id, digest,
1007
                    lines, [line_bytes])
1008
            else:
1009
                # get mixed annotation + content and feed it into the
1010
                # serialiser.
1011
                store_lines = self.factory.lower_fulltext(content)
1012
                size, bytes = self._data._record_to_data(version_id, digest,
1013
                    store_lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1014
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1015
        access_memo = self._data.add_raw_records([size], bytes)[0]
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1016
        self._index.add_versions(
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1017
            ((version_id, options, access_memo, parents),),
1018
            random_id=random_id)
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1019
        return digest, text_length, content
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1020
1563.2.19 by Robert Collins
stub out a check for knits.
1021
    def check(self, progress_bar=None):
1022
        """See VersionedFile.check()."""
1023
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1024
    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.
1025
        """See VersionedFile.clone_text()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1026
        # FIXME RBC 20060228 make fast by only inserting an index with null 
1027
        # delta.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1028
        self.add_lines(new_version_id, parents, self.get_lines(old_version_id))
1029
1030
    def get_lines(self, version_id):
1031
        """See VersionedFile.get_lines()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1032
        return self.get_line_list([version_id])[0]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1033
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1034
    def _get_record_map(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1035
        """Produce a dictionary of knit records.
1036
        
1037
        The keys are version_ids, the values are tuples of (method, content,
1038
        digest, next).
1039
        method is the way the content should be applied.  
1040
        content is a KnitContent object.
1041
        digest is the SHA1 digest of this version id after all steps are done
1042
        next is the build-parent of the version, i.e. the leftmost ancestor.
1043
        If the method is fulltext, next will be None.
1044
        """
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1045
        position_map = self._get_components_positions(version_ids)
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1046
        # c = component_id, m = method, i_m = index_memo, n = next
1047
        records = [(c, i_m) for c, (m, i_m, n) in position_map.iteritems()]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1048
        record_map = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1049
        for component_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
1050
                self._data.read_records_iter(records):
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1051
            method, index_memo, next = position_map[component_id]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1052
            record_map[component_id] = method, content, digest, next
1053
                          
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1054
        return record_map
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
1055
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
1056
    def get_text(self, version_id):
1057
        """See VersionedFile.get_text"""
1058
        return self.get_texts([version_id])[0]
1059
1756.2.1 by Aaron Bentley
Implement get_texts
1060
    def get_texts(self, version_ids):
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1061
        return [''.join(l) for l in self.get_line_list(version_ids)]
1062
1063
    def get_line_list(self, version_ids):
1756.2.1 by Aaron Bentley
Implement get_texts
1064
        """Return the texts of listed versions as a list of strings."""
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
1065
        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
1066
            self.check_not_reserved_id(version_id)
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
1067
        text_map, content_map = self._get_content_maps(version_ids)
1068
        return [text_map[v] for v in version_ids]
1069
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
1070
    _get_lf_split_line_list = get_line_list
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
1071
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
1072
    def _get_content_maps(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1073
        """Produce maps of text and KnitContents
1074
        
1075
        :return: (text_map, content_map) where text_map contains the texts for
1076
        the requested versions and content_map contains the KnitContents.
1756.3.22 by Aaron Bentley
Tweaks from review
1077
        Both dicts take version_ids as their keys.
1756.3.19 by Aaron Bentley
Documentation and cleanups
1078
        """
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1079
        # FUTURE: This function could be improved for the 'extract many' case
1080
        # by tracking each component and only doing the copy when the number of
1081
        # children than need to apply delta's to it is > 1 or it is part of the
1082
        # final output.
1083
        version_ids = list(version_ids)
1084
        multiple_versions = len(version_ids) != 1
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1085
        record_map = self._get_record_map(version_ids)
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
1086
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1087
        text_map = {}
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
1088
        content_map = {}
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
1089
        final_content = {}
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1090
        for version_id in version_ids:
1091
            components = []
1092
            cursor = version_id
1093
            while cursor is not None:
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1094
                method, data, digest, next = record_map[cursor]
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1095
                components.append((cursor, method, data, digest))
1096
                if cursor in content_map:
1097
                    break
1098
                cursor = next
1099
1756.2.1 by Aaron Bentley
Implement get_texts
1100
            content = None
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
1101
            for component_id, method, data, digest in reversed(components):
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
1102
                if component_id in content_map:
1103
                    content = content_map[component_id]
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
1104
                else:
1105
                    if method == 'fulltext':
1106
                        assert content is None
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
1107
                        content = self.factory.parse_fulltext(data, version_id)
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
1108
                    elif method == 'line-delta':
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
1109
                        delta = self.factory.parse_line_delta(data, version_id)
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1110
                        if multiple_versions:
1111
                            # only doing this when we want multiple versions
1112
                            # output avoids list copies - which reference and
1113
                            # dereference many strings.
1114
                            content = content.copy()
1115
                        content.apply_delta(delta, version_id)
1116
                    if multiple_versions:
1117
                        content_map[component_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
1118
1119
            if 'no-eol' in self._index.get_options(version_id):
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1120
                if multiple_versions:
1121
                    content = content.copy()
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1122
                content.strip_last_line_newline()
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
1123
            final_content[version_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
1124
1125
            # digest here is the digest from the last applied component.
1756.3.6 by Aaron Bentley
More multi-text extraction
1126
            text = content.text()
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
1127
            actual_sha = sha_strings(text)
1128
            if actual_sha != digest:
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1129
                raise KnitCorrupt(self.filename,
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
1130
                    '\n  sha-1 %s'
1131
                    '\n  of reconstructed text does not match'
1132
                    '\n  expected %s'
1133
                    '\n  for version %s' %
1134
                    (actual_sha, digest, version_id))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1135
            text_map[version_id] = text
1136
        return text_map, final_content
1756.2.1 by Aaron Bentley
Implement get_texts
1137
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1138
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
1139
                                                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.
1140
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
1141
        if version_ids is None:
1142
            version_ids = self.versions()
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1143
        if pb is None:
1144
            pb = progress.DummyProgress()
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1145
        # 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.
1146
        # but we need to setup a list of records to visit.
1147
        # we need version_id, position, length
1148
        version_id_records = []
2163.1.1 by John Arbash Meinel
Use a set to make iter_lines_added_or_present *much* faster
1149
        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.
1150
        # filter for available versions
2698.2.4 by Robert Collins
Remove full history scan during iter_lines_added_or_present in KnitVersionedFile.
1151
        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.
1152
            if not self.has_version(version_id):
1153
                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.
1154
        # get a in-component-order queue:
1155
        for version_id in self.versions():
1156
            if version_id in requested_versions:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1157
                index_memo = self._index.get_position(version_id)
1158
                version_id_records.append((version_id, index_memo))
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.
1159
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1160
        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.
1161
        for version_idx, (version_id, data, sha_value) in \
1162
            enumerate(self._data.read_records_iter(version_id_records)):
1163
            pb.update('Walking content.', version_idx, total)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1164
            method = self._index.get_method(version_id)
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1165
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1166
            assert method in ('fulltext', 'line-delta')
1167
            if method == 'fulltext':
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1168
                line_iterator = self.factory.get_fulltext_content(data)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1169
            else:
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1170
                line_iterator = self.factory.get_linedelta_content(data)
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1171
            # XXX: It might be more efficient to yield (version_id,
1172
            # line_iterator) in the future. However for now, this is a simpler
1173
            # change to integrate into the rest of the codebase. RBC 20071110
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1174
            for line in line_iterator:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1175
                yield line, version_id
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1176
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1177
        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.
1178
        
2592.3.43 by Robert Collins
A knit iter_parents API.
1179
    def iter_parents(self, version_ids):
1180
        """Iterate through the parents for many version ids.
1181
1182
        :param version_ids: An iterable yielding version_ids.
1183
        :return: An iterator that yields (version_id, parents). Requested 
1184
            version_ids not present in the versioned file are simply skipped.
1185
            The order is undefined, allowing for different optimisations in
1186
            the underlying implementation.
1187
        """
1188
        return self._index.iter_parents(version_ids)
1189
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1190
    def num_versions(self):
1191
        """See VersionedFile.num_versions()."""
1192
        return self._index.num_versions()
1193
1194
    __len__ = num_versions
1195
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1196
    def annotate_iter(self, version_id):
1197
        """See VersionedFile.annotate_iter."""
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
1198
        return self.factory.annotate_iter(self, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1199
1200
    def get_parents(self, version_id):
1201
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
1202
        # perf notes:
1203
        # optimism counts!
1204
        # 52554 calls in 1264 872 internal down from 3674
1205
        try:
1206
            return self._index.get_parents(version_id)
1207
        except KeyError:
1208
            raise RevisionNotPresent(version_id, self.filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1209
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1210
    def get_parents_with_ghosts(self, version_id):
1211
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
1212
        try:
1213
            return self._index.get_parents_with_ghosts(version_id)
1214
        except KeyError:
1215
            raise RevisionNotPresent(version_id, self.filename)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1216
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1217
    def get_ancestry(self, versions, topo_sorted=True):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1218
        """See VersionedFile.get_ancestry."""
1219
        if isinstance(versions, basestring):
1220
            versions = [versions]
1221
        if not versions:
1222
            return []
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1223
        return self._index.get_ancestry(versions, topo_sorted)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1224
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1225
    def get_ancestry_with_ghosts(self, versions):
1226
        """See VersionedFile.get_ancestry_with_ghosts."""
1227
        if isinstance(versions, basestring):
1228
            versions = [versions]
1229
        if not versions:
1230
            return []
1231
        return self._index.get_ancestry_with_ghosts(versions)
1232
1664.2.3 by Aaron Bentley
Add failing test case
1233
    def plan_merge(self, ver_a, ver_b):
1664.2.11 by Aaron Bentley
Clarifications from merge review
1234
        """See VersionedFile.plan_merge."""
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
1235
        ancestors_b = set(self.get_ancestry(ver_b, topo_sorted=False))
1236
        ancestors_a = set(self.get_ancestry(ver_a, topo_sorted=False))
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
1237
        annotated_a = self.annotate(ver_a)
1238
        annotated_b = self.annotate(ver_b)
1551.15.46 by Aaron Bentley
Move plan merge to tree
1239
        return merge._plan_annotate_merge(annotated_a, annotated_b,
1240
                                          ancestors_a, ancestors_b)
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
1241
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1242
1243
class _KnitComponentFile(object):
1244
    """One of the files used to implement a knit database"""
1245
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
1246
    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
1247
                 create_parent_dir=False, dir_mode=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1248
        self._transport = transport
1249
        self._filename = filename
1250
        self._mode = mode
1946.2.3 by John Arbash Meinel
Pass around the file mode correctly
1251
        self._file_mode = file_mode
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1252
        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
1253
        self._create_parent_dir = create_parent_dir
1254
        self._need_to_create = False
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1255
2196.2.5 by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it
1256
    def _full_path(self):
1257
        """Return the full path to this file."""
1258
        return self._transport.base + self._filename
1259
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1260
    def check_header(self, fp):
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1261
        line = fp.readline()
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
1262
        if line == '':
1263
            # An empty file can actually be treated as though the file doesn't
1264
            # 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
1265
            raise errors.NoSuchFile(self._full_path())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1266
        if line != self.HEADER:
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
1267
            raise KnitHeaderError(badline=line,
1268
                              filename=self._transport.abspath(self._filename))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1269
1270
    def __repr__(self):
1271
        return '%s(%s)' % (self.__class__.__name__, self._filename)
1272
1273
1274
class _KnitIndex(_KnitComponentFile):
1275
    """Manages knit index file.
1276
1277
    The index is already kept in memory and read on startup, to enable
1278
    fast lookups of revision information.  The cursor of the index
1279
    file is always pointing to the end, making it easy to append
1280
    entries.
1281
1282
    _cache is a cache for fast mapping from version id to a Index
1283
    object.
1284
1285
    _history is a cache for fast mapping from indexes to version ids.
1286
1287
    The index data format is dictionary compressed when it comes to
1288
    parent references; a index entry may only have parents that with a
1289
    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.
1290
1291
    Duplicate entries may be written to the index for a single version id
1292
    if this is done then the latter one completely replaces the former:
1293
    this allows updates to correct version and parent information. 
1294
    Note that the two entries may share the delta, and that successive
1295
    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.
1296
1297
    The index file on disc contains a header, followed by one line per knit
1298
    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).
1299
    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.
1300
    
1301
    The format of a single line is
1302
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1303
    REVISION_ID is a utf8-encoded revision id
1304
    FLAGS is a comma separated list of flags about the record. Values include 
1305
        no-eol, line-delta, fulltext.
1306
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1307
        that the the compressed data starts at.
1308
    LENGTH is the ascii representation of the length of the data file.
1309
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1310
        REVISION_ID.
1311
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1312
        revision id already in the knit that is a parent of REVISION_ID.
1313
    The ' :' marker is the end of record marker.
1314
    
1315
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1316
    when a write is interrupted to the index file, it will result in a line
1317
    that does not end in ' :'. If the ' :' is not present at the end of a line,
1318
    or at the end of the file, then the record that is missing it will be
1319
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1320
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1321
    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.
1322
    to ensure that records always start on new lines even if the last write was
1323
    interrupted. As a result its normal for the last line in the index to be
1324
    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.
1325
    """
1326
1666.1.6 by Robert Collins
Make knit the default format.
1327
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1328
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1329
    # speed of knit parsing went from 280 ms to 280 ms with slots addition.
1330
    # __slots__ = ['_cache', '_history', '_transport', '_filename']
1331
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1332
    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.
1333
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1334
1335
        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.
1336
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1337
         indexes).
1338
        """
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1339
        # only want the _history index to reference the 1st index entry
1340
        # for version_id
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1341
        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
1342
            index = len(self._history)
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1343
            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
1344
        else:
1345
            index = self._cache[version_id][5]
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1346
        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
1347
                                   options,
1348
                                   pos,
1349
                                   size,
1350
                                   parents,
1351
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1352
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1353
    def __init__(self, transport, filename, mode, create=False, file_mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1354
                 create_parent_dir=False, delay_create=False, dir_mode=None):
1355
        _KnitComponentFile.__init__(self, transport, filename, mode,
1356
                                    file_mode=file_mode,
1357
                                    create_parent_dir=create_parent_dir,
1358
                                    dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1359
        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.
1360
        # position in _history is the 'official' index for a revision
1361
        # but the values may have come from a newer entry.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1362
        # 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
1363
        # in the knit.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1364
        self._history = []
1365
        try:
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1366
            fp = self._transport.get(self._filename)
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1367
            try:
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1368
                # _load_data may raise NoSuchFile if the target knit is
1369
                # completely empty.
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1370
                _load_data(self, fp)
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1371
            finally:
1372
                fp.close()
1373
        except NoSuchFile:
1374
            if mode != 'w' or not create:
1375
                raise
1376
            elif delay_create:
1377
                self._need_to_create = True
1378
            else:
1379
                self._transport.put_bytes_non_atomic(
1380
                    self._filename, self.HEADER, mode=self._file_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1381
1382
    def get_graph(self):
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1383
        """Return a list of the node:parents lists from this knit index."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1384
        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.
1385
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1386
    def get_ancestry(self, versions, topo_sorted=True):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1387
        """See VersionedFile.get_ancestry."""
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1388
        # get a graph of all the mentioned versions:
1389
        graph = {}
1390
        pending = set(versions)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1391
        cache = self._cache
1392
        while pending:
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1393
            version = pending.pop()
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1394
            # trim ghosts
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1395
            try:
1396
                parents = [p for p in cache[version][4] if p in cache]
1397
            except KeyError:
1398
                raise RevisionNotPresent(version, self._filename)
1399
            # if not completed and not a ghost
1400
            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.
1401
            graph[version] = parents
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1402
        if not topo_sorted:
1403
            return graph.keys()
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1404
        return topo_sort(graph.items())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1405
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1406
    def get_ancestry_with_ghosts(self, versions):
1407
        """See VersionedFile.get_ancestry_with_ghosts."""
1408
        # get a graph of all the mentioned versions:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1409
        self.check_versions_present(versions)
1410
        cache = self._cache
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1411
        graph = {}
1412
        pending = set(versions)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1413
        while pending:
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1414
            version = pending.pop()
1415
            try:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1416
                parents = cache[version][4]
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1417
            except KeyError:
1418
                # ghost, fake it
1419
                graph[version] = []
1420
            else:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1421
                # if not completed
1422
                pending.update([p for p in parents if p not in graph])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1423
                graph[version] = parents
1424
        return topo_sort(graph.items())
1425
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1426
    def get_build_details(self, version_ids):
1427
        """Get the method, index_memo and compression parent for version_ids.
1428
1429
        :param version_ids: An iterable of version_ids.
1430
        :return: A dict of version_id:(method, index_memo, compression_parent).
1431
        """
1432
        result = {}
1433
        for version_id in version_ids:
1434
            method = self.get_method(version_id)
1435
            if method == 'fulltext':
1436
                compression_parent = None
1437
            else:
1438
                compression_parent = self.get_parents_with_ghosts(version_id)[0]
1439
            index_memo = self.get_position(version_id)
1440
            result[version_id] = (method, index_memo, compression_parent)
1441
        return result
1442
2592.3.43 by Robert Collins
A knit iter_parents API.
1443
    def iter_parents(self, version_ids):
1444
        """Iterate through the parents for many version ids.
1445
1446
        :param version_ids: An iterable yielding version_ids.
1447
        :return: An iterator that yields (version_id, parents). Requested 
1448
            version_ids not present in the versioned file are simply skipped.
1449
            The order is undefined, allowing for different optimisations in
1450
            the underlying implementation.
1451
        """
1452
        for version_id in version_ids:
1453
            try:
1454
                yield version_id, tuple(self.get_parents(version_id))
1455
            except KeyError:
1456
                pass
1457
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1458
    def num_versions(self):
1459
        return len(self._history)
1460
1461
    __len__ = num_versions
1462
1463
    def get_versions(self):
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1464
        """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.
1465
        return self._history
1466
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1467
    def _version_list_to_index(self, versions):
1468
        result_list = []
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1469
        cache = self._cache
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1470
        for version in versions:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1471
            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
1472
                # -- inlined lookup() --
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1473
                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
1474
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1475
            else:
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
1476
                result_list.append('.' + version)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1477
        return ' '.join(result_list)
1478
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1479
    def add_version(self, version_id, options, index_memo, parents):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1480
        """Add a version record to the index."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1481
        self.add_versions(((version_id, options, index_memo, parents),))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1482
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1483
    def add_versions(self, versions, random_id=False):
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1484
        """Add multiple versions to the index.
1485
        
1486
        :param versions: a list of tuples:
1487
                         (version_id, options, pos, size, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1488
        :param random_id: If True the ids being added were randomly generated
1489
            and no check for existence will be performed.
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1490
        """
1491
        lines = []
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1492
        orig_history = self._history[:]
1493
        orig_cache = self._cache.copy()
1494
1495
        try:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1496
            for version_id, options, (index, pos, size), parents in versions:
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
1497
                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
1498
                                               ','.join(options),
1499
                                               pos,
1500
                                               size,
1501
                                               self._version_list_to_index(parents))
1502
                assert isinstance(line, str), \
1503
                    'content must be utf-8 encoded: %r' % (line,)
1504
                lines.append(line)
1505
                self._cache_version(version_id, options, pos, size, parents)
1506
            if not self._need_to_create:
1507
                self._transport.append_bytes(self._filename, ''.join(lines))
1508
            else:
1509
                sio = StringIO()
1510
                sio.write(self.HEADER)
1511
                sio.writelines(lines)
1512
                sio.seek(0)
1513
                self._transport.put_file_non_atomic(self._filename, sio,
1514
                                    create_parent_dir=self._create_parent_dir,
1515
                                    mode=self._file_mode,
1516
                                    dir_mode=self._dir_mode)
1517
                self._need_to_create = False
1518
        except:
1519
            # If any problems happen, restore the original values and re-raise
1520
            self._history = orig_history
1521
            self._cache = orig_cache
1522
            raise
1523
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1524
    def has_version(self, version_id):
1525
        """True if the version is in the index."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1526
        return version_id in self._cache
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1527
1528
    def get_position(self, version_id):
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1529
        """Return details needed to access the version.
1530
        
1531
        .kndx indices do not support split-out data, so return None for the 
1532
        index field.
1533
1534
        :return: a tuple (None, data position, size) to hand to the access
1535
            logic to get the record.
1536
        """
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1537
        entry = self._cache[version_id]
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1538
        return None, entry[2], entry[3]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1539
1540
    def get_method(self, version_id):
1541
        """Return compression method of specified version."""
2592.3.97 by Robert Collins
Merge more bzr.dev, addressing some bugs. [still broken]
1542
        try:
1543
            options = self._cache[version_id][1]
1544
        except KeyError:
1545
            raise RevisionNotPresent(version_id, self._filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1546
        if 'fulltext' in options:
1547
            return 'fulltext'
1548
        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
1549
            if 'line-delta' not in options:
1550
                raise errors.KnitIndexUnknownMethod(self._full_path(), options)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1551
            return 'line-delta'
1552
1553
    def get_options(self, version_id):
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
1554
        """Return a list representing options.
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1555
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1556
        e.g. ['foo', 'bar']
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1557
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1558
        return self._cache[version_id][1]
1559
1560
    def get_parents(self, version_id):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1561
        """Return parents of specified version ignoring ghosts."""
1562
        return [parent for parent in self._cache[version_id][4] 
1563
                if parent in self._cache]
1564
1565
    def get_parents_with_ghosts(self, version_id):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1566
        """Return parents of specified version with ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1567
        return self._cache[version_id][4] 
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1568
1569
    def check_versions_present(self, version_ids):
1570
        """Check that all specified versions are present."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1571
        cache = self._cache
1572
        for version_id in version_ids:
1573
            if version_id not in cache:
1574
                raise RevisionNotPresent(version_id, self._filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1575
1576
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1577
class KnitGraphIndex(object):
1578
    """A knit index that builds on GraphIndex."""
1579
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1580
    def __init__(self, graph_index, deltas=False, parents=True, add_callback=None):
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1581
        """Construct a KnitGraphIndex on a graph_index.
1582
1583
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1584
        :param deltas: Allow delta-compressed records.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1585
        :param add_callback: If not None, allow additions to the index and call
1586
            this callback with a list of added GraphIndex nodes:
2592.3.33 by Robert Collins
Change the order of index refs and values to make the no-graph knit index easier.
1587
            [(node, value, node_refs), ...]
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1588
        :param parents: If True, record knits parents, if not do not record 
1589
            parents.
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1590
        """
1591
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1592
        self._deltas = deltas
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1593
        self._add_callback = add_callback
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1594
        self._parents = parents
1595
        if deltas and not parents:
1596
            raise KnitCorrupt(self, "Cannot do delta compression without "
1597
                "parent tracking.")
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1598
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1599
    def _get_entries(self, keys, check_present=False):
1600
        """Get the entries for keys.
1601
        
1602
        :param keys: An iterable of index keys, - 1-tuples.
1603
        """
1604
        keys = set(keys)
2592.3.43 by Robert Collins
A knit iter_parents API.
1605
        found_keys = set()
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1606
        if self._parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1607
            for node in self._graph_index.iter_entries(keys):
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1608
                yield node
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1609
                found_keys.add(node[1])
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1610
        else:
1611
            # 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.
1612
            for node in self._graph_index.iter_entries(keys):
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1613
                yield node[0], node[1], node[2], ()
1614
                found_keys.add(node[1])
2592.3.43 by Robert Collins
A knit iter_parents API.
1615
        if check_present:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1616
            missing_keys = keys.difference(found_keys)
2592.3.43 by Robert Collins
A knit iter_parents API.
1617
            if missing_keys:
1618
                raise RevisionNotPresent(missing_keys.pop(), self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1619
1620
    def _present_keys(self, version_ids):
1621
        return set([
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1622
            node[1] for node in self._get_entries(version_ids)])
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1623
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1624
    def _parentless_ancestry(self, versions):
1625
        """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.
1626
        wanted_keys = self._version_ids_to_keys(versions)
1627
        present_keys = self._present_keys(wanted_keys)
1628
        missing = set(wanted_keys).difference(present_keys)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1629
        if missing:
1630
            raise RevisionNotPresent(missing.pop(), self)
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1631
        return list(self._keys_to_version_ids(present_keys))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1632
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1633
    def get_ancestry(self, versions, topo_sorted=True):
1634
        """See VersionedFile.get_ancestry."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1635
        if not self._parents:
1636
            return self._parentless_ancestry(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1637
        # XXX: This will do len(history) index calls - perhaps
1638
        # it should be altered to be a index core feature?
1639
        # get a graph of all the mentioned versions:
1640
        graph = {}
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1641
        ghosts = set()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1642
        versions = self._version_ids_to_keys(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1643
        pending = set(versions)
1644
        while pending:
1645
            # get all pending nodes
1646
            this_iteration = pending
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1647
            new_nodes = self._get_entries(this_iteration)
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1648
            found = set()
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1649
            pending = set()
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1650
            for (index, key, value, node_refs) in new_nodes:
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1651
                # dont ask for ghosties - otherwise
1652
                # we we can end up looping with pending
1653
                # being entirely ghosted.
1654
                graph[key] = [parent for parent in node_refs[0]
1655
                    if parent not in ghosts]
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1656
                # queue parents
1657
                for parent in graph[key]:
1658
                    # dont examine known nodes again
1659
                    if parent in graph:
1660
                        continue
1661
                    pending.add(parent)
1662
                found.add(key)
1663
            ghosts.update(this_iteration.difference(found))
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1664
        if versions.difference(graph):
1665
            raise RevisionNotPresent(versions.difference(graph).pop(), self)
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1666
        if topo_sorted:
1667
            result_keys = topo_sort(graph.items())
1668
        else:
1669
            result_keys = graph.iterkeys()
1670
        return [key[0] for key in result_keys]
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1671
1672
    def get_ancestry_with_ghosts(self, versions):
1673
        """See VersionedFile.get_ancestry."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1674
        if not self._parents:
1675
            return self._parentless_ancestry(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1676
        # XXX: This will do len(history) index calls - perhaps
1677
        # it should be altered to be a index core feature?
1678
        # get a graph of all the mentioned versions:
1679
        graph = {}
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1680
        versions = self._version_ids_to_keys(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1681
        pending = set(versions)
1682
        while pending:
1683
            # get all pending nodes
1684
            this_iteration = pending
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1685
            new_nodes = self._get_entries(this_iteration)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1686
            pending = set()
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1687
            for (index, key, value, node_refs) in new_nodes:
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1688
                graph[key] = node_refs[0]
1689
                # queue parents 
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1690
                for parent in graph[key]:
1691
                    # dont examine known nodes again
1692
                    if parent in graph:
1693
                        continue
1694
                    pending.add(parent)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1695
            missing_versions = this_iteration.difference(graph)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1696
            missing_needed = versions.intersection(missing_versions)
1697
            if missing_needed:
1698
                raise RevisionNotPresent(missing_needed.pop(), self)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1699
            for missing_version in missing_versions:
1700
                # add a key, no parents
1701
                graph[missing_version] = []
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1702
                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.
1703
        result_keys = topo_sort(graph.items())
1704
        return [key[0] for key in result_keys]
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1705
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1706
    def get_build_details(self, version_ids):
1707
        """Get the method, index_memo and compression parent for version_ids.
1708
1709
        :param version_ids: An iterable of version_ids.
1710
        :return: A dict of version_id:(method, index_memo, compression_parent).
1711
        """
1712
        result = {}
1713
        entries = self._get_entries(self._version_ids_to_keys(version_ids), True)
1714
        for entry in entries:
1715
            version_id = self._keys_to_version_ids((entry[1],))[0]
1716
            if not self._deltas:
1717
                compression_parent = None
1718
            else:
1719
                compression_parent_key = self._compression_parent(entry)
1720
                if compression_parent_key:
1721
                    compression_parent = self._keys_to_version_ids(
1722
                    (compression_parent_key,))[0]
1723
                else:
1724
                    compression_parent = None
1725
            if compression_parent:
1726
                method = 'line-delta'
1727
            else:
1728
                method = 'fulltext'
1729
            result[version_id] = (method, self._node_to_position(entry),
1730
                compression_parent)
1731
        return result
1732
1733
    def _compression_parent(self, an_entry):
1734
        # return the key that an_entry is compressed against, or None
1735
        # Grab the second parent list (as deltas implies parents currently)
1736
        compression_parents = an_entry[3][1]
1737
        if not compression_parents:
1738
            return None
1739
        assert len(compression_parents) == 1
1740
        return compression_parents[0]
1741
1742
    def _get_method(self, node):
1743
        if not self._deltas:
1744
            return 'fulltext'
1745
        if self._compression_parent(node):
1746
            return 'line-delta'
1747
        else:
1748
            return 'fulltext'
1749
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1750
    def get_graph(self):
1751
        """Return a list of the node:parents lists from this knit index."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1752
        if not self._parents:
1753
            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.
1754
        result = []
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1755
        for index, key, value, refs in self._graph_index.iter_all_entries():
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1756
            result.append((key[0], tuple([ref[0] for ref in refs[0]])))
1757
        return result
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1758
2592.3.43 by Robert Collins
A knit iter_parents API.
1759
    def iter_parents(self, version_ids):
1760
        """Iterate through the parents for many version ids.
1761
1762
        :param version_ids: An iterable yielding version_ids.
1763
        :return: An iterator that yields (version_id, parents). Requested 
1764
            version_ids not present in the versioned file are simply skipped.
1765
            The order is undefined, allowing for different optimisations in
1766
            the underlying implementation.
1767
        """
1768
        if self._parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1769
            all_nodes = set(self._get_entries(self._version_ids_to_keys(version_ids)))
2592.3.43 by Robert Collins
A knit iter_parents API.
1770
            all_parents = set()
1771
            present_parents = set()
1772
            for node in all_nodes:
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1773
                all_parents.update(node[3][0])
2592.3.43 by Robert Collins
A knit iter_parents API.
1774
                # any node we are querying must be present
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1775
                present_parents.add(node[1])
2592.3.43 by Robert Collins
A knit iter_parents API.
1776
            unknown_parents = all_parents.difference(present_parents)
1777
            present_parents.update(self._present_keys(unknown_parents))
1778
            for node in all_nodes:
1779
                parents = []
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1780
                for parent in node[3][0]:
2592.3.43 by Robert Collins
A knit iter_parents API.
1781
                    if parent in present_parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1782
                        parents.append(parent[0])
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1783
                yield node[1][0], tuple(parents)
2592.3.43 by Robert Collins
A knit iter_parents API.
1784
        else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1785
            for node in self._get_entries(self._version_ids_to_keys(version_ids)):
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1786
                yield node[1][0], ()
2592.3.43 by Robert Collins
A knit iter_parents API.
1787
2592.3.5 by Robert Collins
Implement KnitGraphIndex.num_versions.
1788
    def num_versions(self):
1789
        return len(list(self._graph_index.iter_all_entries()))
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1790
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1791
    __len__ = num_versions
1792
1793
    def get_versions(self):
1794
        """Get all the versions in the file. not topologically sorted."""
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1795
        return [node[1][0] for node in self._graph_index.iter_all_entries()]
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1796
    
2592.3.9 by Robert Collins
Implement KnitGraphIndex.has_version.
1797
    def has_version(self, version_id):
1798
        """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.
1799
        return len(self._present_keys(self._version_ids_to_keys([version_id]))) == 1
1800
1801
    def _keys_to_version_ids(self, keys):
1802
        return tuple(key[0] for key in keys)
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1803
2592.3.10 by Robert Collins
Implement KnitGraphIndex.get_position.
1804
    def get_position(self, version_id):
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1805
        """Return details needed to access the version.
1806
        
1807
        :return: a tuple (index, data position, size) to hand to the access
1808
            logic to get the record.
1809
        """
1810
        node = self._get_node(version_id)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1811
        return self._node_to_position(node)
1812
1813
    def _node_to_position(self, node):
1814
        """Convert an index value to position details."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1815
        bits = node[2][1:].split(' ')
1816
        return node[0], int(bits[0]), int(bits[1])
2592.3.10 by Robert Collins
Implement KnitGraphIndex.get_position.
1817
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1818
    def get_method(self, version_id):
1819
        """Return compression method of specified version."""
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1820
        return self._get_method(self._get_node(version_id))
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1821
1822
    def _get_node(self, version_id):
2592.3.97 by Robert Collins
Merge more bzr.dev, addressing some bugs. [still broken]
1823
        try:
1824
            return list(self._get_entries(self._version_ids_to_keys([version_id])))[0]
1825
        except IndexError:
1826
            raise RevisionNotPresent(version_id, self)
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1827
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1828
    def get_options(self, version_id):
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1829
        """Return a list representing options.
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1830
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1831
        e.g. ['foo', 'bar']
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1832
        """
1833
        node = self._get_node(version_id)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1834
        options = [self._get_method(node)]
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1835
        if node[2][0] == 'N':
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1836
            options.append('no-eol')
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
1837
        return options
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1838
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1839
    def get_parents(self, version_id):
1840
        """Return parents of specified version ignoring ghosts."""
2592.3.43 by Robert Collins
A knit iter_parents API.
1841
        parents = list(self.iter_parents([version_id]))
1842
        if not parents:
1843
            # missing key
1844
            raise errors.RevisionNotPresent(version_id, self)
1845
        return parents[0][1]
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1846
1847
    def get_parents_with_ghosts(self, version_id):
1848
        """Return parents of specified version with ghosts."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1849
        nodes = list(self._get_entries(self._version_ids_to_keys([version_id]),
1850
            check_present=True))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1851
        if not self._parents:
1852
            return ()
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1853
        return self._keys_to_version_ids(nodes[0][3][0])
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1854
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1855
    def check_versions_present(self, version_ids):
1856
        """Check that all specified versions are present."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1857
        keys = self._version_ids_to_keys(version_ids)
1858
        present = self._present_keys(keys)
1859
        missing = keys.difference(present)
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1860
        if missing:
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1861
            raise RevisionNotPresent(missing.pop(), self)
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1862
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1863
    def add_version(self, version_id, options, access_memo, parents):
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1864
        """Add a version record to the index."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1865
        return self.add_versions(((version_id, options, access_memo, parents),))
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1866
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1867
    def add_versions(self, versions, random_id=False):
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1868
        """Add multiple versions to the index.
1869
        
1870
        This function does not insert data into the Immutable GraphIndex
1871
        backing the KnitGraphIndex, instead it prepares data for insertion by
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1872
        the caller and checks that it is safe to insert then calls
1873
        self._add_callback with the prepared GraphIndex nodes.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1874
1875
        :param versions: a list of tuples:
1876
                         (version_id, options, pos, size, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1877
        :param random_id: If True the ids being added were randomly generated
1878
            and no check for existence will be performed.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1879
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1880
        if not self._add_callback:
1881
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1882
        # we hope there are no repositories with inconsistent parentage
1883
        # anymore.
1884
        # check for dups
1885
1886
        keys = {}
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1887
        for (version_id, options, access_memo, parents) in versions:
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1888
            index, pos, size = access_memo
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1889
            key = (version_id, )
1890
            parents = tuple((parent, ) for parent in parents)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1891
            if 'no-eol' in options:
1892
                value = 'N'
1893
            else:
1894
                value = ' '
1895
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1896
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1897
                if 'line-delta' in options:
1898
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1899
            if self._parents:
1900
                if self._deltas:
1901
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1902
                        node_refs = (parents, (parents[0],))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1903
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1904
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1905
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1906
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1907
            else:
1908
                if parents:
1909
                    raise KnitCorrupt(self, "attempt to add node with parents "
1910
                        "in parentless index.")
1911
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1912
            keys[key] = (value, node_refs)
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1913
        if not random_id:
1914
            present_nodes = self._get_entries(keys)
1915
            for (index, key, value, node_refs) in present_nodes:
1916
                if (value, node_refs) != keys[key]:
1917
                    raise KnitCorrupt(self, "inconsistent details in add_versions"
1918
                        ": %s %s" % ((value, node_refs), keys[key]))
1919
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1920
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1921
        if self._parents:
1922
            for key, (value, node_refs) in keys.iteritems():
1923
                result.append((key, value, node_refs))
1924
        else:
1925
            for key, (value, node_refs) in keys.iteritems():
1926
                result.append((key, value))
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1927
        self._add_callback(result)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1928
        
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1929
    def _version_ids_to_keys(self, version_ids):
1930
        return set((version_id, ) for version_id in version_ids)
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1931
1932
1933
class _KnitAccess(object):
1934
    """Access to knit records in a .knit file."""
1935
1936
    def __init__(self, transport, filename, _file_mode, _dir_mode,
1937
        _need_to_create, _create_parent_dir):
1938
        """Create a _KnitAccess for accessing and inserting data.
1939
1940
        :param transport: The transport the .knit is located on.
1941
        :param filename: The filename of the .knit.
1942
        """
1943
        self._transport = transport
1944
        self._filename = filename
1945
        self._file_mode = _file_mode
1946
        self._dir_mode = _dir_mode
1947
        self._need_to_create = _need_to_create
1948
        self._create_parent_dir = _create_parent_dir
1949
1950
    def add_raw_records(self, sizes, raw_data):
1951
        """Add raw knit bytes to a storage area.
1952
1953
        The data is spooled to whereever the access method is storing data.
1954
1955
        :param sizes: An iterable containing the size of each raw data segment.
1956
        :param raw_data: A bytestring containing the data.
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1957
        :return: A list of memos to retrieve the record later. Each memo is a
1958
            tuple - (index, pos, length), where the index field is always None
1959
            for the .knit access method.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1960
        """
1961
        assert type(raw_data) == str, \
1962
            'data must be plain bytes was %s' % type(raw_data)
1963
        if not self._need_to_create:
1964
            base = self._transport.append_bytes(self._filename, raw_data)
1965
        else:
1966
            self._transport.put_bytes_non_atomic(self._filename, raw_data,
1967
                                   create_parent_dir=self._create_parent_dir,
1968
                                   mode=self._file_mode,
1969
                                   dir_mode=self._dir_mode)
1970
            self._need_to_create = False
1971
            base = 0
1972
        result = []
1973
        for size in sizes:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1974
            result.append((None, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1975
            base += size
1976
        return result
1977
1978
    def create(self):
1979
        """IFF this data access has its own storage area, initialise it.
1980
1981
        :return: None.
1982
        """
1983
        self._transport.put_bytes_non_atomic(self._filename, '',
1984
                                             mode=self._file_mode)
1985
1986
    def open_file(self):
1987
        """IFF this data access can be represented as a single file, open it.
1988
1989
        For knits that are not mapped to a single file on disk this will
1990
        always return None.
1991
1992
        :return: None or a file handle.
1993
        """
1994
        try:
1995
            return self._transport.get(self._filename)
1996
        except NoSuchFile:
1997
            pass
1998
        return None
1999
2000
    def get_raw_records(self, memos_for_retrieval):
2001
        """Get the raw bytes for a records.
2002
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2003
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2004
            length) memo for retrieving the bytes. The .knit method ignores
2005
            the index as there is always only a single file.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2006
        :return: An iterator over the bytes of the records.
2007
        """
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2008
        read_vector = [(pos, size) for (index, pos, size) in memos_for_retrieval]
2009
        for pos, data in self._transport.readv(self._filename, read_vector):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2010
            yield data
2011
2012
2013
class _PackAccess(object):
2014
    """Access to knit records via a collection of packs."""
2015
2016
    def __init__(self, index_to_packs, writer=None):
2017
        """Create a _PackAccess object.
2018
2019
        :param index_to_packs: A dict mapping index objects to the transport
2020
            and file names for obtaining data.
2021
        :param writer: A tuple (pack.ContainerWriter, write_index) which
2670.2.3 by Robert Collins
Review feedback.
2022
            contains the pack to write, and the index that reads from it will
2023
            be associated with.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2024
        """
2025
        if writer:
2026
            self.container_writer = writer[0]
2027
            self.write_index = writer[1]
2028
        else:
2029
            self.container_writer = None
2030
            self.write_index = None
2031
        self.indices = index_to_packs
2032
2033
    def add_raw_records(self, sizes, raw_data):
2034
        """Add raw knit bytes to a storage area.
2035
2670.2.3 by Robert Collins
Review feedback.
2036
        The data is spooled to the container writer in one bytes-record per
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2037
        raw data item.
2038
2039
        :param sizes: An iterable containing the size of each raw data segment.
2040
        :param raw_data: A bytestring containing the data.
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2041
        :return: A list of memos to retrieve the record later. Each memo is a
2042
            tuple - (index, pos, length), where the index field is the 
2043
            write_index object supplied to the PackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2044
        """
2045
        assert type(raw_data) == str, \
2046
            'data must be plain bytes was %s' % type(raw_data)
2047
        result = []
2048
        offset = 0
2049
        for size in sizes:
2050
            p_offset, p_length = self.container_writer.add_bytes_record(
2051
                raw_data[offset:offset+size], [])
2052
            offset += size
2053
            result.append((self.write_index, p_offset, p_length))
2054
        return result
2055
2056
    def create(self):
2057
        """Pack based knits do not get individually created."""
2058
2059
    def get_raw_records(self, memos_for_retrieval):
2060
        """Get the raw bytes for a records.
2061
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2062
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2063
            length) memo for retrieving the bytes. The Pack access method
2064
            looks up the pack to use for a given record in its index_to_pack
2065
            map.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2066
        :return: An iterator over the bytes of the records.
2067
        """
2068
        # first pass, group into same-index requests
2069
        request_lists = []
2070
        current_index = None
2071
        for (index, offset, length) in memos_for_retrieval:
2072
            if current_index == index:
2073
                current_list.append((offset, length))
2074
            else:
2075
                if current_index is not None:
2076
                    request_lists.append((current_index, current_list))
2077
                current_index = index
2078
                current_list = [(offset, length)]
2079
        # handle the last entry
2080
        if current_index is not None:
2081
            request_lists.append((current_index, current_list))
2082
        for index, offsets in request_lists:
2083
            transport, path = self.indices[index]
2084
            reader = pack.make_readv_reader(transport, path, offsets)
2085
            for names, read_func in reader.iter_records():
2086
                yield read_func(None)
2087
2088
    def open_file(self):
2089
        """Pack based knits have no single file."""
2090
        return None
2091
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2092
    def set_writer(self, writer, index, (transport, packname)):
2093
        """Set a writer to use for adding data."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
2094
        if index is not None:
2095
            self.indices[index] = (transport, packname)
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2096
        self.container_writer = writer
2097
        self.write_index = index
2098
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2099
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2100
class _StreamAccess(object):
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2101
    """A Knit Access object that provides data from a datastream.
2102
    
2103
    It also provides a fallback to present as unannotated data, annotated data
2104
    from a *backing* access object.
2105
2106
    This is triggered by a index_memo which is pointing to a different index
2107
    than this was constructed with, and is used to allow extracting full
2108
    unannotated texts for insertion into annotated knits.
2109
    """
2110
2111
    def __init__(self, reader_callable, stream_index, backing_knit,
2112
        orig_factory):
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2113
        """Create a _StreamAccess object.
2114
2115
        :param reader_callable: The reader_callable from the datastream.
2116
            This is called to buffer all the data immediately, for 
2117
            random access.
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2118
        :param stream_index: The index the data stream this provides access to
2119
            which will be present in native index_memo's.
2120
        :param backing_knit: The knit object that will provide access to 
2121
            annotated texts which are not available in the stream, so as to
2122
            create unannotated texts.
2123
        :param orig_factory: The original content factory used to generate the
2124
            stream. This is used for checking whether the thunk code for
2125
            supporting _copy_texts will generate the correct form of data.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2126
        """
2127
        self.data = reader_callable(None)
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2128
        self.stream_index = stream_index
2129
        self.backing_knit = backing_knit
2130
        self.orig_factory = orig_factory
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2131
2132
    def get_raw_records(self, memos_for_retrieval):
2133
        """Get the raw bytes for a records.
2134
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2135
        :param memos_for_retrieval: An iterable containing the (thunk_flag,
2136
            index, start, end) memo for retrieving the bytes.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2137
        :return: An iterator over the bytes of the records.
2138
        """
2139
        # use a generator for memory friendliness
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2140
        for thunk_flag, version_id, start, end in memos_for_retrieval:
2141
            if version_id is self.stream_index:
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2142
                yield self.data[start:end]
2143
                continue
2144
            # we have been asked to thunk. This thunking only occurs when
2145
            # we are obtaining plain texts from an annotated backing knit
2146
            # so that _copy_texts will work.
2147
            # We could improve performance here by scanning for where we need
2148
            # to do this and using get_line_list, then interleaving the output
2149
            # as desired. However, for now, this is sufficient.
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2150
            if self.orig_factory.__class__ != KnitPlainFactory:
2151
                raise errors.KnitCorrupt(
2152
                    self, 'Bad thunk request %r' % version_id)
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2153
            lines = self.backing_knit.get_lines(version_id)
2154
            line_bytes = ''.join(lines)
2155
            digest = sha_string(line_bytes)
2156
            if lines:
2157
                if lines[-1][-1] != '\n':
2158
                    lines[-1] = lines[-1] + '\n'
2159
                    line_bytes += '\n'
2160
            orig_options = list(self.backing_knit._index.get_options(version_id))
2161
            if 'fulltext' not in orig_options:
2162
                if 'line-delta' not in orig_options:
2163
                    raise errors.KnitCorrupt(self,
2164
                        'Unknown compression method %r' % orig_options)
2165
                orig_options.remove('line-delta')
2166
                orig_options.append('fulltext')
2167
            # We want plain data, because we expect to thunk only to allow text
2168
            # extraction.
2169
            size, bytes = self.backing_knit._data._record_to_data(version_id,
2170
                digest, lines, line_bytes)
2171
            yield bytes
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2172
2173
2174
class _StreamIndex(object):
2175
    """A Knit Index object that uses the data map from a datastream."""
2176
2177
    def __init__(self, data_list):
2178
        """Create a _StreamIndex object.
2179
2180
        :param data_list: The data_list from the datastream.
2181
        """
2182
        self.data_list = data_list
2183
        self._by_version = {}
2184
        pos = 0
2185
        for key, options, length, parents in data_list:
2186
            self._by_version[key] = options, (pos, pos + length), parents
2187
            pos += length
2188
2189
    def get_ancestry(self, versions, topo_sorted):
2190
        """Get an ancestry list for versions."""
2191
        if topo_sorted:
2192
            # Not needed for basic joins
2193
            raise NotImplementedError(self.get_ancestry)
2194
        # get a graph of all the mentioned versions:
2195
        # Little ugly - basically copied from KnitIndex, but don't want to
2196
        # accidentally incorporate too much of that index's code.
3052.2.4 by Andrew Bennetts
Some tweaks suggested by John's review.
2197
        ancestry = set()
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2198
        pending = set(versions)
2199
        cache = self._by_version
2200
        while pending:
2201
            version = pending.pop()
2202
            # trim ghosts
2203
            try:
2204
                parents = [p for p in cache[version][2] if p in cache]
2205
            except KeyError:
2206
                raise RevisionNotPresent(version, self)
2207
            # if not completed and not a ghost
3052.2.4 by Andrew Bennetts
Some tweaks suggested by John's review.
2208
            pending.update([p for p in parents if p not in ancestry])
2209
            ancestry.add(version)
2210
        return list(ancestry)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2211
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2212
    def get_build_details(self, version_ids):
2213
        """Get the method, index_memo and compression parent for version_ids.
2214
2215
        :param version_ids: An iterable of version_ids.
2216
        :return: A dict of version_id:(method, index_memo, compression_parent).
2217
        """
2218
        result = {}
2219
        for version_id in version_ids:
2220
            method = self.get_method(version_id)
2221
            if method == 'fulltext':
2222
                compression_parent = None
2223
            else:
2224
                compression_parent = self.get_parents_with_ghosts(version_id)[0]
2225
            index_memo = self.get_position(version_id)
2226
            result[version_id] = (method, index_memo, compression_parent)
2227
        return result
2228
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2229
    def get_method(self, version_id):
2230
        """Return compression method of specified version."""
2231
        try:
2232
            options = self._by_version[version_id][0]
2233
        except KeyError:
3052.2.4 by Andrew Bennetts
Some tweaks suggested by John's review.
2234
            # Strictly speaking this should check in the backing knit, but
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2235
            # until we have a test to discriminate, this will do.
2236
            return 'fulltext'
2237
        if 'fulltext' in options:
2238
            return 'fulltext'
2239
        elif 'line-delta' in options:
2240
            return 'line-delta'
2241
        else:
2242
            raise errors.KnitIndexUnknownMethod(self, options)
2243
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2244
    def get_options(self, version_id):
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2245
        """Return a list representing options.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2246
2247
        e.g. ['foo', 'bar']
2248
        """
2249
        return self._by_version[version_id][0]
2250
2251
    def get_parents_with_ghosts(self, version_id):
2252
        """Return parents of specified version with ghosts."""
2253
        return self._by_version[version_id][2]
2254
2255
    def get_position(self, version_id):
2256
        """Return details needed to access the version.
2257
        
2258
        _StreamAccess has the data as a big array, so we return slice
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2259
        coordinates into that (as index_memo's are opaque outside the
2260
        index and matching access class).
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2261
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2262
        :return: a tuple (thunk_flag, index, start, end).  If thunk_flag is
2263
            False, index will be self, otherwise it will be a version id.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2264
        """
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2265
        try:
2266
            start, end = self._by_version[version_id][1]
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2267
            return False, self, start, end
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2268
        except KeyError:
2269
            # Signal to the access object to handle this from the backing knit.
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2270
            return (True, version_id, None, None)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2271
2272
    def get_versions(self):
2273
        """Get all the versions in the stream."""
2274
        return self._by_version.keys()
2275
2276
    def iter_parents(self, version_ids):
2277
        """Iterate through the parents for many version ids.
2278
2279
        :param version_ids: An iterable yielding version_ids.
2280
        :return: An iterator that yields (version_id, parents). Requested 
2281
            version_ids not present in the versioned file are simply skipped.
2282
            The order is undefined, allowing for different optimisations in
2283
            the underlying implementation.
2284
        """
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2285
        result = []
2286
        for version in version_ids:
2287
            try:
2288
                result.append((version, self._by_version[version][2]))
2289
            except KeyError:
2290
                pass
2291
        return result
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2292
2293
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2294
class _KnitData(object):
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2295
    """Manage extraction of data from a KnitAccess, caching and decompressing.
2296
    
2297
    The KnitData class provides the logic for parsing and using knit records,
2298
    making use of an access method for the low level read and write operations.
2299
    """
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2300
2301
    def __init__(self, access):
2302
        """Create a KnitData object.
2303
2304
        :param access: The access method to use. Access methods such as
2305
            _KnitAccess manage the insertion of raw records and the subsequent
2306
            retrieval of the same.
2307
        """
2308
        self._access = access
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2309
        self._checked = False
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
2310
        # TODO: jam 20060713 conceptually, this could spill to disk
2311
        #       if the cached size gets larger than a certain amount
2312
        #       but it complicates the model a bit, so for now just use
2313
        #       a simple dictionary
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2314
        self._cache = {}
2315
        self._do_cache = False
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2316
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2317
    def enable_cache(self):
2318
        """Enable caching of reads."""
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
2319
        self._do_cache = True
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2320
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2321
    def clear_cache(self):
2322
        """Clear the record cache."""
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2323
        self._do_cache = False
2324
        self._cache = {}
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2325
2326
    def _open_file(self):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2327
        return self._access.open_file()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2328
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2329
    def _record_to_data(self, version_id, digest, lines, dense_lines=None):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2330
        """Convert version_id, digest, lines into a raw data block.
2331
        
2888.1.2 by Robert Collins
Cleanup the dense_lines parameter docstring to be more useful.
2332
        :param dense_lines: The bytes of lines but in a denser form. For
2333
            instance, if lines is a list of 1000 bytestrings each ending in \n,
2334
            dense_lines may be a list with one line in it, containing all the
2335
            1000's lines and their \n's. Using dense_lines if it is already
2336
            known is a win because the string join to create bytes in this
2337
            function spends less time resizing the final string.
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2338
        :return: (len, a StringIO instance with the raw data ready to read.)
2339
        """
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2340
        # Note: using a string copy here increases memory pressure with e.g.
2341
        # ISO's, but it is about 3 seconds faster on a 1.2Ghz intel machine
2342
        # when doing the initial commit of a mozilla tree. RBC 20070921
2343
        bytes = ''.join(chain(
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
2344
            ["version %s %d %s\n" % (version_id,
1596.2.28 by Robert Collins
more knit profile based tuning.
2345
                                     len(lines),
2346
                                     digest)],
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2347
            dense_lines or lines,
2348
            ["end %s\n" % version_id]))
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
2349
        assert bytes.__class__ == str
2350
        compressed_bytes = bytes_to_gzip(bytes)
2351
        return len(compressed_bytes), compressed_bytes
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2352
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2353
    def add_raw_records(self, sizes, raw_data):
1692.4.1 by Robert Collins
Multiple merges:
2354
        """Append a prepared record to the data file.
2329.1.2 by John Arbash Meinel
Remove some spurious whitespace changes.
2355
        
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2356
        :param sizes: An iterable containing the size of each raw data segment.
2357
        :param raw_data: A bytestring containing the data.
2358
        :return: a list of index data for the way the data was stored.
2359
            See the access method add_raw_records documentation for more
2360
            details.
1692.4.1 by Robert Collins
Multiple merges:
2361
        """
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2362
        return self._access.add_raw_records(sizes, raw_data)
2329.1.2 by John Arbash Meinel
Remove some spurious whitespace changes.
2363
        
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2364
    def _parse_record_header(self, version_id, raw_data):
2365
        """Parse a record header for consistency.
2366
2367
        :return: the header and the decompressor stream.
2368
                 as (stream, header_record)
2369
        """
2370
        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.
2371
        try:
2372
            rec = self._check_header(version_id, df.readline())
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2373
        except Exception, e:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2374
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2375
                              "While reading {%s} got %s(%s)"
2376
                              % (version_id, e.__class__.__name__, str(e)))
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2377
        return df, rec
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2378
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2379
    def _check_header(self, version_id, line):
2380
        rec = line.split()
2381
        if len(rec) != 4:
2382
            raise KnitCorrupt(self._access,
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2383
                              '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
2384
        if rec[1] != version_id:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2385
            raise KnitCorrupt(self._access,
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2386
                              'unexpected version, wanted %r, got %r'
2387
                              % (version_id, rec[1]))
2388
        return rec
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2389
2390
    def _parse_record(self, version_id, data):
1628.1.2 by Robert Collins
More knit micro-optimisations.
2391
        # profiling notes:
2392
        # 4168 calls in 2880 217 internal
2393
        # 4168 calls to _parse_record_header in 2121
2394
        # 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()
2395
        df = GzipFile(mode='rb', fileobj=StringIO(data))
2396
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2397
        try:
2398
            record_contents = df.readlines()
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2399
        except Exception, e:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2400
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2401
                              "While reading {%s} got %s(%s)"
2402
                              % (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()
2403
        header = record_contents.pop(0)
2404
        rec = self._check_header(version_id, header)
2405
2406
        last_line = record_contents.pop()
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2407
        if len(record_contents) != int(rec[2]):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2408
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2409
                              'incorrect number of lines %s != %s'
2410
                              ' for version {%s}'
2411
                              % (len(record_contents), int(rec[2]),
2412
                                 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()
2413
        if last_line != 'end %s\n' % rec[1]:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2414
            raise KnitCorrupt(self._access,
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2415
                              'unexpected version end line %r, wanted %r' 
2416
                              % (last_line, version_id))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2417
        df.close()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2418
        return record_contents, rec[3]
2419
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2420
    def read_records_iter_raw(self, records):
2421
        """Read text records from data file and yield raw data.
2422
2423
        This unpacks enough of the text record to validate the id is
2424
        as expected but thats all.
2425
        """
2426
        # setup an iterator of the external records:
2427
        # uses readv so nice and fast we hope.
1756.3.23 by Aaron Bentley
Remove knit caches
2428
        if len(records):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2429
            # 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
2430
            if self._cache:
2431
                # Don't check _cache if it is empty
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2432
                needed_offsets = [index_memo for version_id, index_memo
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2433
                                              in records
2434
                                              if version_id not in self._cache]
2435
            else:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2436
                needed_offsets = [index_memo for version_id, index_memo
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2437
                                               in records]
2438
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2439
            raw_records = self._access.get_raw_records(needed_offsets)
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2440
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2441
        for version_id, index_memo in records:
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2442
            if version_id in self._cache:
2443
                # This data has already been validated
2444
                data = self._cache[version_id]
2445
            else:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2446
                data = raw_records.next()
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2447
                if self._do_cache:
2448
                    self._cache[version_id] = data
2449
2450
                # validate the header
2451
                df, rec = self._parse_record_header(version_id, data)
2452
                df.close()
1756.3.23 by Aaron Bentley
Remove knit caches
2453
            yield version_id, data
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2454
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2455
    def read_records_iter(self, records):
2456
        """Read text records from data file and yield result.
2457
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2458
        The result will be returned in whatever is the fastest to read.
2459
        Not by the order requested. Also, multiple requests for the same
2460
        record will only yield 1 response.
2461
        :param records: A list of (version_id, pos, len) entries
2462
        :return: Yields (version_id, contents, digest) in the order
2463
                 read, not the order requested
2464
        """
2465
        if not records:
2466
            return
2467
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2468
        if self._cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2469
            # Skip records we have alread seen
2470
            yielded_records = set()
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2471
            needed_records = set()
2472
            for record in records:
2473
                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.
2474
                    if record[0] in yielded_records:
2475
                        continue
2476
                    yielded_records.add(record[0])
2477
                    data = self._cache[record[0]]
2478
                    content, digest = self._parse_record(record[0], data)
2479
                    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
2480
                else:
2481
                    needed_records.add(record)
2482
            needed_records = sorted(needed_records, key=operator.itemgetter(1))
2483
        else:
2484
            needed_records = sorted(set(records), key=operator.itemgetter(1))
1756.3.23 by Aaron Bentley
Remove knit caches
2485
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2486
        if not needed_records:
2487
            return
2488
2489
        # The transport optimizes the fetching as well 
2490
        # (ie, reads continuous ranges.)
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2491
        raw_data = self._access.get_raw_records(
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2492
            [index_memo for version_id, index_memo in needed_records])
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2493
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2494
        for (version_id, index_memo), data in \
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2495
                izip(iter(needed_records), raw_data):
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2496
            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
2497
            if self._do_cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2498
                self._cache[version_id] = data
1756.3.23 by Aaron Bentley
Remove knit caches
2499
            yield version_id, content, digest
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2500
2501
    def read_records(self, records):
2502
        """Read records into a dictionary."""
2503
        components = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2504
        for record_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
2505
                self.read_records_iter(records):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2506
            components[record_id] = (content, digest)
2507
        return components
2508
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2509
2510
class InterKnit(InterVersionedFile):
2511
    """Optimised code paths for knit to knit operations."""
2512
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2513
    _matching_file_from_factory = KnitVersionedFile
2514
    _matching_file_to_factory = KnitVersionedFile
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2515
    
2516
    @staticmethod
2517
    def is_compatible(source, target):
2518
        """Be compatible with knits.  """
2519
        try:
2520
            return (isinstance(source, KnitVersionedFile) and
2521
                    isinstance(target, KnitVersionedFile))
2522
        except AttributeError:
2523
            return False
2524
2998.2.3 by John Arbash Meinel
Respond to Aaron's requests
2525
    def _copy_texts(self, pb, msg, version_ids, ignore_missing=False):
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2526
        """Copy texts to the target by extracting and adding them one by one.
2527
2528
        see join() for the parameter definitions.
2529
        """
2530
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
2531
        graph = self.source.get_graph(version_ids)
2532
        order = topo_sort(graph.items())
2533
2534
        def size_of_content(content):
2535
            return sum(len(line) for line in content.text())
2536
        # Cache at most 10MB of parent texts
2537
        parent_cache = lru_cache.LRUSizeCache(max_size=10*1024*1024,
2538
                                              compute_size=size_of_content)
2539
        # TODO: jam 20071116 It would be nice to have a streaming interface to
2540
        #       get multiple texts from a source. The source could be smarter
2541
        #       about how it handled intermediate stages.
2998.2.3 by John Arbash Meinel
Respond to Aaron's requests
2542
        #       get_line_list() or make_mpdiffs() seem like a possibility, but
2543
        #       at the moment they extract all full texts into memory, which
2544
        #       causes us to store more than our 3x fulltext goal.
2545
        #       Repository.iter_files_bytes() may be another possibility
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2546
        to_process = [version for version in order
2547
                               if version not in self.target]
2548
        total = len(to_process)
2549
        pb = ui.ui_factory.nested_progress_bar()
2550
        try:
2551
            for index, version in enumerate(to_process):
2552
                pb.update('Converting versioned data', index, total)
2553
                sha1, num_bytes, parent_text = self.target.add_lines(version,
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2554
                    self.source.get_parents_with_ghosts(version),
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2555
                    self.source.get_lines(version),
2556
                    parent_texts=parent_cache)
2557
                parent_cache[version] = parent_text
2558
        finally:
2559
            pb.finished()
2560
        return total
2561
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2562
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2563
        """See InterVersionedFile.join."""
2564
        assert isinstance(self.source, KnitVersionedFile)
2565
        assert isinstance(self.target, KnitVersionedFile)
2566
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
2567
        # If the source and target are mismatched w.r.t. annotations vs
2568
        # plain, the data needs to be converted accordingly
2569
        if self.source.factory.annotated == self.target.factory.annotated:
2570
            converter = None
2571
        elif self.source.factory.annotated:
2572
            converter = self._anno_to_plain_converter
2573
        else:
2998.2.3 by John Arbash Meinel
Respond to Aaron's requests
2574
            # We're converting from a plain to an annotated knit. Copy them
2575
            # across by full texts.
2576
            return self._copy_texts(pb, msg, version_ids, ignore_missing)
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
2577
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
2578
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2579
        if not version_ids:
2580
            return 0
2581
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2582
        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.
2583
        try:
2584
            version_ids = list(version_ids)
2585
            if None in version_ids:
2586
                version_ids.remove(None)
2587
    
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2588
            self.source_ancestry = set(self.source.get_ancestry(version_ids,
2589
                topo_sorted=False))
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2590
            this_versions = set(self.target._index.get_versions())
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2591
            # XXX: For efficiency we should not look at the whole index,
2592
            #      we only need to consider the referenced revisions - they
2593
            #      must all be present, or the method must be full-text.
2594
            #      TODO, RBC 20070919
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2595
            needed_versions = self.source_ancestry - this_versions
2596
    
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2597
            if not needed_versions:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2598
                return 0
1910.2.65 by Aaron Bentley
Remove the check-parent patch
2599
            full_list = topo_sort(self.source.get_graph())
2600
    
2601
            version_list = [i for i in full_list if (not self.target.has_version(i)
2602
                            and i in needed_versions)]
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2603
    
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2604
            # plan the join:
2605
            copy_queue = []
2606
            copy_queue_records = []
2607
            copy_set = set()
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2608
            for version_id in version_list:
2609
                options = self.source._index.get_options(version_id)
2610
                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.
2611
                # 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.
2612
                for parent in parents:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2613
                    # if source has the parent, we must :
2614
                    # * already have it or
2615
                    # * have it scheduled already
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2616
                    # otherwise we don't care
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2617
                    assert (self.target.has_version(parent) or
2618
                            parent in copy_set or
2619
                            not self.source.has_version(parent))
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2620
                index_memo = self.source._index.get_position(version_id)
2621
                copy_queue_records.append((version_id, index_memo))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2622
                copy_queue.append((version_id, options, parents))
2623
                copy_set.add(version_id)
2624
2625
            # data suck the join:
2626
            count = 0
2627
            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.
2628
            raw_datum = []
2629
            raw_records = []
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2630
            for (version_id, raw_data), \
2631
                (version_id2, options, parents) in \
2632
                izip(self.source._data.read_records_iter_raw(copy_queue_records),
2633
                     copy_queue):
2634
                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.
2635
                count = count + 1
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2636
                pb.update("Joining knit", count, total)
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
2637
                if converter:
2638
                    size, raw_data = converter(raw_data, version_id, options,
2639
                        parents)
2851.4.1 by Ian Clatworthy
Support joining plain knits to annotated knits and vice versa
2640
                else:
2641
                    size = len(raw_data)
2642
                raw_records.append((version_id, options, parents, size))
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
2643
                raw_datum.append(raw_data)
2644
            self.target._add_raw_records(raw_records, ''.join(raw_datum))
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2645
            return count
2646
        finally:
2647
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2648
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
2649
    def _anno_to_plain_converter(self, raw_data, version_id, options,
2650
                                 parents):
2651
        """Convert annotated content to plain content."""
2652
        data, digest = self.source._data._parse_record(version_id, raw_data)
2653
        if 'fulltext' in options:
2654
            content = self.source.factory.parse_fulltext(data, version_id)
2655
            lines = self.target.factory.lower_fulltext(content)
2656
        else:
2657
            delta = self.source.factory.parse_line_delta(data, version_id,
2658
                plain=True)
2659
            lines = self.target.factory.lower_line_delta(delta)
2660
        return self.target._data._record_to_data(version_id, digest, lines)
2661
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2662
2663
InterVersionedFile.register_optimiser(InterKnit)
1596.2.24 by Robert Collins
Gzipfile was slightly slower than ideal.
2664
2665
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2666
class WeaveToKnit(InterVersionedFile):
2667
    """Optimised code paths for weave to knit operations."""
2668
    
2669
    _matching_file_from_factory = bzrlib.weave.WeaveFile
2670
    _matching_file_to_factory = KnitVersionedFile
2671
    
2672
    @staticmethod
2673
    def is_compatible(source, target):
2674
        """Be compatible with weaves to knits."""
2675
        try:
2676
            return (isinstance(source, bzrlib.weave.Weave) and
2677
                    isinstance(target, KnitVersionedFile))
2678
        except AttributeError:
2679
            return False
2680
2681
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
2682
        """See InterVersionedFile.join."""
2683
        assert isinstance(self.source, bzrlib.weave.Weave)
2684
        assert isinstance(self.target, KnitVersionedFile)
2685
2686
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
2687
2688
        if not version_ids:
2689
            return 0
2690
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2691
        pb = ui.ui_factory.nested_progress_bar()
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2692
        try:
2693
            version_ids = list(version_ids)
2694
    
2695
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
2696
            this_versions = set(self.target._index.get_versions())
2697
            needed_versions = self.source_ancestry - this_versions
2698
    
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2699
            if not needed_versions:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2700
                return 0
2701
            full_list = topo_sort(self.source.get_graph())
2702
    
2703
            version_list = [i for i in full_list if (not self.target.has_version(i)
2704
                            and i in needed_versions)]
2705
    
2706
            # do the join:
2707
            count = 0
2708
            total = len(version_list)
2709
            for version_id in version_list:
2710
                pb.update("Converting to knit", count, total)
2711
                parents = self.source.get_parents(version_id)
2712
                # check that its will be a consistent copy:
2713
                for parent in parents:
2714
                    # if source has the parent, we must already have it
2715
                    assert (self.target.has_version(parent))
2716
                self.target.add_lines(
2717
                    version_id, parents, self.source.get_lines(version_id))
2718
                count = count + 1
2719
            return count
2720
        finally:
2721
            pb.finished()
2722
2723
2724
InterVersionedFile.register_optimiser(WeaveToKnit)
2725
2726
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
2727
# Deprecated, use PatienceSequenceMatcher instead
2728
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2729
2730
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2731
def annotate_knit(knit, revision_id):
2732
    """Annotate a knit with no cached annotations.
2733
2734
    This implementation is for knits with no cached annotations.
2735
    It will work for knits with cached annotations, but this is not
2736
    recommended.
2737
    """
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2738
    ancestry = knit.get_ancestry(revision_id)
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2739
    fulltext = dict(zip(ancestry, knit.get_line_list(ancestry)))
2740
    annotations = {}
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2741
    for candidate in ancestry:
2770.1.4 by Aaron Bentley
Further optimize annotation, using existing matching blocks
2742
        if candidate in annotations:
2743
            continue
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2744
        parents = knit.get_parents(candidate)
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2745
        if len(parents) == 0:
2746
            blocks = None
2747
        elif knit._index.get_method(candidate) != 'line-delta':
2748
            blocks = None
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2749
        else:
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2750
            parent, sha1, noeol, delta = knit.get_delta(candidate)
2751
            blocks = KnitContent.get_line_delta_blocks(delta,
2752
                fulltext[parents[0]], fulltext[candidate])
2753
        annotations[candidate] = list(annotate.reannotate([annotations[p]
2754
            for p in parents], fulltext[candidate], candidate, blocks))
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2755
    return iter(annotations[revision_id])
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2756
2757
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2758
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
2759
    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.
2760
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
2761
    from bzrlib._knit_load_data_py import _load_data_py as _load_data