~bzr-pqm/bzr/bzr.dev

3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
1
# Copyright (C) 2005, 2006, 2007, 2008 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
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
63
from cStringIO import StringIO
1596.2.28 by Robert Collins
more knit profile based tuning.
64
from itertools import izip, chain
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
65
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
66
import os
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
67
import sys
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
68
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
69
from bzrlib.lazy_import import lazy_import
70
lazy_import(globals(), """
71
from bzrlib import (
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
72
    annotate,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
73
    debug,
74
    diff,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
75
    graph as _mod_graph,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
76
    index as _mod_index,
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,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
79
    progress,
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.
80
    trace,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
81
    tsort,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
82
    tuned_gzip,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
83
    )
84
""")
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
85
from bzrlib import (
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,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
89
    )
90
from bzrlib.errors import (
91
    FileExists,
92
    NoSuchFile,
93
    KnitError,
94
    InvalidRevisionId,
95
    KnitCorrupt,
96
    KnitHeaderError,
97
    RevisionNotPresent,
98
    RevisionAlreadyPresent,
3787.1.1 by Robert Collins
Embed the failed text in sha1 knit errors.
99
    SHA1KnitCorrupt,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
100
    )
101
from bzrlib.osutils import (
102
    contains_whitespace,
103
    contains_linebreaks,
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
104
    sha_string,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
105
    sha_strings,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
106
    split_lines,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
107
    )
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
108
from bzrlib.versionedfile import (
3350.3.12 by Robert Collins
Generate streams with absent records.
109
    AbsentContentFactory,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
110
    adapter_registry,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
111
    ConstantMapper,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
112
    ContentFactory,
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
113
    ChunkedContentFactory,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
114
    VersionedFile,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
115
    VersionedFiles,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
116
    )
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
117
118
119
# TODO: Split out code specific to this format into an associated object.
120
121
# TODO: Can we put in some kind of value to check that the index and data
122
# files belong together?
123
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
124
# 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.
125
126
# TODO: function to check whole file
127
128
# TODO: atomically append data, then measure backwards from the cursor
129
# position after writing to work out where it was located.  we may need to
130
# bypass python file buffering.
131
132
DATA_SUFFIX = '.knit'
133
INDEX_SUFFIX = '.kndx'
134
135
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
136
class KnitAdapter(object):
137
    """Base class for knit record adaption."""
138
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
139
    def __init__(self, basis_vf):
140
        """Create an adapter which accesses full texts from basis_vf.
141
        
142
        :param basis_vf: A versioned file to access basis texts of deltas from.
143
            May be None for adapters that do not need to access basis texts.
144
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
145
        self._data = KnitVersionedFiles(None, None)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
146
        self._annotate_factory = KnitAnnotateFactory()
147
        self._plain_factory = KnitPlainFactory()
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
148
        self._basis_vf = basis_vf
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
149
150
151
class FTAnnotatedToUnannotated(KnitAdapter):
152
    """An adapter from FT annotated knits to unannotated ones."""
153
154
    def get_bytes(self, factory, annotated_compressed_bytes):
155
        rec, contents = \
156
            self._data._parse_record_unchecked(annotated_compressed_bytes)
157
        content = self._annotate_factory.parse_fulltext(contents, rec[1])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
158
        size, bytes = self._data._record_to_data((rec[1],), rec[3], content.text())
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
159
        return bytes
160
161
162
class DeltaAnnotatedToUnannotated(KnitAdapter):
163
    """An adapter for deltas from annotated to unannotated."""
164
165
    def get_bytes(self, factory, annotated_compressed_bytes):
166
        rec, contents = \
167
            self._data._parse_record_unchecked(annotated_compressed_bytes)
168
        delta = self._annotate_factory.parse_line_delta(contents, rec[1],
169
            plain=True)
170
        contents = self._plain_factory.lower_line_delta(delta)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
171
        size, bytes = self._data._record_to_data((rec[1],), rec[3], contents)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
172
        return bytes
173
174
175
class FTAnnotatedToFullText(KnitAdapter):
176
    """An adapter from FT annotated knits to unannotated ones."""
177
178
    def get_bytes(self, factory, annotated_compressed_bytes):
179
        rec, contents = \
180
            self._data._parse_record_unchecked(annotated_compressed_bytes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
181
        content, delta = self._annotate_factory.parse_record(factory.key[-1],
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
182
            contents, factory._build_details, None)
183
        return ''.join(content.text())
184
185
186
class DeltaAnnotatedToFullText(KnitAdapter):
187
    """An adapter for deltas from annotated to unannotated."""
188
189
    def get_bytes(self, factory, annotated_compressed_bytes):
190
        rec, contents = \
191
            self._data._parse_record_unchecked(annotated_compressed_bytes)
192
        delta = self._annotate_factory.parse_line_delta(contents, rec[1],
193
            plain=True)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
194
        compression_parent = factory.parents[0]
195
        basis_entry = self._basis_vf.get_record_stream(
196
            [compression_parent], 'unordered', True).next()
197
        if basis_entry.storage_kind == 'absent':
198
            raise errors.RevisionNotPresent(compression_parent, self._basis_vf)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
199
        basis_chunks = basis_entry.get_bytes_as('chunked')
200
        basis_lines = osutils.chunks_to_lines(basis_chunks)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
201
        # Manually apply the delta because we have one annotated content and
202
        # one plain.
203
        basis_content = PlainKnitContent(basis_lines, compression_parent)
204
        basis_content.apply_delta(delta, rec[1])
205
        basis_content._should_strip_eol = factory._build_details[1]
206
        return ''.join(basis_content.text())
207
208
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
209
class FTPlainToFullText(KnitAdapter):
210
    """An adapter from FT plain knits to unannotated ones."""
211
212
    def get_bytes(self, factory, compressed_bytes):
213
        rec, contents = \
214
            self._data._parse_record_unchecked(compressed_bytes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
215
        content, delta = self._plain_factory.parse_record(factory.key[-1],
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
216
            contents, factory._build_details, None)
217
        return ''.join(content.text())
218
219
220
class DeltaPlainToFullText(KnitAdapter):
221
    """An adapter for deltas from annotated to unannotated."""
222
223
    def get_bytes(self, factory, compressed_bytes):
224
        rec, contents = \
225
            self._data._parse_record_unchecked(compressed_bytes)
226
        delta = self._plain_factory.parse_line_delta(contents, rec[1])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
227
        compression_parent = factory.parents[0]
228
        # XXX: string splitting overhead.
229
        basis_entry = self._basis_vf.get_record_stream(
230
            [compression_parent], 'unordered', True).next()
231
        if basis_entry.storage_kind == 'absent':
232
            raise errors.RevisionNotPresent(compression_parent, self._basis_vf)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
233
        basis_chunks = basis_entry.get_bytes_as('chunked')
234
        basis_lines = osutils.chunks_to_lines(basis_chunks)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
235
        basis_content = PlainKnitContent(basis_lines, compression_parent)
236
        # Manually apply the delta because we have one annotated content and
237
        # one plain.
238
        content, _ = self._plain_factory.parse_record(rec[1], contents,
239
            factory._build_details, basis_content)
240
        return ''.join(content.text())
241
242
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
243
class KnitContentFactory(ContentFactory):
244
    """Content factory for streaming from knits.
245
    
246
    :seealso ContentFactory:
247
    """
248
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
249
    def __init__(self, key, parents, build_details, sha1, raw_record,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
250
        annotated, knit=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
251
        """Create a KnitContentFactory for key.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
252
        
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
253
        :param key: The key.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
254
        :param parents: The parents.
255
        :param build_details: The build details as returned from
256
            get_build_details.
257
        :param sha1: The sha1 expected from the full text of this object.
258
        :param raw_record: The bytes of the knit data from disk.
259
        :param annotated: True if the raw data is annotated.
260
        """
261
        ContentFactory.__init__(self)
262
        self.sha1 = sha1
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
263
        self.key = key
264
        self.parents = parents
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
265
        if build_details[0] == 'line-delta':
266
            kind = 'delta'
267
        else:
268
            kind = 'ft'
269
        if annotated:
270
            annotated_kind = 'annotated-'
271
        else:
272
            annotated_kind = ''
273
        self.storage_kind = 'knit-%s%s-gz' % (annotated_kind, kind)
274
        self._raw_record = raw_record
275
        self._build_details = build_details
276
        self._knit = knit
277
278
    def get_bytes_as(self, storage_kind):
279
        if storage_kind == self.storage_kind:
280
            return self._raw_record
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
281
        if self._knit is not None:
282
            if storage_kind == 'chunked':
283
                return self._knit.get_lines(self.key[0])
284
            elif storage_kind == 'fulltext':
285
                return self._knit.get_text(self.key[0])
286
        raise errors.UnavailableRepresentation(self.key, storage_kind,
287
            self.storage_kind)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
288
289
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
290
class KnitContent(object):
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
291
    """Content of a knit version to which deltas can be applied.
292
    
3468.2.5 by Martin Pool
Correct comment and remove overbroad except block
293
    This is always stored in memory as a list of lines with \n at the end,
294
    plus a flag saying if the final ending is really there or not, because that 
295
    corresponds to the on-disk knit representation.
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
296
    """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
297
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
298
    def __init__(self):
299
        self._should_strip_eol = False
300
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
301
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
302
        """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
303
        raise NotImplementedError(self.apply_delta)
304
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
305
    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.
306
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
307
        new_texts = new_lines.text()
308
        old_texts = self.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
309
        s = patiencediff.PatienceSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
310
        for tag, i1, i2, j1, j2 in s.get_opcodes():
311
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
312
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
313
            # ofrom, oto, length, data
314
            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.
315
316
    def line_delta(self, new_lines):
317
        return list(self.line_delta_iter(new_lines))
318
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
319
    @staticmethod
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
320
    def get_line_delta_blocks(knit_delta, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
321
        """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
322
        target_len = len(target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
323
        s_pos = 0
324
        t_pos = 0
325
        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
326
            true_n = s_begin - s_pos
327
            n = true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
328
            if n > 0:
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
329
                # knit deltas do not provide reliable info about whether the
330
                # last line of a file matches, due to eol handling.
331
                if source[s_pos + n -1] != target[t_pos + n -1]:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
332
                    n-=1
333
                if n > 0:
334
                    yield s_pos, t_pos, n
335
            t_pos += t_len + true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
336
            s_pos = s_end
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
337
        n = target_len - t_pos
338
        if n > 0:
339
            if source[s_pos + n -1] != target[t_pos + n -1]:
340
                n-=1
341
            if n > 0:
342
                yield s_pos, t_pos, n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
343
        yield s_pos + (target_len - t_pos), target_len, 0
344
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
345
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.
346
class AnnotatedKnitContent(KnitContent):
347
    """Annotated content."""
348
349
    def __init__(self, lines):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
350
        KnitContent.__init__(self)
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.
351
        self._lines = lines
352
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
353
    def annotate(self):
354
        """Return a list of (origin, text) for each content line."""
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
355
        lines = self._lines[:]
356
        if self._should_strip_eol:
357
            origin, last_line = lines[-1]
358
            lines[-1] = (origin, last_line.rstrip('\n'))
359
        return lines
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.
360
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
361
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
362
        """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
363
        offset = 0
364
        lines = self._lines
365
        for start, end, count, delta_lines in delta:
366
            lines[offset+start:offset+end] = delta_lines
367
            offset = offset + (start - end) + count
368
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.
369
    def text(self):
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
370
        try:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
371
            lines = [text for origin, text in self._lines]
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
372
        except ValueError, e:
373
            # most commonly (only?) caused by the internal form of the knit
374
            # missing annotation information because of a bug - see thread
375
            # around 20071015
376
            raise KnitCorrupt(self,
377
                "line in annotated knit missing annotation information: %s"
378
                % (e,))
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
379
        if self._should_strip_eol:
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
380
            lines[-1] = lines[-1].rstrip('\n')
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
381
        return lines
382
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.
383
    def copy(self):
384
        return AnnotatedKnitContent(self._lines[:])
385
386
387
class PlainKnitContent(KnitContent):
2794.1.3 by Robert Collins
Review feedback.
388
    """Unannotated content.
389
    
390
    When annotate[_iter] is called on this content, the same version is reported
391
    for all lines. Generally, annotate[_iter] is not useful on PlainKnitContent
392
    objects.
393
    """
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
395
    def __init__(self, lines, version_id):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
396
        KnitContent.__init__(self)
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.
397
        self._lines = lines
398
        self._version_id = version_id
399
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
400
    def annotate(self):
401
        """Return a list of (origin, text) for each content line."""
402
        return [(self._version_id, line) for line in self._lines]
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.
403
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
404
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
405
        """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
406
        offset = 0
407
        lines = self._lines
408
        for start, end, count, delta_lines in delta:
409
            lines[offset+start:offset+end] = delta_lines
410
            offset = offset + (start - end) + count
411
        self._version_id = new_version_id
412
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.
413
    def copy(self):
414
        return PlainKnitContent(self._lines[:], self._version_id)
415
416
    def text(self):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
417
        lines = self._lines
418
        if self._should_strip_eol:
419
            lines = lines[:]
420
            lines[-1] = lines[-1].rstrip('\n')
421
        return lines
422
423
424
class _KnitFactory(object):
425
    """Base class for common Factory functions."""
426
427
    def parse_record(self, version_id, record, record_details,
428
                     base_content, copy_base_content=True):
429
        """Parse a record into a full content object.
430
431
        :param version_id: The official version id for this content
432
        :param record: The data returned by read_records_iter()
433
        :param record_details: Details about the record returned by
434
            get_build_details
435
        :param base_content: If get_build_details returns a compression_parent,
436
            you must return a base_content here, else use None
437
        :param copy_base_content: When building from the base_content, decide
438
            you can either copy it and return a new object, or modify it in
439
            place.
440
        :return: (content, delta) A Content object and possibly a line-delta,
441
            delta may be None
442
        """
443
        method, noeol = record_details
444
        if method == 'line-delta':
445
            if copy_base_content:
446
                content = base_content.copy()
447
            else:
448
                content = base_content
449
            delta = self.parse_line_delta(record, version_id)
450
            content.apply_delta(delta, version_id)
451
        else:
452
            content = self.parse_fulltext(record, version_id)
453
            delta = None
454
        content._should_strip_eol = noeol
455
        return (content, delta)
456
457
458
class KnitAnnotateFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
459
    """Factory for creating annotated Content objects."""
460
461
    annotated = True
462
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.
463
    def make(self, lines, version_id):
464
        num_lines = len(lines)
465
        return AnnotatedKnitContent(zip([version_id] * num_lines, lines))
466
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
467
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
468
        """Convert fulltext to internal representation
469
470
        fulltext content is of the format
471
        revid(utf8) plaintext\n
472
        internal representation is of the format:
473
        (revid, plaintext)
474
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
475
        # TODO: jam 20070209 The tests expect this to be returned as tuples,
476
        #       but the code itself doesn't really depend on that.
477
        #       Figure out a way to not require the overhead of turning the
478
        #       list back into tuples.
479
        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.
480
        return AnnotatedKnitContent(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
481
482
    def parse_line_delta_iter(self, lines):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
483
        return iter(self.parse_line_delta(lines))
1628.1.2 by Robert Collins
More knit micro-optimisations.
484
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
485
    def parse_line_delta(self, lines, version_id, plain=False):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
486
        """Convert a line based delta into internal representation.
487
488
        line delta is in the form of:
489
        intstart intend intcount
490
        1..count lines:
491
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
492
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
493
        (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
494
495
        :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
496
            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
497
            (start, end, count, [1..count newline])
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
498
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
499
        result = []
500
        lines = iter(lines)
501
        next = lines.next
2249.5.1 by John Arbash Meinel
Leave revision-ids in utf-8 when reading.
502
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
503
        cache = {}
504
        def cache_and_return(line):
505
            origin, text = line.split(' ', 1)
506
            return cache.setdefault(origin, origin), text
507
1628.1.2 by Robert Collins
More knit micro-optimisations.
508
        # walk through the lines parsing.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
509
        # Note that the plain test is explicitly pulled out of the
510
        # loop to minimise any performance impact
511
        if plain:
512
            for header in lines:
513
                start, end, count = [int(n) for n in header.split(',')]
514
                contents = [next().split(' ', 1)[1] for i in xrange(count)]
515
                result.append((start, end, count, contents))
516
        else:
517
            for header in lines:
518
                start, end, count = [int(n) for n in header.split(',')]
519
                contents = [tuple(next().split(' ', 1)) for i in xrange(count)]
520
                result.append((start, end, count, contents))
1628.1.2 by Robert Collins
More knit micro-optimisations.
521
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
522
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
523
    def get_fulltext_content(self, lines):
524
        """Extract just the content lines from a fulltext."""
525
        return (line.split(' ', 1)[1] for line in lines)
526
527
    def get_linedelta_content(self, lines):
528
        """Extract just the content from a line delta.
529
530
        This doesn't return all of the extra information stored in a delta.
531
        Only the actual content lines.
532
        """
533
        lines = iter(lines)
534
        next = lines.next
535
        for header in lines:
536
            header = header.split(',')
537
            count = int(header[2])
538
            for i in xrange(count):
539
                origin, text = next().split(' ', 1)
540
                yield text
541
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
542
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
543
        """convert a fulltext content record into a serializable form.
544
545
        see parse_fulltext which this inverts.
546
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
547
        # TODO: jam 20070209 We only do the caching thing to make sure that
548
        #       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.
549
        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.
550
551
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
552
        """convert a delta into a serializable form.
553
1628.1.2 by Robert Collins
More knit micro-optimisations.
554
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
555
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
556
        # TODO: jam 20070209 We only do the caching thing to make sure that
557
        #       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.
558
        out = []
559
        for start, end, c, lines in delta:
560
            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.
561
            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
562
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
563
        return out
564
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
565
    def annotate(self, knit, key):
566
        content = knit._get_content(key)
567
        # adjust for the fact that serialised annotations are only key suffixes
568
        # for this factory.
569
        if type(key) == tuple:
570
            prefix = key[:-1]
571
            origins = content.annotate()
572
            result = []
573
            for origin, line in origins:
574
                result.append((prefix + (origin,), line))
575
            return result
576
        else:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
577
            # XXX: This smells a bit.  Why would key ever be a non-tuple here?
578
            # Aren't keys defined to be tuples?  -- spiv 20080618
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
579
            return content.annotate()
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
580
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
581
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
582
class KnitPlainFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
583
    """Factory for creating plain Content objects."""
584
585
    annotated = False
586
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.
587
    def make(self, lines, version_id):
588
        return PlainKnitContent(lines, version_id)
589
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
590
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
591
        """This parses an unannotated fulltext.
592
593
        Note that this is not a noop - the internal representation
594
        has (versionid, line) - its just a constant versionid.
595
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
596
        return self.make(content, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
597
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
598
    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
599
        cur = 0
600
        num_lines = len(lines)
601
        while cur < num_lines:
602
            header = lines[cur]
603
            cur += 1
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
604
            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.
605
            yield start, end, c, lines[cur:cur+c]
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
606
            cur += c
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
607
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
608
    def parse_line_delta(self, lines, version_id):
609
        return list(self.parse_line_delta_iter(lines, version_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
610
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
611
    def get_fulltext_content(self, lines):
612
        """Extract just the content lines from a fulltext."""
613
        return iter(lines)
614
615
    def get_linedelta_content(self, lines):
616
        """Extract just the content from a line delta.
617
618
        This doesn't return all of the extra information stored in a delta.
619
        Only the actual content lines.
620
        """
621
        lines = iter(lines)
622
        next = lines.next
623
        for header in lines:
624
            header = header.split(',')
625
            count = int(header[2])
626
            for i in xrange(count):
627
                yield next()
628
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
629
    def lower_fulltext(self, content):
630
        return content.text()
631
632
    def lower_line_delta(self, delta):
633
        out = []
634
        for start, end, c, lines in delta:
635
            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.
636
            out.extend(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
637
        return out
638
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
639
    def annotate(self, knit, key):
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
640
        annotator = _KnitAnnotator(knit)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
641
        return annotator.annotate(key)
642
643
644
645
def make_file_factory(annotated, mapper):
646
    """Create a factory for creating a file based KnitVersionedFiles.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
647
648
    This is only functional enough to run interface tests, it doesn't try to
649
    provide a full pack environment.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
650
    
651
    :param annotated: knit annotations are wanted.
652
    :param mapper: The mapper from keys to paths.
653
    """
654
    def factory(transport):
655
        index = _KndxIndex(transport, mapper, lambda:None, lambda:True, lambda:True)
656
        access = _KnitKeyAccess(transport, mapper)
657
        return KnitVersionedFiles(index, access, annotated=annotated)
658
    return factory
659
660
661
def make_pack_factory(graph, delta, keylength):
662
    """Create a factory for creating a pack based VersionedFiles.
663
664
    This is only functional enough to run interface tests, it doesn't try to
665
    provide a full pack environment.
666
    
667
    :param graph: Store a graph.
668
    :param delta: Delta compress contents.
669
    :param keylength: How long should keys be.
670
    """
671
    def factory(transport):
672
        parents = graph or delta
673
        ref_length = 0
674
        if graph:
675
            ref_length += 1
676
        if delta:
677
            ref_length += 1
678
            max_delta_chain = 200
679
        else:
680
            max_delta_chain = 0
681
        graph_index = _mod_index.InMemoryGraphIndex(reference_lists=ref_length,
682
            key_elements=keylength)
683
        stream = transport.open_write_stream('newpack')
684
        writer = pack.ContainerWriter(stream.write)
685
        writer.begin()
686
        index = _KnitGraphIndex(graph_index, lambda:True, parents=parents,
687
            deltas=delta, add_callback=graph_index.add_nodes)
688
        access = _DirectPackAccess({})
689
        access.set_writer(writer, graph_index, (transport, 'newpack'))
690
        result = KnitVersionedFiles(index, access,
691
            max_delta_chain=max_delta_chain)
692
        result.stream = stream
693
        result.writer = writer
694
        return result
695
    return factory
696
697
698
def cleanup_pack_knit(versioned_files):
699
    versioned_files.stream.close()
700
    versioned_files.writer.end()
701
702
703
class KnitVersionedFiles(VersionedFiles):
704
    """Storage for many versioned files using knit compression.
705
706
    Backend storage is managed by indices and data objects.
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
707
708
    :ivar _index: A _KnitGraphIndex or similar that can describe the 
709
        parents, graph, compression and data location of entries in this 
710
        KnitVersionedFiles.  Note that this is only the index for 
3582.1.16 by Martin Pool
Review feedback and news entry
711
        *this* vfs; if there are fallbacks they must be queried separately.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
712
    """
713
714
    def __init__(self, index, data_access, max_delta_chain=200,
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
715
                 annotated=False, reload_func=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
716
        """Create a KnitVersionedFiles with index and data_access.
717
718
        :param index: The index for the knit data.
719
        :param data_access: The access object to store and retrieve knit
720
            records.
721
        :param max_delta_chain: The maximum number of deltas to permit during
722
            insertion. Set to 0 to prohibit the use of deltas.
723
        :param annotated: Set to True to cause annotations to be calculated and
724
            stored during insertion.
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
725
        :param reload_func: An function that can be called if we think we need
726
            to reload the pack listing and try again. See
727
            'bzrlib.repofmt.pack_repo.AggregateIndex' for the signature.
1563.2.25 by Robert Collins
Merge in upstream.
728
        """
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
729
        self._index = index
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
730
        self._access = data_access
731
        self._max_delta_chain = max_delta_chain
732
        if annotated:
733
            self._factory = KnitAnnotateFactory()
734
        else:
735
            self._factory = KnitPlainFactory()
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
736
        self._fallback_vfs = []
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
737
        self._reload_func = reload_func
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
738
3702.1.1 by Martin Pool
Add repr for KnitVersionedFiles
739
    def __repr__(self):
740
        return "%s(%r, %r)" % (
741
            self.__class__.__name__,
742
            self._index,
743
            self._access)
744
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
745
    def add_fallback_versioned_files(self, a_versioned_files):
746
        """Add a source of texts for texts not present in this knit.
747
748
        :param a_versioned_files: A VersionedFiles object.
749
        """
750
        self._fallback_vfs.append(a_versioned_files)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
751
752
    def add_lines(self, key, parents, lines, parent_texts=None,
753
        left_matching_blocks=None, nostore_sha=None, random_id=False,
754
        check_content=True):
755
        """See VersionedFiles.add_lines()."""
756
        self._index._check_write_ok()
757
        self._check_add(key, lines, random_id, check_content)
758
        if parents is None:
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
759
            # The caller might pass None if there is no graph data, but kndx
760
            # indexes can't directly store that, so we give them
761
            # an empty tuple instead.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
762
            parents = ()
763
        return self._add(key, lines, parents,
764
            parent_texts, left_matching_blocks, nostore_sha, random_id)
765
766
    def _add(self, key, lines, parents, parent_texts,
767
        left_matching_blocks, nostore_sha, random_id):
768
        """Add a set of lines on top of version specified by parents.
769
770
        Any versions not present will be converted into ghosts.
771
        """
772
        # first thing, if the content is something we don't need to store, find
773
        # that out.
774
        line_bytes = ''.join(lines)
775
        digest = sha_string(line_bytes)
776
        if nostore_sha == digest:
777
            raise errors.ExistingContent
778
779
        present_parents = []
780
        if parent_texts is None:
781
            parent_texts = {}
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
782
        # Do a single query to ascertain parent presence; we only compress
783
        # against parents in the same kvf.
784
        present_parent_map = self._index.get_parent_map(parents)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
785
        for parent in parents:
786
            if parent in present_parent_map:
787
                present_parents.append(parent)
788
789
        # Currently we can only compress against the left most present parent.
790
        if (len(present_parents) == 0 or
791
            present_parents[0] != parents[0]):
792
            delta = False
793
        else:
794
            # To speed the extract of texts the delta chain is limited
795
            # to a fixed number of deltas.  This should minimize both
796
            # I/O and the time spend applying deltas.
797
            delta = self._check_should_delta(present_parents[0])
798
799
        text_length = len(line_bytes)
800
        options = []
801
        if lines:
802
            if lines[-1][-1] != '\n':
803
                # copy the contents of lines.
804
                lines = lines[:]
805
                options.append('no-eol')
806
                lines[-1] = lines[-1] + '\n'
807
                line_bytes += '\n'
808
809
        for element in key:
810
            if type(element) != str:
811
                raise TypeError("key contains non-strings: %r" % (key,))
812
        # Knit hunks are still last-element only
813
        version_id = key[-1]
814
        content = self._factory.make(lines, version_id)
815
        if 'no-eol' in options:
816
            # Hint to the content object that its text() call should strip the
817
            # EOL.
818
            content._should_strip_eol = True
819
        if delta or (self._factory.annotated and len(present_parents) > 0):
820
            # Merge annotations from parent texts if needed.
821
            delta_hunks = self._merge_annotations(content, present_parents,
822
                parent_texts, delta, self._factory.annotated,
823
                left_matching_blocks)
824
825
        if delta:
826
            options.append('line-delta')
827
            store_lines = self._factory.lower_line_delta(delta_hunks)
828
            size, bytes = self._record_to_data(key, digest,
829
                store_lines)
830
        else:
831
            options.append('fulltext')
832
            # isinstance is slower and we have no hierarchy.
833
            if self._factory.__class__ == KnitPlainFactory:
834
                # Use the already joined bytes saving iteration time in
835
                # _record_to_data.
836
                size, bytes = self._record_to_data(key, digest,
837
                    lines, [line_bytes])
838
            else:
839
                # get mixed annotation + content and feed it into the
840
                # serialiser.
841
                store_lines = self._factory.lower_fulltext(content)
842
                size, bytes = self._record_to_data(key, digest,
843
                    store_lines)
844
845
        access_memo = self._access.add_raw_records([(key, size)], bytes)[0]
846
        self._index.add_records(
847
            ((key, options, access_memo, parents),),
848
            random_id=random_id)
849
        return digest, text_length, content
850
851
    def annotate(self, key):
852
        """See VersionedFiles.annotate."""
853
        return self._factory.annotate(self, key)
854
855
    def check(self, progress_bar=None):
856
        """See VersionedFiles.check()."""
857
        # This doesn't actually test extraction of everything, but that will
858
        # impact 'bzr check' substantially, and needs to be integrated with
859
        # care. However, it does check for the obvious problem of a delta with
860
        # no basis.
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
861
        keys = self._index.keys()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
862
        parent_map = self.get_parent_map(keys)
863
        for key in keys:
864
            if self._index.get_method(key) != 'fulltext':
865
                compression_parent = parent_map[key][0]
866
                if compression_parent not in parent_map:
867
                    raise errors.KnitCorrupt(self,
868
                        "Missing basis parent %s for %s" % (
869
                        compression_parent, key))
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
870
        for fallback_vfs in self._fallback_vfs:
871
            fallback_vfs.check()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
872
873
    def _check_add(self, key, lines, random_id, check_content):
874
        """check that version_id and lines are safe to add."""
3350.6.10 by Martin Pool
VersionedFiles review cleanups
875
        version_id = key[-1]
876
        if contains_whitespace(version_id):
3517.3.1 by Andrew Bennetts
Fix error in error path.
877
            raise InvalidRevisionId(version_id, self)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
878
        self.check_not_reserved_id(version_id)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
879
        # TODO: If random_id==False and the key is already present, we should
880
        # probably check that the existing content is identical to what is
881
        # being inserted, and otherwise raise an exception.  This would make
882
        # the bundle code simpler.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
883
        if check_content:
884
            self._check_lines_not_unicode(lines)
885
            self._check_lines_are_lines(lines)
886
887
    def _check_header(self, key, line):
888
        rec = self._split_header(line)
889
        self._check_header_version(rec, key[-1])
890
        return rec
891
892
    def _check_header_version(self, rec, version_id):
893
        """Checks the header version on original format knit records.
894
        
895
        These have the last component of the key embedded in the record.
896
        """
897
        if rec[1] != version_id:
898
            raise KnitCorrupt(self,
899
                'unexpected version, wanted %r, got %r' % (version_id, rec[1]))
900
901
    def _check_should_delta(self, 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
902
        """Iterate back through the parent listing, looking for a fulltext.
903
904
        This is used when we want to decide whether to add a delta or a new
905
        fulltext. It searches for _max_delta_chain parents. When it finds a
906
        fulltext parent, it sees if the total size of the deltas leading up to
907
        it is large enough to indicate that we want a new full text anyway.
908
909
        Return True if we should create a new delta, False if we should use a
910
        full text.
911
        """
912
        delta_size = 0
913
        fulltext_size = None
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
914
        for count in xrange(self._max_delta_chain):
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
915
            try:
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
916
                # Note that this only looks in the index of this particular
917
                # KnitVersionedFiles, not in the fallbacks.  This ensures that
918
                # we won't store a delta spanning physical repository
919
                # boundaries.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
920
                build_details = self._index.get_build_details([parent])
921
                parent_details = build_details[parent]
922
            except RevisionNotPresent, KeyError:
923
                # Some basis is not locally present: always fulltext
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
924
                return False
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
925
            index_memo, compression_parent, _, _ = parent_details
926
            _, _, size = index_memo
927
            if compression_parent is None:
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
928
                fulltext_size = size
929
                break
930
            delta_size += size
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
931
            # We don't explicitly check for presence because this is in an
932
            # inner loop, and if it's missing it'll fail anyhow.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
933
            parent = compression_parent
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
934
        else:
935
            # 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
936
            return False
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
937
        # Simple heuristic - if the total I/O wold be greater as a delta than
938
        # the originally installed fulltext, we create a new fulltext.
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
939
        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
940
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
941
    def _build_details_to_components(self, build_details):
942
        """Convert a build_details tuple to a position tuple."""
943
        # record_details, access_memo, compression_parent
944
        return build_details[3], build_details[0], build_details[1]
945
3350.6.10 by Martin Pool
VersionedFiles review cleanups
946
    def _get_components_positions(self, keys, allow_missing=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
947
        """Produce a map of position data for the components of keys.
948
949
        This data is intended to be used for retrieving the knit records.
950
951
        A dict of key to (record_details, index_memo, next, parents) is
952
        returned.
953
        method is the way referenced data should be applied.
954
        index_memo is the handle to pass to the data access to actually get the
955
            data
956
        next is the build-parent of the version, or None for fulltexts.
957
        parents is the version_ids of the parents of this version
958
3350.6.10 by Martin Pool
VersionedFiles review cleanups
959
        :param allow_missing: If True do not raise an error on a missing component,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
960
            just ignore it.
961
        """
962
        component_data = {}
963
        pending_components = keys
964
        while pending_components:
965
            build_details = self._index.get_build_details(pending_components)
966
            current_components = set(pending_components)
967
            pending_components = set()
968
            for key, details in build_details.iteritems():
969
                (index_memo, compression_parent, parents,
970
                 record_details) = details
971
                method = record_details[0]
972
                if compression_parent is not None:
973
                    pending_components.add(compression_parent)
974
                component_data[key] = self._build_details_to_components(details)
975
            missing = current_components.difference(build_details)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
976
            if missing and not allow_missing:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
977
                raise errors.RevisionNotPresent(missing.pop(), self)
978
        return component_data
979
       
980
    def _get_content(self, key, parent_texts={}):
981
        """Returns a content object that makes up the specified
982
        version."""
983
        cached_version = parent_texts.get(key, None)
984
        if cached_version is not None:
985
            # Ensure the cache dict is valid.
986
            if not self.get_parent_map([key]):
987
                raise RevisionNotPresent(key, self)
988
            return cached_version
989
        text_map, contents_map = self._get_content_maps([key])
990
        return contents_map[key]
991
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
992
    def _get_content_maps(self, keys, nonlocal_keys=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
993
        """Produce maps of text and KnitContents
994
        
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
995
        :param keys: The keys to produce content maps for.
996
        :param nonlocal_keys: An iterable of keys(possibly intersecting keys)
997
            which are known to not be in this knit, but rather in one of the
998
            fallback knits.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
999
        :return: (text_map, content_map) where text_map contains the texts for
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1000
            the requested versions and content_map contains the KnitContents.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1001
        """
1002
        # FUTURE: This function could be improved for the 'extract many' case
1003
        # by tracking each component and only doing the copy when the number of
1004
        # children than need to apply delta's to it is > 1 or it is part of the
1005
        # final output.
1006
        keys = list(keys)
1007
        multiple_versions = len(keys) != 1
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1008
        record_map = self._get_record_map(keys, allow_missing=True)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1009
1010
        text_map = {}
1011
        content_map = {}
1012
        final_content = {}
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1013
        if nonlocal_keys is None:
1014
            nonlocal_keys = set()
1015
        else:
1016
            nonlocal_keys = frozenset(nonlocal_keys)
1017
        missing_keys = set(nonlocal_keys)
1018
        for source in self._fallback_vfs:
1019
            if not missing_keys:
1020
                break
1021
            for record in source.get_record_stream(missing_keys,
1022
                'unordered', True):
1023
                if record.storage_kind == 'absent':
1024
                    continue
1025
                missing_keys.remove(record.key)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1026
                lines = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1027
                text_map[record.key] = lines
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1028
                content_map[record.key] = PlainKnitContent(lines, record.key)
1029
                if record.key in keys:
1030
                    final_content[record.key] = content_map[record.key]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1031
        for key in keys:
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1032
            if key in nonlocal_keys:
1033
                # already handled
1034
                continue
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1035
            components = []
1036
            cursor = key
1037
            while cursor is not None:
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1038
                try:
1039
                    record, record_details, digest, next = record_map[cursor]
1040
                except KeyError:
1041
                    raise RevisionNotPresent(cursor, self)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1042
                components.append((cursor, record, record_details, digest))
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1043
                cursor = next
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1044
                if cursor in content_map:
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1045
                    # no need to plan further back
1046
                    components.append((cursor, None, None, None))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1047
                    break
1048
1049
            content = None
1050
            for (component_id, record, record_details,
1051
                 digest) in reversed(components):
1052
                if component_id in content_map:
1053
                    content = content_map[component_id]
1054
                else:
1055
                    content, delta = self._factory.parse_record(key[-1],
1056
                        record, record_details, content,
1057
                        copy_base_content=multiple_versions)
1058
                    if multiple_versions:
1059
                        content_map[component_id] = content
1060
1061
            final_content[key] = content
1062
1063
            # digest here is the digest from the last applied component.
1064
            text = content.text()
1065
            actual_sha = sha_strings(text)
1066
            if actual_sha != digest:
3787.1.1 by Robert Collins
Embed the failed text in sha1 knit errors.
1067
                raise SHA1KnitCorrupt(self, actual_sha, digest, key, text)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1068
            text_map[key] = text
1069
        return text_map, final_content
1070
1071
    def get_parent_map(self, keys):
3517.4.17 by Martin Pool
Redo base Repository.get_parent_map to use .revisions graph
1072
        """Get a map of the graph parents of keys.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1073
1074
        :param keys: The keys to look up parents for.
1075
        :return: A mapping from keys to parents. Absent keys are absent from
1076
            the mapping.
1077
        """
3350.8.14 by Robert Collins
Review feedback.
1078
        return self._get_parent_map_with_sources(keys)[0]
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1079
3350.8.14 by Robert Collins
Review feedback.
1080
    def _get_parent_map_with_sources(self, keys):
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1081
        """Get a map of the parents of keys.
1082
1083
        :param keys: The keys to look up parents for.
1084
        :return: A tuple. The first element is a mapping from keys to parents.
1085
            Absent keys are absent from the mapping. The second element is a
1086
            list with the locations each key was found in. The first element
1087
            is the in-this-knit parents, the second the first fallback source,
1088
            and so on.
1089
        """
3350.8.2 by Robert Collins
stacked get_parent_map.
1090
        result = {}
1091
        sources = [self._index] + self._fallback_vfs
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1092
        source_results = []
3350.8.2 by Robert Collins
stacked get_parent_map.
1093
        missing = set(keys)
1094
        for source in sources:
1095
            if not missing:
1096
                break
1097
            new_result = source.get_parent_map(missing)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1098
            source_results.append(new_result)
3350.8.2 by Robert Collins
stacked get_parent_map.
1099
            result.update(new_result)
1100
            missing.difference_update(set(new_result))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1101
        return result, source_results
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1102
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1103
    def _get_record_map(self, keys, allow_missing=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1104
        """Produce a dictionary of knit records.
1105
        
1106
        :return: {key:(record, record_details, digest, next)}
1107
            record
1108
                data returned from read_records
1109
            record_details
1110
                opaque information to pass to parse_record
1111
            digest
1112
                SHA1 digest of the full text after all steps are done
1113
            next
1114
                build-parent of the version, i.e. the leftmost ancestor.
1115
                Will be None if the record is not a delta.
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1116
        :param keys: The keys to build a map for
1117
        :param allow_missing: If some records are missing, rather than 
1118
            error, just return the data that could be generated.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1119
        """
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1120
        # This retries the whole request if anything fails. Potentially we
1121
        # could be a bit more selective. We could track the keys whose records
1122
        # we have successfully found, and then only request the new records
1123
        # from there. However, _get_components_positions grabs the whole build
1124
        # chain, which means we'll likely try to grab the same records again
1125
        # anyway. Also, can the build chains change as part of a pack
1126
        # operation? We wouldn't want to end up with a broken chain.
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1127
        while True:
1128
            try:
1129
                position_map = self._get_components_positions(keys,
1130
                    allow_missing=allow_missing)
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1131
                # key = component_id, r = record_details, i_m = index_memo,
1132
                # n = next
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1133
                records = [(key, i_m) for key, (r, i_m, n)
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1134
                                       in position_map.iteritems()]
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1135
                record_map = {}
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1136
                for key, record, digest in self._read_records_iter(records):
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1137
                    (record_details, index_memo, next) = position_map[key]
1138
                    record_map[key] = record, record_details, digest, next
1139
                return record_map
1140
            except errors.RetryWithNewPacks, e:
1141
                self._access.reload_or_raise(e)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1142
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1143
    def _split_by_prefix(self, keys):
1144
        """For the given keys, split them up based on their prefix.
1145
1146
        To keep memory pressure somewhat under control, split the
1147
        requests back into per-file-id requests, otherwise "bzr co"
1148
        extracts the full tree into memory before writing it to disk.
1149
        This should be revisited if _get_content_maps() can ever cross
1150
        file-id boundaries.
1151
1152
        :param keys: An iterable of key tuples
1153
        :return: A dict of {prefix: [key_list]}
1154
        """
1155
        split_by_prefix = {}
1156
        for key in keys:
1157
            if len(key) == 1:
1158
                split_by_prefix.setdefault('', []).append(key)
1159
            else:
1160
                split_by_prefix.setdefault(key[0], []).append(key)
1161
        return split_by_prefix
1162
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1163
    def get_record_stream(self, keys, ordering, include_delta_closure):
1164
        """Get a stream of records for keys.
1165
1166
        :param keys: The keys to include.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1167
        :param ordering: Either 'unordered' or 'topological'. A topologically
1168
            sorted stream has compression parents strictly before their
1169
            children.
1170
        :param include_delta_closure: If True then the closure across any
1171
            compression parents will be included (in the opaque data).
1172
        :return: An iterator of ContentFactory objects, each of which is only
1173
            valid until the iterator is advanced.
1174
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1175
        # keys might be a generator
1176
        keys = set(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1177
        if not keys:
1178
            return
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1179
        if not self._index.has_graph:
1180
            # Cannot topological order when no graph has been stored.
1181
            ordering = 'unordered'
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1182
1183
        remaining_keys = keys
1184
        while True:
1185
            try:
1186
                keys = set(remaining_keys)
1187
                for content_factory in self._get_remaining_record_stream(keys,
1188
                                            ordering, include_delta_closure):
1189
                    remaining_keys.discard(content_factory.key)
1190
                    yield content_factory
1191
                return
1192
            except errors.RetryWithNewPacks, e:
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1193
                self._access.reload_or_raise(e)
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1194
1195
    def _get_remaining_record_stream(self, keys, ordering,
1196
                                     include_delta_closure):
3789.2.4 by John Arbash Meinel
Add a multiple-record test, though it isn't quite what we want for the readv tests.
1197
        """This function is the 'retry' portion for get_record_stream."""
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1198
        if include_delta_closure:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1199
            positions = self._get_components_positions(keys, allow_missing=True)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1200
        else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1201
            build_details = self._index.get_build_details(keys)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1202
            # map from key to
1203
            # (record_details, access_memo, compression_parent_key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1204
            positions = dict((key, self._build_details_to_components(details))
1205
                for key, details in build_details.iteritems())
1206
        absent_keys = keys.difference(set(positions))
1207
        # There may be more absent keys : if we're missing the basis component
1208
        # and are trying to include the delta closure.
1209
        if include_delta_closure:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1210
            needed_from_fallback = set()
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1211
            # Build up reconstructable_keys dict.  key:True in this dict means
1212
            # the key can be reconstructed.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1213
            reconstructable_keys = {}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1214
            for key in keys:
1215
                # the delta chain
1216
                try:
1217
                    chain = [key, positions[key][2]]
1218
                except KeyError:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1219
                    needed_from_fallback.add(key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1220
                    continue
1221
                result = True
1222
                while chain[-1] is not None:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1223
                    if chain[-1] in reconstructable_keys:
1224
                        result = reconstructable_keys[chain[-1]]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1225
                        break
1226
                    else:
1227
                        try:
1228
                            chain.append(positions[chain[-1]][2])
1229
                        except KeyError:
1230
                            # missing basis component
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1231
                            needed_from_fallback.add(chain[-1])
1232
                            result = True
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1233
                            break
1234
                for chain_key in chain[:-1]:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1235
                    reconstructable_keys[chain_key] = result
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1236
                if not result:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1237
                    needed_from_fallback.add(key)
1238
        # Double index lookups here : need a unified api ?
3350.8.14 by Robert Collins
Review feedback.
1239
        global_map, parent_maps = self._get_parent_map_with_sources(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1240
        if ordering == 'topological':
1241
            # Global topological sort
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1242
            present_keys = tsort.topo_sort(global_map)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1243
            # Now group by source:
1244
            source_keys = []
1245
            current_source = None
1246
            for key in present_keys:
1247
                for parent_map in parent_maps:
1248
                    if key in parent_map:
1249
                        key_source = parent_map
1250
                        break
1251
                if current_source is not key_source:
1252
                    source_keys.append((key_source, []))
1253
                    current_source = key_source
1254
                source_keys[-1][1].append(key)
1255
        else:
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1256
            if ordering != 'unordered':
1257
                raise AssertionError('valid values for ordering are:'
1258
                    ' "unordered" or "topological" not: %r'
1259
                    % (ordering,))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1260
            # Just group by source; remote sources first.
1261
            present_keys = []
1262
            source_keys = []
1263
            for parent_map in reversed(parent_maps):
1264
                source_keys.append((parent_map, []))
1265
                for key in parent_map:
1266
                    present_keys.append(key)
1267
                    source_keys[-1][1].append(key)
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1268
            # We have been requested to return these records in an order that
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
1269
            # suits us. So we ask the index to give us an optimally sorted
1270
            # order.
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1271
            for source, sub_keys in source_keys:
1272
                if source is parent_maps[0]:
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
1273
                    # Only sort the keys for this VF
1274
                    self._index._sort_keys_by_io(sub_keys, positions)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1275
        absent_keys = keys - set(global_map)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1276
        for key in absent_keys:
1277
            yield AbsentContentFactory(key)
1278
        # restrict our view to the keys we can answer.
1279
        # XXX: Memory: TODO: batch data here to cap buffered data at (say) 1MB.
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1280
        # XXX: At that point we need to consider the impact of double reads by
1281
        # utilising components multiple times.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1282
        if include_delta_closure:
1283
            # XXX: get_content_maps performs its own index queries; allow state
1284
            # to be passed in.
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1285
            non_local_keys = needed_from_fallback - absent_keys
1286
            prefix_split_keys = self._split_by_prefix(present_keys)
1287
            prefix_split_non_local_keys = self._split_by_prefix(non_local_keys)
1288
            for prefix, keys in prefix_split_keys.iteritems():
1289
                non_local = prefix_split_non_local_keys.get(prefix, [])
1290
                non_local = set(non_local)
1291
                text_map, _ = self._get_content_maps(keys, non_local)
1292
                for key in keys:
1293
                    lines = text_map.pop(key)
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1294
                    yield ChunkedContentFactory(key, global_map[key], None,
1295
                                                lines)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1296
        else:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1297
            for source, keys in source_keys:
1298
                if source is parent_maps[0]:
1299
                    # this KnitVersionedFiles
1300
                    records = [(key, positions[key][1]) for key in keys]
1301
                    for key, raw_data, sha1 in self._read_records_iter_raw(records):
1302
                        (record_details, index_memo, _) = positions[key]
1303
                        yield KnitContentFactory(key, global_map[key],
1304
                            record_details, sha1, raw_data, self._factory.annotated, None)
1305
                else:
1306
                    vf = self._fallback_vfs[parent_maps.index(source) - 1]
1307
                    for record in vf.get_record_stream(keys, ordering,
1308
                        include_delta_closure):
1309
                        yield record
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1310
1311
    def get_sha1s(self, keys):
1312
        """See VersionedFiles.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1313
        missing = set(keys)
1314
        record_map = self._get_record_map(missing, allow_missing=True)
1315
        result = {}
1316
        for key, details in record_map.iteritems():
1317
            if key not in missing:
1318
                continue
1319
            # record entry 2 is the 'digest'.
1320
            result[key] = details[2]
1321
        missing.difference_update(set(result))
1322
        for source in self._fallback_vfs:
1323
            if not missing:
1324
                break
1325
            new_result = source.get_sha1s(missing)
1326
            result.update(new_result)
1327
            missing.difference_update(set(new_result))
1328
        return result
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1329
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1330
    def insert_record_stream(self, stream):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1331
        """Insert a record stream into this container.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1332
1333
        :param stream: A stream of records to insert. 
1334
        :return: None
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1335
        :seealso VersionedFiles.get_record_stream:
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1336
        """
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1337
        def get_adapter(adapter_key):
1338
            try:
1339
                return adapters[adapter_key]
1340
            except KeyError:
1341
                adapter_factory = adapter_registry.get(adapter_key)
1342
                adapter = adapter_factory(self)
1343
                adapters[adapter_key] = adapter
1344
                return adapter
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1345
        delta_types = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1346
        if self._factory.annotated:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1347
            # self is annotated, we need annotated knits to use directly.
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1348
            annotated = "annotated-"
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1349
            convertibles = []
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1350
        else:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1351
            # self is not annotated, but we can strip annotations cheaply.
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1352
            annotated = ""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1353
            convertibles = set(["knit-annotated-ft-gz"])
1354
            if self._max_delta_chain:
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1355
                delta_types.add("knit-annotated-delta-gz")
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1356
                convertibles.add("knit-annotated-delta-gz")
3350.3.22 by Robert Collins
Review feedback.
1357
        # The set of types we can cheaply adapt without needing basis texts.
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1358
        native_types = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1359
        if self._max_delta_chain:
1360
            native_types.add("knit-%sdelta-gz" % annotated)
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1361
            delta_types.add("knit-%sdelta-gz" % annotated)
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1362
        native_types.add("knit-%sft-gz" % annotated)
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1363
        knit_types = native_types.union(convertibles)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1364
        adapters = {}
3350.3.22 by Robert Collins
Review feedback.
1365
        # Buffer all index entries that we can't add immediately because their
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1366
        # basis parent is missing. We don't buffer all because generating
1367
        # annotations may require access to some of the new records. However we
1368
        # can't generate annotations from new deltas until their basis parent
1369
        # is present anyway, so we get away with not needing an index that
3350.3.22 by Robert Collins
Review feedback.
1370
        # includes the new keys.
3830.3.15 by Martin Pool
Check against all parents when deciding whether to store a fulltext in a stacked repository
1371
        #
1372
        # See <http://launchpad.net/bugs/300177> about ordering of compression
1373
        # parents in the records - to be conservative, we insist that all
1374
        # parents must be present to avoid expanding to a fulltext.
1375
        #
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1376
        # key = basis_parent, value = index entry to add
1377
        buffered_index_entries = {}
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1378
        for record in stream:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1379
            parents = record.parents
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1380
            if record.storage_kind in delta_types:
1381
                # TODO: eventually the record itself should track
1382
                #       compression_parent
1383
                compression_parent = parents[0]
1384
            else:
1385
                compression_parent = None
3350.3.15 by Robert Collins
Update the insert_record_stream contract to error if an absent record is provided.
1386
            # Raise an error when a record is missing.
1387
            if record.storage_kind == 'absent':
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1388
                raise RevisionNotPresent([record.key], self)
3830.3.15 by Martin Pool
Check against all parents when deciding whether to store a fulltext in a stacked repository
1389
            elif ((record.storage_kind in knit_types)
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1390
                  and (compression_parent is None
3830.3.18 by Martin Pool
Faster expression evaluation order
1391
                       or not self._fallback_vfs
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1392
                       or self._index.has_key(compression_parent)
1393
                       or not self.has_key(compression_parent))):
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
1394
                # we can insert the knit record literally if either it has no
1395
                # compression parent OR we already have its basis in this kvf
1396
                # OR the basis is not present even in the fallbacks.  In the
1397
                # last case it will either turn up later in the stream and all
1398
                # will be well, or it won't turn up at all and we'll raise an
1399
                # error at the end.
3830.3.13 by Martin Pool
review cleanups to insert_record_stream
1400
                #
1401
                # TODO: self.has_key is somewhat redundant with
1402
                # self._index.has_key; we really want something that directly
1403
                # asks if it's only present in the fallbacks. -- mbp 20081119
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1404
                if record.storage_kind not in native_types:
1405
                    try:
1406
                        adapter_key = (record.storage_kind, "knit-delta-gz")
1407
                        adapter = get_adapter(adapter_key)
1408
                    except KeyError:
1409
                        adapter_key = (record.storage_kind, "knit-ft-gz")
1410
                        adapter = get_adapter(adapter_key)
1411
                    bytes = adapter.get_bytes(
1412
                        record, record.get_bytes_as(record.storage_kind))
1413
                else:
1414
                    bytes = record.get_bytes_as(record.storage_kind)
1415
                options = [record._build_details[0]]
1416
                if record._build_details[1]:
1417
                    options.append('no-eol')
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1418
                # Just blat it across.
1419
                # Note: This does end up adding data on duplicate keys. As
1420
                # modern repositories use atomic insertions this should not
1421
                # lead to excessive growth in the event of interrupted fetches.
1422
                # 'knit' repositories may suffer excessive growth, but as a
1423
                # deprecated format this is tolerable. It can be fixed if
1424
                # needed by in the kndx index support raising on a duplicate
1425
                # add with identical parents and options.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1426
                access_memo = self._access.add_raw_records(
1427
                    [(record.key, len(bytes))], bytes)[0]
1428
                index_entry = (record.key, options, access_memo, parents)
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1429
                buffered = False
1430
                if 'fulltext' not in options:
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1431
                    # Not a fulltext, so we need to make sure the compression
1432
                    # parent will also be present.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1433
                    # Note that pack backed knits don't need to buffer here
1434
                    # because they buffer all writes to the transaction level,
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1435
                    # but we don't expose that difference at the index level. If
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1436
                    # the query here has sufficient cost to show up in
1437
                    # profiling we should do that.
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1438
                    #
3830.3.7 by Martin Pool
KnitVersionedFiles.insert_record_stream checks that compression parents are in the same kvf, not in a fallback
1439
                    # They're required to be physically in this
1440
                    # KnitVersionedFiles, not in a fallback.
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1441
                    if not self._index.has_key(compression_parent):
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1442
                        pending = buffered_index_entries.setdefault(
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1443
                            compression_parent, [])
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1444
                        pending.append(index_entry)
1445
                        buffered = True
1446
                if not buffered:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1447
                    self._index.add_records([index_entry])
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1448
            elif record.storage_kind == 'chunked':
1449
                self.add_lines(record.key, parents,
1450
                    osutils.chunks_to_lines(record.get_bytes_as('chunked')))
1451
            elif record.storage_kind == 'fulltext':
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
1452
                self.add_lines(record.key, parents,
1453
                    split_lines(record.get_bytes_as('fulltext')))
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1454
            else:
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
1455
                # Not a fulltext, and not suitable for direct insertion as a
3849.3.2 by Andrew Bennetts
Expand a comment inside insert_record_stream slightly.
1456
                # delta, either because it's not the right format, or this
1457
                # KnitVersionedFiles doesn't permit deltas (_max_delta_chain ==
1458
                # 0) or because it depends on a base only present in the
1459
                # fallback kvfs.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1460
                adapter_key = record.storage_kind, 'fulltext'
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1461
                adapter = get_adapter(adapter_key)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1462
                lines = split_lines(adapter.get_bytes(
1463
                    record, record.get_bytes_as(record.storage_kind)))
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1464
                try:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1465
                    self.add_lines(record.key, parents, lines)
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1466
                except errors.RevisionAlreadyPresent:
1467
                    pass
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1468
            # Add any records whose basis parent is now available.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1469
            added_keys = [record.key]
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1470
            while added_keys:
1471
                key = added_keys.pop(0)
1472
                if key in buffered_index_entries:
1473
                    index_entries = buffered_index_entries[key]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1474
                    self._index.add_records(index_entries)
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1475
                    added_keys.extend(
1476
                        [index_entry[0] for index_entry in index_entries])
1477
                    del buffered_index_entries[key]
1478
        # If there were any deltas which had a missing basis parent, error.
1479
        if buffered_index_entries:
3830.3.7 by Martin Pool
KnitVersionedFiles.insert_record_stream checks that compression parents are in the same kvf, not in a fallback
1480
            from pprint import pformat
1481
            raise errors.BzrCheckError(
1482
                "record_stream refers to compression parents not in %r:\n%s"
1483
                % (self, pformat(sorted(buffered_index_entries.keys()))))
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1484
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1485
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1486
        """Iterate over the lines in the versioned files from keys.
1487
1488
        This may return lines from other keys. Each item the returned
1489
        iterator yields is a tuple of a line and a text version that that line
1490
        is present in (not introduced in).
1491
1492
        Ordering of results is in whatever order is most suitable for the
1493
        underlying storage format.
1494
1495
        If a progress bar is supplied, it may be used to indicate progress.
1496
        The caller is responsible for cleaning up progress bars (because this
1497
        is an iterator).
1498
1499
        NOTES:
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1500
         * Lines are normalised by the underlying store: they will all have \\n
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1501
           terminators.
1502
         * Lines are returned in arbitrary order.
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1503
         * If a requested key did not change any lines (or didn't have any
1504
           lines), it may not be mentioned at all in the result.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1505
1506
        :return: An iterator over (line, key).
1507
        """
1508
        if pb is None:
1509
            pb = progress.DummyProgress()
1510
        keys = set(keys)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1511
        total = len(keys)
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1512
        done = False
1513
        while not done:
1514
            try:
1515
                # we don't care about inclusions, the caller cares.
1516
                # but we need to setup a list of records to visit.
1517
                # we need key, position, length
1518
                key_records = []
1519
                build_details = self._index.get_build_details(keys)
1520
                for key, details in build_details.iteritems():
1521
                    if key in keys:
1522
                        key_records.append((key, details[0]))
1523
                records_iter = enumerate(self._read_records_iter(key_records))
1524
                for (key_idx, (key, data, sha_value)) in records_iter:
1525
                    pb.update('Walking content.', key_idx, total)
1526
                    compression_parent = build_details[key][1]
1527
                    if compression_parent is None:
1528
                        # fulltext
1529
                        line_iterator = self._factory.get_fulltext_content(data)
1530
                    else:
1531
                        # Delta 
1532
                        line_iterator = self._factory.get_linedelta_content(data)
1533
                    # Now that we are yielding the data for this key, remove it
1534
                    # from the list
1535
                    keys.remove(key)
1536
                    # XXX: It might be more efficient to yield (key,
1537
                    # line_iterator) in the future. However for now, this is a
1538
                    # simpler change to integrate into the rest of the
1539
                    # codebase. RBC 20071110
1540
                    for line in line_iterator:
1541
                        yield line, key
1542
                done = True
1543
            except errors.RetryWithNewPacks, e:
1544
                self._access.reload_or_raise(e)
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1545
        # If there are still keys we've not yet found, we look in the fallback
1546
        # vfs, and hope to find them there.  Note that if the keys are found
1547
        # but had no changes or no content, the fallback may not return
1548
        # anything.  
1549
        if keys and not self._fallback_vfs:
1550
            # XXX: strictly the second parameter is meant to be the file id
1551
            # but it's not easily accessible here.
1552
            raise RevisionNotPresent(keys, repr(self))
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1553
        for source in self._fallback_vfs:
1554
            if not keys:
1555
                break
1556
            source_keys = set()
1557
            for line, key in source.iter_lines_added_or_present_in_keys(keys):
1558
                source_keys.add(key)
1559
                yield line, key
1560
            keys.difference_update(source_keys)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1561
        pb.update('Walking content.', total, total)
1562
1563
    def _make_line_delta(self, delta_seq, new_content):
1564
        """Generate a line delta from delta_seq and new_content."""
1565
        diff_hunks = []
1566
        for op in delta_seq.get_opcodes():
1567
            if op[0] == 'equal':
1568
                continue
1569
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1570
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1571
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1572
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1573
                           delta=None, annotated=None,
1574
                           left_matching_blocks=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1575
        """Merge annotations for content and generate deltas.
1576
        
1577
        This is done by comparing the annotations based on changes to the text
1578
        and generating a delta on the resulting full texts. If annotations are
1579
        not being created then a simple delta is created.
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
1580
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1581
        if left_matching_blocks is not None:
1582
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
1583
        else:
1584
            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.
1585
        if annotated:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1586
            for parent_key in parents:
1587
                merge_content = self._get_content(parent_key, parent_texts)
1588
                if (parent_key == parents[0] and delta_seq is not None):
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1589
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1590
                else:
1591
                    seq = patiencediff.PatienceSequenceMatcher(
1592
                        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.
1593
                for i, j, n in seq.get_matching_blocks():
1594
                    if n == 0:
1595
                        continue
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
1596
                    # this copies (origin, text) pairs across to the new
1597
                    # content for any line that matches the last-checked
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1598
                    # 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.
1599
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1600
            # XXX: Robert says the following block is a workaround for a
1601
            # now-fixed bug and it can probably be deleted. -- mbp 20080618
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1602
            if content._lines and content._lines[-1][1][-1] != '\n':
1603
                # The copied annotation was from a line without a trailing EOL,
1604
                # reinstate one for the content object, to ensure correct
1605
                # serialization.
1606
                line = content._lines[-1][1] + '\n'
1607
                content._lines[-1] = (content._lines[-1][0], line)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1608
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1609
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1610
                reference_content = self._get_content(parents[0], parent_texts)
1611
                new_texts = content.text()
1612
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
1613
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
1614
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1615
            return self._make_line_delta(delta_seq, content)
1616
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1617
    def _parse_record(self, version_id, data):
1618
        """Parse an original format knit record.
1619
1620
        These have the last element of the key only present in the stored data.
1621
        """
1622
        rec, record_contents = self._parse_record_unchecked(data)
1623
        self._check_header_version(rec, version_id)
1624
        return record_contents, rec[3]
1625
1626
    def _parse_record_header(self, key, raw_data):
1627
        """Parse a record header for consistency.
1628
1629
        :return: the header and the decompressor stream.
1630
                 as (stream, header_record)
1631
        """
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1632
        df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(raw_data))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1633
        try:
1634
            # Current serialise
1635
            rec = self._check_header(key, df.readline())
1636
        except Exception, e:
1637
            raise KnitCorrupt(self,
1638
                              "While reading {%s} got %s(%s)"
1639
                              % (key, e.__class__.__name__, str(e)))
1640
        return df, rec
1641
1642
    def _parse_record_unchecked(self, data):
1643
        # profiling notes:
1644
        # 4168 calls in 2880 217 internal
1645
        # 4168 calls to _parse_record_header in 2121
1646
        # 4168 calls to readlines in 330
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1647
        df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(data))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1648
        try:
1649
            record_contents = df.readlines()
1650
        except Exception, e:
1651
            raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
1652
                (data, e.__class__.__name__, str(e)))
1653
        header = record_contents.pop(0)
1654
        rec = self._split_header(header)
1655
        last_line = record_contents.pop()
1656
        if len(record_contents) != int(rec[2]):
1657
            raise KnitCorrupt(self,
1658
                              'incorrect number of lines %s != %s'
1659
                              ' for version {%s} %s'
1660
                              % (len(record_contents), int(rec[2]),
1661
                                 rec[1], record_contents))
1662
        if last_line != 'end %s\n' % rec[1]:
1663
            raise KnitCorrupt(self,
1664
                              'unexpected version end line %r, wanted %r' 
1665
                              % (last_line, rec[1]))
1666
        df.close()
1667
        return rec, record_contents
1668
1669
    def _read_records_iter(self, records):
1670
        """Read text records from data file and yield result.
1671
1672
        The result will be returned in whatever is the fastest to read.
1673
        Not by the order requested. Also, multiple requests for the same
1674
        record will only yield 1 response.
1675
        :param records: A list of (key, access_memo) entries
1676
        :return: Yields (key, contents, digest) in the order
1677
                 read, not the order requested
1678
        """
1679
        if not records:
1680
            return
1681
1682
        # XXX: This smells wrong, IO may not be getting ordered right.
1683
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1684
        if not needed_records:
1685
            return
1686
1687
        # The transport optimizes the fetching as well 
1688
        # (ie, reads continuous ranges.)
1689
        raw_data = self._access.get_raw_records(
1690
            [index_memo for key, index_memo in needed_records])
1691
1692
        for (key, index_memo), data in \
1693
                izip(iter(needed_records), raw_data):
1694
            content, digest = self._parse_record(key[-1], data)
1695
            yield key, content, digest
1696
1697
    def _read_records_iter_raw(self, records):
1698
        """Read text records from data file and yield raw data.
1699
1700
        This unpacks enough of the text record to validate the id is
1701
        as expected but thats all.
1702
1703
        Each item the iterator yields is (key, bytes, sha1_of_full_text).
1704
        """
1705
        # setup an iterator of the external records:
1706
        # uses readv so nice and fast we hope.
1707
        if len(records):
1708
            # grab the disk data needed.
1709
            needed_offsets = [index_memo for key, index_memo
1710
                                           in records]
1711
            raw_records = self._access.get_raw_records(needed_offsets)
1712
1713
        for key, index_memo in records:
1714
            data = raw_records.next()
1715
            # validate the header (note that we can only use the suffix in
1716
            # current knit records).
1717
            df, rec = self._parse_record_header(key, data)
1718
            df.close()
1719
            yield key, data, rec[3]
1720
1721
    def _record_to_data(self, key, digest, lines, dense_lines=None):
1722
        """Convert key, digest, lines into a raw data block.
1723
        
1724
        :param key: The key of the record. Currently keys are always serialised
1725
            using just the trailing component.
1726
        :param dense_lines: The bytes of lines but in a denser form. For
1727
            instance, if lines is a list of 1000 bytestrings each ending in \n,
1728
            dense_lines may be a list with one line in it, containing all the
1729
            1000's lines and their \n's. Using dense_lines if it is already
1730
            known is a win because the string join to create bytes in this
1731
            function spends less time resizing the final string.
1732
        :return: (len, a StringIO instance with the raw data ready to read.)
1733
        """
1734
        # Note: using a string copy here increases memory pressure with e.g.
1735
        # ISO's, but it is about 3 seconds faster on a 1.2Ghz intel machine
1736
        # when doing the initial commit of a mozilla tree. RBC 20070921
1737
        bytes = ''.join(chain(
1738
            ["version %s %d %s\n" % (key[-1],
1739
                                     len(lines),
1740
                                     digest)],
1741
            dense_lines or lines,
1742
            ["end %s\n" % key[-1]]))
1743
        if type(bytes) != str:
1744
            raise AssertionError(
1745
                'data must be plain bytes was %s' % type(bytes))
1746
        if lines and lines[-1][-1] != '\n':
1747
            raise ValueError('corrupt lines value %r' % lines)
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1748
        compressed_bytes = tuned_gzip.bytes_to_gzip(bytes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1749
        return len(compressed_bytes), compressed_bytes
1750
1751
    def _split_header(self, line):
1752
        rec = line.split()
1753
        if len(rec) != 4:
1754
            raise KnitCorrupt(self,
1755
                              'unexpected number of elements in record header')
1756
        return rec
1757
1758
    def keys(self):
1759
        """See VersionedFiles.keys."""
1760
        if 'evil' in debug.debug_flags:
1761
            trace.mutter_callsite(2, "keys scales with size of history")
3350.8.4 by Robert Collins
Vf.keys() stacking support.
1762
        sources = [self._index] + self._fallback_vfs
1763
        result = set()
1764
        for source in sources:
1765
            result.update(source.keys())
1766
        return result
1767
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1768
1769
class _KndxIndex(object):
1770
    """Manages knit index files
1771
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1772
    The index is kept in memory and read on startup, to enable
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1773
    fast lookups of revision information.  The cursor of the index
1774
    file is always pointing to the end, making it easy to append
1775
    entries.
1776
1777
    _cache is a cache for fast mapping from version id to a Index
1778
    object.
1779
1780
    _history is a cache for fast mapping from indexes to version ids.
1781
1782
    The index data format is dictionary compressed when it comes to
1783
    parent references; a index entry may only have parents that with a
1784
    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.
1785
1786
    Duplicate entries may be written to the index for a single version id
1787
    if this is done then the latter one completely replaces the former:
1788
    this allows updates to correct version and parent information. 
1789
    Note that the two entries may share the delta, and that successive
1790
    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.
1791
1792
    The index file on disc contains a header, followed by one line per knit
1793
    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).
1794
    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.
1795
    
1796
    The format of a single line is
1797
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1798
    REVISION_ID is a utf8-encoded revision id
1799
    FLAGS is a comma separated list of flags about the record. Values include 
1800
        no-eol, line-delta, fulltext.
1801
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1802
        that the the compressed data starts at.
1803
    LENGTH is the ascii representation of the length of the data file.
1804
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1805
        REVISION_ID.
1806
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1807
        revision id already in the knit that is a parent of REVISION_ID.
1808
    The ' :' marker is the end of record marker.
1809
    
1810
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1811
    when a write is interrupted to the index file, it will result in a line
1812
    that does not end in ' :'. If the ' :' is not present at the end of a line,
1813
    or at the end of the file, then the record that is missing it will be
1814
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1815
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1816
    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.
1817
    to ensure that records always start on new lines even if the last write was
1818
    interrupted. As a result its normal for the last line in the index to be
1819
    missing a trailing newline. One can be added with no harmful effects.
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1820
1821
    :ivar _kndx_cache: dict from prefix to the old state of KnitIndex objects,
1822
        where prefix is e.g. the (fileid,) for .texts instances or () for
1823
        constant-mapped things like .revisions, and the old state is
1824
        tuple(history_vector, cache_dict).  This is used to prevent having an
1825
        ABI change with the C extension that reads .kndx files.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1826
    """
1827
1666.1.6 by Robert Collins
Make knit the default format.
1828
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1829
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1830
    def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
1831
        """Create a _KndxIndex on transport using mapper."""
1832
        self._transport = transport
1833
        self._mapper = mapper
1834
        self._get_scope = get_scope
1835
        self._allow_writes = allow_writes
1836
        self._is_locked = is_locked
1837
        self._reset_cache()
1838
        self.has_graph = True
1839
1840
    def add_records(self, records, random_id=False):
1841
        """Add multiple records to the index.
1842
        
1843
        :param records: a list of tuples:
1844
                         (key, options, access_memo, parents).
1845
        :param random_id: If True the ids being added were randomly generated
1846
            and no check for existence will be performed.
1847
        """
1848
        paths = {}
1849
        for record in records:
1850
            key = record[0]
1851
            prefix = key[:-1]
1852
            path = self._mapper.map(key) + '.kndx'
1853
            path_keys = paths.setdefault(path, (prefix, []))
1854
            path_keys[1].append(record)
1855
        for path in sorted(paths):
1856
            prefix, path_keys = paths[path]
1857
            self._load_prefixes([prefix])
1858
            lines = []
1859
            orig_history = self._kndx_cache[prefix][1][:]
1860
            orig_cache = self._kndx_cache[prefix][0].copy()
1861
1862
            try:
1863
                for key, options, (_, pos, size), parents in path_keys:
1864
                    if parents is None:
1865
                        # kndx indices cannot be parentless.
1866
                        parents = ()
1867
                    line = "\n%s %s %s %s %s :" % (
1868
                        key[-1], ','.join(options), pos, size,
1869
                        self._dictionary_compress(parents))
1870
                    if type(line) != str:
1871
                        raise AssertionError(
1872
                            'data must be utf8 was %s' % type(line))
1873
                    lines.append(line)
1874
                    self._cache_key(key, options, pos, size, parents)
1875
                if len(orig_history):
1876
                    self._transport.append_bytes(path, ''.join(lines))
1877
                else:
1878
                    self._init_index(path, lines)
1879
            except:
1880
                # If any problems happen, restore the original values and re-raise
1881
                self._kndx_cache[prefix] = (orig_cache, orig_history)
1882
                raise
1883
1884
    def _cache_key(self, key, options, pos, size, parent_keys):
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1885
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1886
1887
        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.
1888
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1889
         indexes).
1890
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1891
        prefix = key[:-1]
1892
        version_id = key[-1]
1893
        # last-element only for compatibilty with the C load_data.
1894
        parents = tuple(parent[-1] for parent in parent_keys)
1895
        for parent in parent_keys:
1896
            if parent[:-1] != prefix:
1897
                raise ValueError("mismatched prefixes for %r, %r" % (
1898
                    key, parent_keys))
1899
        cache, history = self._kndx_cache[prefix]
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1900
        # only want the _history index to reference the 1st index entry
1901
        # for version_id
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1902
        if version_id not in cache:
1903
            index = len(history)
1904
            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
1905
        else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1906
            index = cache[version_id][5]
1907
        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
1908
                                   options,
1909
                                   pos,
1910
                                   size,
1911
                                   parents,
1912
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1913
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1914
    def check_header(self, fp):
1915
        line = fp.readline()
1916
        if line == '':
1917
            # An empty file can actually be treated as though the file doesn't
1918
            # exist yet.
1919
            raise errors.NoSuchFile(self)
1920
        if line != self.HEADER:
1921
            raise KnitHeaderError(badline=line, filename=self)
1922
1923
    def _check_read(self):
1924
        if not self._is_locked():
1925
            raise errors.ObjectNotLocked(self)
1926
        if self._get_scope() != self._scope:
1927
            self._reset_cache()
1928
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1929
    def _check_write_ok(self):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1930
        """Assert if not writes are permitted."""
1931
        if not self._is_locked():
1932
            raise errors.ObjectNotLocked(self)
3316.2.5 by Robert Collins
Review feedback.
1933
        if self._get_scope() != self._scope:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1934
            self._reset_cache()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1935
        if self._mode != 'w':
1936
            raise errors.ReadOnlyObjectDirtiedError(self)
1937
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1938
    def get_build_details(self, keys):
1939
        """Get the method, index_memo and compression parent for keys.
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1940
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
1941
        Ghosts are omitted from the result.
1942
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1943
        :param keys: An iterable of keys.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1944
        :return: A dict of key:(index_memo, compression_parent, parents,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1945
            record_details).
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1946
            index_memo
1947
                opaque structure to pass to read_records to extract the raw
1948
                data
1949
            compression_parent
1950
                Content that this record is built upon, may be None
1951
            parents
1952
                Logical parents of this node
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1953
            record_details
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1954
                extra information about the content which needs to be passed to
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1955
                Factory.parse_record
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1956
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1957
        parent_map = self.get_parent_map(keys)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1958
        result = {}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1959
        for key in keys:
1960
            if key not in parent_map:
1961
                continue # Ghost
1962
            method = self.get_method(key)
1963
            parents = parent_map[key]
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1964
            if method == 'fulltext':
1965
                compression_parent = None
1966
            else:
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
1967
                compression_parent = parents[0]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1968
            noeol = 'no-eol' in self.get_options(key)
1969
            index_memo = self.get_position(key)
1970
            result[key] = (index_memo, compression_parent,
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1971
                                  parents, (method, noeol))
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1972
        return result
1973
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1974
    def get_method(self, key):
1975
        """Return compression method of specified key."""
1976
        options = self.get_options(key)
1977
        if 'fulltext' in options:
1978
            return 'fulltext'
1979
        elif 'line-delta' in options:
1980
            return 'line-delta'
1981
        else:
1982
            raise errors.KnitIndexUnknownMethod(self, options)
1983
1984
    def get_options(self, key):
1985
        """Return a list representing options.
1986
1987
        e.g. ['foo', 'bar']
1988
        """
1989
        prefix, suffix = self._split_key(key)
1990
        self._load_prefixes([prefix])
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1991
        try:
1992
            return self._kndx_cache[prefix][0][suffix][1]
1993
        except KeyError:
1994
            raise RevisionNotPresent(key, self)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1995
1996
    def get_parent_map(self, keys):
1997
        """Get a map of the parents of keys.
1998
1999
        :param keys: The keys to look up parents for.
2000
        :return: A mapping from keys to parents. Absent keys are absent from
2001
            the mapping.
2002
        """
2003
        # Parse what we need to up front, this potentially trades off I/O
2004
        # locality (.kndx and .knit in the same block group for the same file
2005
        # id) for less checking in inner loops.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2006
        prefixes = set(key[:-1] for key in keys)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2007
        self._load_prefixes(prefixes)
2008
        result = {}
2009
        for key in keys:
2010
            prefix = key[:-1]
2011
            try:
2012
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2013
            except KeyError:
2014
                pass
2015
            else:
2016
                result[key] = tuple(prefix + (suffix,) for
2017
                    suffix in suffix_parents)
2018
        return result
2019
2020
    def get_position(self, key):
2021
        """Return details needed to access the version.
2022
        
2023
        :return: a tuple (key, data position, size) to hand to the access
2024
            logic to get the record.
2025
        """
2026
        prefix, suffix = self._split_key(key)
2027
        self._load_prefixes([prefix])
2028
        entry = self._kndx_cache[prefix][0][suffix]
2029
        return key, entry[2], entry[3]
2030
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2031
    has_key = _mod_index._has_key_from_parent_map
2032
    
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2033
    def _init_index(self, path, extra_lines=[]):
2034
        """Initialize an index."""
2035
        sio = StringIO()
2036
        sio.write(self.HEADER)
2037
        sio.writelines(extra_lines)
2038
        sio.seek(0)
2039
        self._transport.put_file_non_atomic(path, sio,
2040
                            create_parent_dir=True)
2041
                           # self._create_parent_dir)
2042
                           # mode=self._file_mode,
2043
                           # dir_mode=self._dir_mode)
2044
2045
    def keys(self):
2046
        """Get all the keys in the collection.
2047
        
2048
        The keys are not ordered.
2049
        """
2050
        result = set()
2051
        # Identify all key prefixes.
2052
        # XXX: A bit hacky, needs polish.
2053
        if type(self._mapper) == ConstantMapper:
2054
            prefixes = [()]
2055
        else:
2056
            relpaths = set()
2057
            for quoted_relpath in self._transport.iter_files_recursive():
2058
                path, ext = os.path.splitext(quoted_relpath)
2059
                relpaths.add(path)
2060
            prefixes = [self._mapper.unmap(path) for path in relpaths]
2061
        self._load_prefixes(prefixes)
2062
        for prefix in prefixes:
2063
            for suffix in self._kndx_cache[prefix][1]:
2064
                result.add(prefix + (suffix,))
2065
        return result
2066
    
2067
    def _load_prefixes(self, prefixes):
2068
        """Load the indices for prefixes."""
2069
        self._check_read()
2070
        for prefix in prefixes:
2071
            if prefix not in self._kndx_cache:
2072
                # the load_data interface writes to these variables.
2073
                self._cache = {}
2074
                self._history = []
2075
                self._filename = prefix
2076
                try:
2077
                    path = self._mapper.map(prefix) + '.kndx'
2078
                    fp = self._transport.get(path)
2079
                    try:
2080
                        # _load_data may raise NoSuchFile if the target knit is
2081
                        # completely empty.
2082
                        _load_data(self, fp)
2083
                    finally:
2084
                        fp.close()
2085
                    self._kndx_cache[prefix] = (self._cache, self._history)
2086
                    del self._cache
2087
                    del self._filename
2088
                    del self._history
2089
                except NoSuchFile:
2090
                    self._kndx_cache[prefix] = ({}, [])
2091
                    if type(self._mapper) == ConstantMapper:
2092
                        # preserve behaviour for revisions.kndx etc.
2093
                        self._init_index(path)
2094
                    del self._cache
2095
                    del self._filename
2096
                    del self._history
2097
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2098
    missing_keys = _mod_index._missing_keys_from_parent_map
2099
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2100
    def _partition_keys(self, keys):
2101
        """Turn keys into a dict of prefix:suffix_list."""
2102
        result = {}
2103
        for key in keys:
2104
            prefix_keys = result.setdefault(key[:-1], [])
2105
            prefix_keys.append(key[-1])
2106
        return result
2107
2108
    def _dictionary_compress(self, keys):
2109
        """Dictionary compress keys.
2110
        
2111
        :param keys: The keys to generate references to.
2112
        :return: A string representation of keys. keys which are present are
2113
            dictionary compressed, and others are emitted as fulltext with a
2114
            '.' prefix.
2115
        """
2116
        if not keys:
2117
            return ''
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2118
        result_list = []
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2119
        prefix = keys[0][:-1]
2120
        cache = self._kndx_cache[prefix][0]
2121
        for key in keys:
2122
            if key[:-1] != prefix:
2123
                # kndx indices cannot refer across partitioned storage.
2124
                raise ValueError("mismatched prefixes for %r" % keys)
2125
            if key[-1] in cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
2126
                # -- inlined lookup() --
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2127
                result_list.append(str(cache[key[-1]][5]))
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
2128
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2129
            else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2130
                result_list.append('.' + key[-1])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2131
        return ' '.join(result_list)
2132
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2133
    def _reset_cache(self):
2134
        # Possibly this should be a LRU cache. A dictionary from key_prefix to
2135
        # (cache_dict, history_vector) for parsed kndx files.
2136
        self._kndx_cache = {}
2137
        self._scope = self._get_scope()
2138
        allow_writes = self._allow_writes()
2139
        if allow_writes:
2140
            self._mode = 'w'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2141
        else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2142
            self._mode = 'r'
2143
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2144
    def _sort_keys_by_io(self, keys, positions):
2145
        """Figure out an optimal order to read the records for the given keys.
2146
2147
        Sort keys, grouped by index and sorted by position.
2148
2149
        :param keys: A list of keys whose records we want to read. This will be
2150
            sorted 'in-place'.
2151
        :param positions: A dict, such as the one returned by
2152
            _get_components_positions()
2153
        :return: None
2154
        """
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2155
        def get_sort_key(key):
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2156
            index_memo = positions[key][1]
2157
            # Group by prefix and position. index_memo[0] is the key, so it is
2158
            # (file_id, revision_id) and we don't want to sort on revision_id,
2159
            # index_memo[1] is the position, and index_memo[2] is the size,
2160
            # which doesn't matter for the sort
2161
            return index_memo[0][:-1], index_memo[1]
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2162
        return keys.sort(key=get_sort_key)
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2163
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2164
    def _split_key(self, key):
2165
        """Split key into a prefix and suffix."""
2166
        return key[:-1], key[-1]
2167
2168
2169
class _KnitGraphIndex(object):
2170
    """A KnitVersionedFiles index layered on GraphIndex."""
2171
2172
    def __init__(self, graph_index, is_locked, deltas=False, parents=True,
2173
        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.
2174
        """Construct a KnitGraphIndex on a graph_index.
2175
2176
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2177
        :param is_locked: A callback to check whether the object should answer
2178
            queries.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2179
        :param deltas: Allow delta-compressed records.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2180
        :param parents: If True, record knits parents, if not do not record 
2181
            parents.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2182
        :param add_callback: If not None, allow additions to the index and call
2183
            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.
2184
            [(node, value, node_refs), ...]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2185
        :param is_locked: A callback, returns True if the index is locked and
2186
            thus usable.
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.
2187
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2188
        self._add_callback = add_callback
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.
2189
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2190
        self._deltas = deltas
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2191
        self._parents = parents
2192
        if deltas and not parents:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2193
            # XXX: TODO: Delta tree and parent graph should be conceptually
2194
            # separate.
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2195
            raise KnitCorrupt(self, "Cannot do delta compression without "
2196
                "parent tracking.")
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2197
        self.has_graph = parents
2198
        self._is_locked = is_locked
2199
3517.4.13 by Martin Pool
Add repr methods
2200
    def __repr__(self):
2201
        return "%s(%r)" % (self.__class__.__name__, self._graph_index)
2202
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2203
    def add_records(self, records, random_id=False):
2204
        """Add multiple records to the index.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2205
        
2206
        This function does not insert data into the Immutable GraphIndex
2207
        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.
2208
        the caller and checks that it is safe to insert then calls
2209
        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.
2210
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2211
        :param records: a list of tuples:
2212
                         (key, options, access_memo, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2213
        :param random_id: If True the ids being added were randomly generated
2214
            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.
2215
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2216
        if not self._add_callback:
2217
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2218
        # we hope there are no repositories with inconsistent parentage
2219
        # anymore.
2220
2221
        keys = {}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2222
        for (key, options, access_memo, parents) in records:
2223
            if self._parents:
2224
                parents = tuple(parents)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2225
            index, pos, size = access_memo
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2226
            if 'no-eol' in options:
2227
                value = 'N'
2228
            else:
2229
                value = ' '
2230
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2231
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2232
                if 'line-delta' in options:
2233
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2234
            if self._parents:
2235
                if self._deltas:
2236
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2237
                        node_refs = (parents, (parents[0],))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2238
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2239
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2240
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2241
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2242
            else:
2243
                if parents:
2244
                    raise KnitCorrupt(self, "attempt to add node with parents "
2245
                        "in parentless index.")
2246
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2247
            keys[key] = (value, node_refs)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2248
        # check for dups
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2249
        if not random_id:
2250
            present_nodes = self._get_entries(keys)
2251
            for (index, key, value, node_refs) in present_nodes:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2252
                if (value[0] != keys[key][0][0] or
3946.2.2 by Jelmer Vernooij
Remove matching test, fix handling of parentless indexes.
2253
                    node_refs[:1] != keys[key][1][:1]):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2254
                    raise KnitCorrupt(self, "inconsistent details in add_records"
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2255
                        ": %s %s" % ((value, node_refs), keys[key]))
2256
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2257
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2258
        if self._parents:
2259
            for key, (value, node_refs) in keys.iteritems():
2260
                result.append((key, value, node_refs))
2261
        else:
2262
            for key, (value, node_refs) in keys.iteritems():
2263
                result.append((key, value))
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2264
        self._add_callback(result)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2265
        
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2266
    def _check_read(self):
2267
        """raise if reads are not permitted."""
2268
        if not self._is_locked():
2269
            raise errors.ObjectNotLocked(self)
2270
2271
    def _check_write_ok(self):
2272
        """Assert if writes are not permitted."""
2273
        if not self._is_locked():
2274
            raise errors.ObjectNotLocked(self)
2275
2276
    def _compression_parent(self, an_entry):
2277
        # return the key that an_entry is compressed against, or None
2278
        # Grab the second parent list (as deltas implies parents currently)
2279
        compression_parents = an_entry[3][1]
2280
        if not compression_parents:
2281
            return None
2282
        if len(compression_parents) != 1:
2283
            raise AssertionError(
2284
                "Too many compression parents: %r" % compression_parents)
2285
        return compression_parents[0]
2286
2287
    def get_build_details(self, keys):
2288
        """Get the method, index_memo and compression parent for version_ids.
2289
2290
        Ghosts are omitted from the result.
2291
2292
        :param keys: An iterable of keys.
2293
        :return: A dict of key:
2294
            (index_memo, compression_parent, parents, record_details).
2295
            index_memo
2296
                opaque structure to pass to read_records to extract the raw
2297
                data
2298
            compression_parent
2299
                Content that this record is built upon, may be None
2300
            parents
2301
                Logical parents of this node
2302
            record_details
2303
                extra information about the content which needs to be passed to
2304
                Factory.parse_record
2305
        """
2306
        self._check_read()
2307
        result = {}
2308
        entries = self._get_entries(keys, False)
2309
        for entry in entries:
2310
            key = entry[1]
2311
            if not self._parents:
2312
                parents = ()
2313
            else:
2314
                parents = entry[3][0]
2315
            if not self._deltas:
2316
                compression_parent_key = None
2317
            else:
2318
                compression_parent_key = self._compression_parent(entry)
2319
            noeol = (entry[2][0] == 'N')
2320
            if compression_parent_key:
2321
                method = 'line-delta'
2322
            else:
2323
                method = 'fulltext'
2324
            result[key] = (self._node_to_position(entry),
2325
                                  compression_parent_key, parents,
2326
                                  (method, noeol))
2327
        return result
2328
2329
    def _get_entries(self, keys, check_present=False):
2330
        """Get the entries for keys.
2331
        
2332
        :param keys: An iterable of index key tuples.
2333
        """
2334
        keys = set(keys)
2335
        found_keys = set()
2336
        if self._parents:
2337
            for node in self._graph_index.iter_entries(keys):
2338
                yield node
2339
                found_keys.add(node[1])
2340
        else:
2341
            # adapt parentless index to the rest of the code.
2342
            for node in self._graph_index.iter_entries(keys):
2343
                yield node[0], node[1], node[2], ()
2344
                found_keys.add(node[1])
2345
        if check_present:
2346
            missing_keys = keys.difference(found_keys)
2347
            if missing_keys:
2348
                raise RevisionNotPresent(missing_keys.pop(), self)
2349
2350
    def get_method(self, key):
2351
        """Return compression method of specified key."""
2352
        return self._get_method(self._get_node(key))
2353
2354
    def _get_method(self, node):
2355
        if not self._deltas:
2356
            return 'fulltext'
2357
        if self._compression_parent(node):
2358
            return 'line-delta'
2359
        else:
2360
            return 'fulltext'
2361
2362
    def _get_node(self, key):
2363
        try:
2364
            return list(self._get_entries([key]))[0]
2365
        except IndexError:
2366
            raise RevisionNotPresent(key, self)
2367
2368
    def get_options(self, key):
2369
        """Return a list representing options.
2370
2371
        e.g. ['foo', 'bar']
2372
        """
2373
        node = self._get_node(key)
2374
        options = [self._get_method(node)]
2375
        if node[2][0] == 'N':
2376
            options.append('no-eol')
2377
        return options
2378
2379
    def get_parent_map(self, keys):
2380
        """Get a map of the parents of keys.
2381
2382
        :param keys: The keys to look up parents for.
2383
        :return: A mapping from keys to parents. Absent keys are absent from
2384
            the mapping.
2385
        """
2386
        self._check_read()
2387
        nodes = self._get_entries(keys)
2388
        result = {}
2389
        if self._parents:
2390
            for node in nodes:
2391
                result[node[1]] = node[3][0]
2392
        else:
2393
            for node in nodes:
2394
                result[node[1]] = None
2395
        return result
2396
2397
    def get_position(self, key):
2398
        """Return details needed to access the version.
2399
        
2400
        :return: a tuple (index, data position, size) to hand to the access
2401
            logic to get the record.
2402
        """
2403
        node = self._get_node(key)
2404
        return self._node_to_position(node)
2405
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2406
    has_key = _mod_index._has_key_from_parent_map
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
2407
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2408
    def keys(self):
2409
        """Get all the keys in the collection.
2410
        
2411
        The keys are not ordered.
2412
        """
2413
        self._check_read()
2414
        return [node[1] for node in self._graph_index.iter_all_entries()]
2415
    
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2416
    missing_keys = _mod_index._missing_keys_from_parent_map
2417
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2418
    def _node_to_position(self, node):
2419
        """Convert an index value to position details."""
2420
        bits = node[2][1:].split(' ')
2421
        return node[0], int(bits[0]), int(bits[1])
2422
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2423
    def _sort_keys_by_io(self, keys, positions):
2424
        """Figure out an optimal order to read the records for the given keys.
2425
2426
        Sort keys, grouped by index and sorted by position.
2427
2428
        :param keys: A list of keys whose records we want to read. This will be
2429
            sorted 'in-place'.
2430
        :param positions: A dict, such as the one returned by
2431
            _get_components_positions()
2432
        :return: None
2433
        """
2434
        def get_index_memo(key):
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2435
            # index_memo is at offset [1]. It is made up of (GraphIndex,
2436
            # position, size). GI is an object, which will be unique for each
2437
            # pack file. This causes us to group by pack file, then sort by
2438
            # position. Size doesn't matter, but it isn't worth breaking up the
2439
            # tuple.
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2440
            return positions[key][1]
2441
        return keys.sort(key=get_index_memo)
2442
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2443
2444
class _KnitKeyAccess(object):
2445
    """Access to records in .knit files."""
2446
2447
    def __init__(self, transport, mapper):
2448
        """Create a _KnitKeyAccess with transport and mapper.
2449
2450
        :param transport: The transport the access object is rooted at.
2451
        :param mapper: The mapper used to map keys to .knit files.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2452
        """
2453
        self._transport = transport
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2454
        self._mapper = mapper
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2455
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2456
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2457
        """Add raw knit bytes to a storage area.
2458
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2459
        The data is spooled to the container writer in one bytes-record per
2460
        raw data item.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2461
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2462
        :param sizes: An iterable of tuples containing the key and size of each
2463
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2464
        :param raw_data: A bytestring containing the data.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2465
        :return: A list of memos to retrieve the record later. Each memo is an
2466
            opaque index memo. For _KnitKeyAccess the memo is (key, pos,
2467
            length), where the key is the record key.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2468
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2469
        if type(raw_data) != str:
2470
            raise AssertionError(
2471
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2472
        result = []
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2473
        offset = 0
2474
        # TODO: This can be tuned for writing to sftp and other servers where
2475
        # append() is relatively expensive by grouping the writes to each key
2476
        # prefix.
2477
        for key, size in key_sizes:
2478
            path = self._mapper.map(key)
2479
            try:
2480
                base = self._transport.append_bytes(path + '.knit',
2481
                    raw_data[offset:offset+size])
2482
            except errors.NoSuchFile:
2483
                self._transport.mkdir(osutils.dirname(path))
2484
                base = self._transport.append_bytes(path + '.knit',
2485
                    raw_data[offset:offset+size])
2486
            # if base == 0:
2487
            # chmod.
2488
            offset += size
2489
            result.append((key, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2490
        return result
2491
2492
    def get_raw_records(self, memos_for_retrieval):
2493
        """Get the raw bytes for a records.
2494
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2495
        :param memos_for_retrieval: An iterable containing the access memo for
2496
            retrieving the bytes.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2497
        :return: An iterator over the bytes of the records.
2498
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2499
        # first pass, group into same-index request to minimise readv's issued.
2500
        request_lists = []
2501
        current_prefix = None
2502
        for (key, offset, length) in memos_for_retrieval:
2503
            if current_prefix == key[:-1]:
2504
                current_list.append((offset, length))
2505
            else:
2506
                if current_prefix is not None:
2507
                    request_lists.append((current_prefix, current_list))
2508
                current_prefix = key[:-1]
2509
                current_list = [(offset, length)]
2510
        # handle the last entry
2511
        if current_prefix is not None:
2512
            request_lists.append((current_prefix, current_list))
2513
        for prefix, read_vector in request_lists:
2514
            path = self._mapper.map(prefix) + '.knit'
2515
            for pos, data in self._transport.readv(path, read_vector):
2516
                yield data
2517
2518
2519
class _DirectPackAccess(object):
2520
    """Access to data in one or more packs with less translation."""
2521
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2522
    def __init__(self, index_to_packs, reload_func=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2523
        """Create a _DirectPackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2524
2525
        :param index_to_packs: A dict mapping index objects to the transport
2526
            and file names for obtaining data.
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2527
        :param reload_func: A function to call if we determine that the pack
2528
            files have moved and we need to reload our caches. See
2529
            bzrlib.repo_fmt.pack_repo.AggregateIndex for more details.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2530
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2531
        self._container_writer = None
2532
        self._write_index = None
2533
        self._indices = index_to_packs
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2534
        self._reload_func = reload_func
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2535
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2536
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2537
        """Add raw knit bytes to a storage area.
2538
2670.2.3 by Robert Collins
Review feedback.
2539
        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.
2540
        raw data item.
2541
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2542
        :param sizes: An iterable of tuples containing the key and size of each
2543
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2544
        :param raw_data: A bytestring containing the data.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2545
        :return: A list of memos to retrieve the record later. Each memo is an
2546
            opaque index memo. For _DirectPackAccess the memo is (index, pos,
2547
            length), where the index field is the write_index object supplied
2548
            to the PackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2549
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2550
        if type(raw_data) != str:
2551
            raise AssertionError(
2552
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2553
        result = []
2554
        offset = 0
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2555
        for key, size in key_sizes:
2556
            p_offset, p_length = self._container_writer.add_bytes_record(
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2557
                raw_data[offset:offset+size], [])
2558
            offset += size
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2559
            result.append((self._write_index, p_offset, p_length))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2560
        return result
2561
2562
    def get_raw_records(self, memos_for_retrieval):
2563
        """Get the raw bytes for a records.
2564
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2565
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2566
            length) memo for retrieving the bytes. The Pack access method
2567
            looks up the pack to use for a given record in its index_to_pack
2568
            map.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2569
        :return: An iterator over the bytes of the records.
2570
        """
2571
        # first pass, group into same-index requests
2572
        request_lists = []
2573
        current_index = None
2574
        for (index, offset, length) in memos_for_retrieval:
2575
            if current_index == index:
2576
                current_list.append((offset, length))
2577
            else:
2578
                if current_index is not None:
2579
                    request_lists.append((current_index, current_list))
2580
                current_index = index
2581
                current_list = [(offset, length)]
2582
        # handle the last entry
2583
        if current_index is not None:
2584
            request_lists.append((current_index, current_list))
2585
        for index, offsets in request_lists:
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2586
            try:
2587
                transport, path = self._indices[index]
2588
            except KeyError:
2589
                # A KeyError here indicates that someone has triggered an index
2590
                # reload, and this index has gone missing, we need to start
2591
                # over.
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2592
                if self._reload_func is None:
2593
                    # If we don't have a _reload_func there is nothing that can
2594
                    # be done
2595
                    raise
3789.2.28 by John Arbash Meinel
We don't actually have a transport yet, so we can't use it as context.
2596
                raise errors.RetryWithNewPacks(index,
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
2597
                                               reload_occurred=True,
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2598
                                               exc_info=sys.exc_info())
2599
            try:
2600
                reader = pack.make_readv_reader(transport, path, offsets)
2601
                for names, read_func in reader.iter_records():
2602
                    yield read_func(None)
2603
            except errors.NoSuchFile:
2604
                # A NoSuchFile error indicates that a pack file has gone
2605
                # missing on disk, we need to trigger a reload, and start over.
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2606
                if self._reload_func is None:
2607
                    raise
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
2608
                raise errors.RetryWithNewPacks(transport.abspath(path),
2609
                                               reload_occurred=False,
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2610
                                               exc_info=sys.exc_info())
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2611
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2612
    def set_writer(self, writer, index, transport_packname):
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2613
        """Set a writer to use for adding data."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
2614
        if index is not None:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2615
            self._indices[index] = transport_packname
2616
        self._container_writer = writer
2617
        self._write_index = index
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2618
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2619
    def reload_or_raise(self, retry_exc):
2620
        """Try calling the reload function, or re-raise the original exception.
2621
2622
        This should be called after _DirectPackAccess raises a
2623
        RetryWithNewPacks exception. This function will handle the common logic
2624
        of determining when the error is fatal versus being temporary.
2625
        It will also make sure that the original exception is raised, rather
2626
        than the RetryWithNewPacks exception.
2627
2628
        If this function returns, then the calling function should retry
2629
        whatever operation was being performed. Otherwise an exception will
2630
        be raised.
2631
2632
        :param retry_exc: A RetryWithNewPacks exception.
2633
        """
3789.2.6 by John Arbash Meinel
Make _DirectPackAccess.reload_or_raise maintain the logic.
2634
        is_error = False
2635
        if self._reload_func is None:
2636
            is_error = True
2637
        elif not self._reload_func():
2638
            # The reload claimed that nothing changed
2639
            if not retry_exc.reload_occurred:
2640
                # If there wasn't an earlier reload, then we really were
2641
                # expecting to find changes. We didn't find them, so this is a
2642
                # hard error
2643
                is_error = True
2644
        if is_error:
2645
            exc_class, exc_value, exc_traceback = retry_exc.exc_info
2646
            raise exc_class, exc_value, exc_traceback
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2647
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2648
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
2649
# Deprecated, use PatienceSequenceMatcher instead
2650
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2651
2652
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2653
def annotate_knit(knit, revision_id):
2654
    """Annotate a knit with no cached annotations.
2655
2656
    This implementation is for knits with no cached annotations.
2657
    It will work for knits with cached annotations, but this is not
2658
    recommended.
2659
    """
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2660
    annotator = _KnitAnnotator(knit)
3224.1.25 by John Arbash Meinel
Quick change to the _KnitAnnotator api to use .annotate() instead of get_annotated_lines()
2661
    return iter(annotator.annotate(revision_id))
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2662
2663
2664
class _KnitAnnotator(object):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2665
    """Build up the annotations for a text."""
2666
2667
    def __init__(self, knit):
2668
        self._knit = knit
2669
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2670
        # Content objects, differs from fulltexts because of how final newlines
2671
        # are treated by knits. the content objects here will always have a
2672
        # final newline
2673
        self._fulltext_contents = {}
2674
2675
        # Annotated lines of specific revisions
2676
        self._annotated_lines = {}
2677
2678
        # Track the raw data for nodes that we could not process yet.
2679
        # This maps the revision_id of the base to a list of children that will
2680
        # annotated from it.
2681
        self._pending_children = {}
2682
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2683
        # Nodes which cannot be extracted
2684
        self._ghosts = set()
2685
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2686
        # Track how many children this node has, so we know if we need to keep
2687
        # it
2688
        self._annotate_children = {}
2689
        self._compression_children = {}
2690
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2691
        self._all_build_details = {}
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2692
        # The children => parent revision_id graph
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2693
        self._revision_id_graph = {}
2694
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2695
        self._heads_provider = None
2696
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2697
        self._nodes_to_keep_annotations = set()
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2698
        self._generations_until_keep = 100
2699
2700
    def set_generations_until_keep(self, value):
2701
        """Set the number of generations before caching a node.
2702
2703
        Setting this to -1 will cache every merge node, setting this higher
2704
        will cache fewer nodes.
2705
        """
2706
        self._generations_until_keep = value
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2707
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2708
    def _add_fulltext_content(self, revision_id, content_obj):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2709
        self._fulltext_contents[revision_id] = content_obj
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2710
        # TODO: jam 20080305 It might be good to check the sha1digest here
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2711
        return content_obj.text()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2712
2713
    def _check_parents(self, child, nodes_to_annotate):
2714
        """Check if all parents have been processed.
2715
2716
        :param child: A tuple of (rev_id, parents, raw_content)
2717
        :param nodes_to_annotate: If child is ready, add it to
2718
            nodes_to_annotate, otherwise put it back in self._pending_children
2719
        """
2720
        for parent_id in child[1]:
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2721
            if (parent_id not in self._annotated_lines):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2722
                # This parent is present, but another parent is missing
2723
                self._pending_children.setdefault(parent_id,
2724
                                                  []).append(child)
2725
                break
2726
        else:
2727
            # This one is ready to be processed
2728
            nodes_to_annotate.append(child)
2729
2730
    def _add_annotation(self, revision_id, fulltext, parent_ids,
2731
                        left_matching_blocks=None):
2732
        """Add an annotation entry.
2733
2734
        All parents should already have been annotated.
2735
        :return: A list of children that now have their parents satisfied.
2736
        """
2737
        a = self._annotated_lines
2738
        annotated_parent_lines = [a[p] for p in parent_ids]
2739
        annotated_lines = list(annotate.reannotate(annotated_parent_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2740
            fulltext, revision_id, left_matching_blocks,
2741
            heads_provider=self._get_heads_provider()))
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2742
        self._annotated_lines[revision_id] = annotated_lines
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2743
        for p in parent_ids:
2744
            ann_children = self._annotate_children[p]
2745
            ann_children.remove(revision_id)
2746
            if (not ann_children
2747
                and p not in self._nodes_to_keep_annotations):
2748
                del self._annotated_lines[p]
2749
                del self._all_build_details[p]
2750
                if p in self._fulltext_contents:
2751
                    del self._fulltext_contents[p]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2752
        # Now that we've added this one, see if there are any pending
2753
        # deltas to be done, certainly this parent is finished
2754
        nodes_to_annotate = []
2755
        for child in self._pending_children.pop(revision_id, []):
2756
            self._check_parents(child, nodes_to_annotate)
2757
        return nodes_to_annotate
2758
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2759
    def _get_build_graph(self, key):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2760
        """Get the graphs for building texts and annotations.
2761
2762
        The data you need for creating a full text may be different than the
2763
        data you need to annotate that text. (At a minimum, you need both
2764
        parents to create an annotation, but only need 1 parent to generate the
2765
        fulltext.)
2766
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2767
        :return: A list of (key, index_memo) records, suitable for
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2768
            passing to read_records_iter to start reading in the raw data fro/
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2769
            the pack file.
2770
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2771
        if key in self._annotated_lines:
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2772
            # Nothing to do
2773
            return []
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2774
        pending = set([key])
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2775
        records = []
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2776
        generation = 0
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2777
        kept_generation = 0
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2778
        while pending:
2779
            # get all pending nodes
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2780
            generation += 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2781
            this_iteration = pending
2782
            build_details = self._knit._index.get_build_details(this_iteration)
2783
            self._all_build_details.update(build_details)
2784
            # new_nodes = self._knit._index._get_entries(this_iteration)
2785
            pending = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2786
            for key, details in build_details.iteritems():
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2787
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2788
                 record_details) = details
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2789
                self._revision_id_graph[key] = parents
2790
                records.append((key, index_memo))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2791
                # Do we actually need to check _annotated_lines?
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2792
                pending.update(p for p in parents
2793
                                 if p not in self._all_build_details)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2794
                if compression_parent:
2795
                    self._compression_children.setdefault(compression_parent,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2796
                        []).append(key)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2797
                if parents:
2798
                    for parent in parents:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2799
                        self._annotate_children.setdefault(parent,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2800
                            []).append(key)
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2801
                    num_gens = generation - kept_generation
2802
                    if ((num_gens >= self._generations_until_keep)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2803
                        and len(parents) > 1):
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2804
                        kept_generation = generation
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2805
                        self._nodes_to_keep_annotations.add(key)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2806
2807
            missing_versions = this_iteration.difference(build_details.keys())
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2808
            self._ghosts.update(missing_versions)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2809
            for missing_version in missing_versions:
2810
                # add a key, no parents
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2811
                self._revision_id_graph[missing_version] = ()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2812
                pending.discard(missing_version) # don't look for it
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2813
        if self._ghosts.intersection(self._compression_children):
2814
            raise KnitCorrupt(
2815
                "We cannot have nodes which have a ghost compression parent:\n"
2816
                "ghosts: %r\n"
2817
                "compression children: %r"
2818
                % (self._ghosts, self._compression_children))
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2819
        # Cleanout anything that depends on a ghost so that we don't wait for
2820
        # the ghost to show up
2821
        for node in self._ghosts:
2822
            if node in self._annotate_children:
2823
                # We won't be building this node
2824
                del self._annotate_children[node]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2825
        # Generally we will want to read the records in reverse order, because
2826
        # we find the parent nodes after the children
2827
        records.reverse()
2828
        return records
2829
2830
    def _annotate_records(self, records):
2831
        """Build the annotations for the listed records."""
2832
        # We iterate in the order read, rather than a strict order requested
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2833
        # However, process what we can, and put off to the side things that
2834
        # still need parents, cleaning them up when those parents are
2835
        # processed.
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2836
        for (rev_id, record,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2837
             digest) in self._knit._read_records_iter(records):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2838
            if rev_id in self._annotated_lines:
2839
                continue
2840
            parent_ids = self._revision_id_graph[rev_id]
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2841
            parent_ids = [p for p in parent_ids if p not in self._ghosts]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2842
            details = self._all_build_details[rev_id]
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2843
            (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2844
             record_details) = details
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2845
            nodes_to_annotate = []
2846
            # TODO: Remove the punning between compression parents, and
2847
            #       parent_ids, we should be able to do this without assuming
2848
            #       the build order
2849
            if len(parent_ids) == 0:
2850
                # There are no parents for this node, so just add it
2851
                # TODO: This probably needs to be decoupled
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2852
                fulltext_content, delta = self._knit._factory.parse_record(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2853
                    rev_id, record, record_details, None)
2854
                fulltext = self._add_fulltext_content(rev_id, fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2855
                nodes_to_annotate.extend(self._add_annotation(rev_id, fulltext,
2856
                    parent_ids, left_matching_blocks=None))
2857
            else:
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2858
                child = (rev_id, parent_ids, record)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2859
                # Check if all the parents are present
2860
                self._check_parents(child, nodes_to_annotate)
2861
            while nodes_to_annotate:
2862
                # Should we use a queue here instead of a stack?
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2863
                (rev_id, parent_ids, record) = nodes_to_annotate.pop()
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2864
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2865
                 record_details) = self._all_build_details[rev_id]
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2866
                blocks = None
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2867
                if compression_parent is not None:
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2868
                    comp_children = self._compression_children[compression_parent]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2869
                    if rev_id not in comp_children:
2870
                        raise AssertionError("%r not in compression children %r"
2871
                            % (rev_id, comp_children))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2872
                    # If there is only 1 child, it is safe to reuse this
2873
                    # content
2874
                    reuse_content = (len(comp_children) == 1
2875
                        and compression_parent not in
2876
                            self._nodes_to_keep_annotations)
2877
                    if reuse_content:
2878
                        # Remove it from the cache since it will be changing
2879
                        parent_fulltext_content = self._fulltext_contents.pop(compression_parent)
2880
                        # Make sure to copy the fulltext since it might be
2881
                        # modified
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2882
                        parent_fulltext = list(parent_fulltext_content.text())
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2883
                    else:
2884
                        parent_fulltext_content = self._fulltext_contents[compression_parent]
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2885
                        parent_fulltext = parent_fulltext_content.text()
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2886
                    comp_children.remove(rev_id)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2887
                    fulltext_content, delta = self._knit._factory.parse_record(
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2888
                        rev_id, record, record_details,
2889
                        parent_fulltext_content,
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2890
                        copy_base_content=(not reuse_content))
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2891
                    fulltext = self._add_fulltext_content(rev_id,
2892
                                                          fulltext_content)
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2893
                    if compression_parent == parent_ids[0]:
2894
                        # the compression_parent is the left parent, so we can
2895
                        # re-use the delta
2896
                        blocks = KnitContent.get_line_delta_blocks(delta,
2897
                                parent_fulltext, fulltext)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2898
                else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2899
                    fulltext_content = self._knit._factory.parse_fulltext(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2900
                        record, rev_id)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2901
                    fulltext = self._add_fulltext_content(rev_id,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2902
                        fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2903
                nodes_to_annotate.extend(
2904
                    self._add_annotation(rev_id, fulltext, parent_ids,
2905
                                     left_matching_blocks=blocks))
2906
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2907
    def _get_heads_provider(self):
2908
        """Create a heads provider for resolving ancestry issues."""
2909
        if self._heads_provider is not None:
2910
            return self._heads_provider
2911
        parent_provider = _mod_graph.DictParentsProvider(
2912
            self._revision_id_graph)
2913
        graph_obj = _mod_graph.Graph(parent_provider)
3224.1.20 by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers
2914
        head_cache = _mod_graph.FrozenHeadsCache(graph_obj)
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2915
        self._heads_provider = head_cache
2916
        return head_cache
2917
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2918
    def annotate(self, key):
2919
        """Return the annotated fulltext at the given key.
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2920
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2921
        :param key: The key to annotate.
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2922
        """
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2923
        if len(self._knit._fallback_vfs) > 0:
3517.4.1 by Martin Pool
Merge unoptimized annotate code for stacking, and only use it when needed
2924
            # stacked knits can't use the fast path at present.
2925
            return self._simple_annotate(key)
3789.2.13 by John Arbash Meinel
KnitVersionedFile.annotate() now retries when appropriate.
2926
        while True:
2927
            try:
2928
                records = self._get_build_graph(key)
2929
                if key in self._ghosts:
2930
                    raise errors.RevisionNotPresent(key, self._knit)
2931
                self._annotate_records(records)
2932
                return self._annotated_lines[key]
2933
            except errors.RetryWithNewPacks, e:
2934
                self._knit._access.reload_or_raise(e)
2935
                # The cached build_details are no longer valid
2936
                self._all_build_details.clear()
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2937
3517.4.1 by Martin Pool
Merge unoptimized annotate code for stacking, and only use it when needed
2938
    def _simple_annotate(self, key):
2939
        """Return annotated fulltext, rediffing from the full texts.
2940
2941
        This is slow but makes no assumptions about the repository
2942
        being able to produce line deltas.
2943
        """
2944
        # TODO: this code generates a parent maps of present ancestors; it
2945
        # could be split out into a separate method, and probably should use
2946
        # iter_ancestry instead. -- mbp and robertc 20080704
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
2947
        graph = _mod_graph.Graph(self._knit)
3350.9.1 by Robert Collins
Redo annotate more simply, using just the public interfaces for VersionedFiles.
2948
        head_cache = _mod_graph.FrozenHeadsCache(graph)
2949
        search = graph._make_breadth_first_searcher([key])
2950
        keys = set()
2951
        while True:
2952
            try:
2953
                present, ghosts = search.next_with_ghosts()
2954
            except StopIteration:
2955
                break
2956
            keys.update(present)
2957
        parent_map = self._knit.get_parent_map(keys)
2958
        parent_cache = {}
2959
        reannotate = annotate.reannotate
2960
        for record in self._knit.get_record_stream(keys, 'topological', True):
2961
            key = record.key
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
2962
            fulltext = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
3517.4.2 by Martin Pool
Make simple-annotation and graph code more tolerant of knits with no graph
2963
            parents = parent_map[key]
2964
            if parents is not None:
2965
                parent_lines = [parent_cache[parent] for parent in parent_map[key]]
2966
            else:
2967
                parent_lines = []
3350.9.1 by Robert Collins
Redo annotate more simply, using just the public interfaces for VersionedFiles.
2968
            parent_cache[key] = list(
2969
                reannotate(parent_lines, fulltext, key, None, head_cache))
3517.4.2 by Martin Pool
Make simple-annotation and graph code more tolerant of knits with no graph
2970
        try:
2971
            return parent_cache[key]
2972
        except KeyError, e:
2973
            raise errors.RevisionNotPresent(key, self._knit)
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2974
2975
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2976
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
2977
    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.
2978
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
2979
    from bzrlib._knit_load_data_py import _load_data_py as _load_data