/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
3735.2.5 by Robert Collins
Teach VersionedFiles how to allocate keys based on content hashes.
809
        for element in key[:-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.
810
            if type(element) != str:
811
                raise TypeError("key contains non-strings: %r" % (key,))
3735.2.5 by Robert Collins
Teach VersionedFiles how to allocate keys based on content hashes.
812
        if key[-1] is None:
813
            key = key[:-1] + ('sha1:' + digest,)
814
        elif type(key[-1]) != str:
815
                raise TypeError("key contains non-strings: %r" % (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.
816
        # Knit hunks are still last-element only
817
        version_id = key[-1]
818
        content = self._factory.make(lines, version_id)
819
        if 'no-eol' in options:
820
            # Hint to the content object that its text() call should strip the
821
            # EOL.
822
            content._should_strip_eol = True
823
        if delta or (self._factory.annotated and len(present_parents) > 0):
824
            # Merge annotations from parent texts if needed.
825
            delta_hunks = self._merge_annotations(content, present_parents,
826
                parent_texts, delta, self._factory.annotated,
827
                left_matching_blocks)
828
829
        if delta:
830
            options.append('line-delta')
831
            store_lines = self._factory.lower_line_delta(delta_hunks)
832
            size, bytes = self._record_to_data(key, digest,
833
                store_lines)
834
        else:
835
            options.append('fulltext')
836
            # isinstance is slower and we have no hierarchy.
837
            if self._factory.__class__ == KnitPlainFactory:
838
                # Use the already joined bytes saving iteration time in
839
                # _record_to_data.
840
                size, bytes = self._record_to_data(key, digest,
841
                    lines, [line_bytes])
842
            else:
843
                # get mixed annotation + content and feed it into the
844
                # serialiser.
845
                store_lines = self._factory.lower_fulltext(content)
846
                size, bytes = self._record_to_data(key, digest,
847
                    store_lines)
848
849
        access_memo = self._access.add_raw_records([(key, size)], bytes)[0]
850
        self._index.add_records(
851
            ((key, options, access_memo, parents),),
852
            random_id=random_id)
853
        return digest, text_length, content
854
855
    def annotate(self, key):
856
        """See VersionedFiles.annotate."""
857
        return self._factory.annotate(self, key)
858
859
    def check(self, progress_bar=None):
860
        """See VersionedFiles.check()."""
861
        # This doesn't actually test extraction of everything, but that will
862
        # impact 'bzr check' substantially, and needs to be integrated with
863
        # care. However, it does check for the obvious problem of a delta with
864
        # no basis.
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
865
        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.
866
        parent_map = self.get_parent_map(keys)
867
        for key in keys:
868
            if self._index.get_method(key) != 'fulltext':
869
                compression_parent = parent_map[key][0]
870
                if compression_parent not in parent_map:
871
                    raise errors.KnitCorrupt(self,
872
                        "Missing basis parent %s for %s" % (
873
                        compression_parent, key))
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
874
        for fallback_vfs in self._fallback_vfs:
875
            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.
876
877
    def _check_add(self, key, lines, random_id, check_content):
878
        """check that version_id and lines are safe to add."""
3350.6.10 by Martin Pool
VersionedFiles review cleanups
879
        version_id = key[-1]
3735.2.5 by Robert Collins
Teach VersionedFiles how to allocate keys based on content hashes.
880
        if version_id is not None:
881
            if contains_whitespace(version_id):
882
                raise InvalidRevisionId(version_id, self)
883
            self.check_not_reserved_id(version_id)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
884
        # TODO: If random_id==False and the key is already present, we should
885
        # probably check that the existing content is identical to what is
886
        # being inserted, and otherwise raise an exception.  This would make
887
        # 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.
888
        if check_content:
889
            self._check_lines_not_unicode(lines)
890
            self._check_lines_are_lines(lines)
891
892
    def _check_header(self, key, line):
893
        rec = self._split_header(line)
894
        self._check_header_version(rec, key[-1])
895
        return rec
896
897
    def _check_header_version(self, rec, version_id):
898
        """Checks the header version on original format knit records.
899
        
900
        These have the last component of the key embedded in the record.
901
        """
902
        if rec[1] != version_id:
903
            raise KnitCorrupt(self,
904
                'unexpected version, wanted %r, got %r' % (version_id, rec[1]))
905
906
    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
907
        """Iterate back through the parent listing, looking for a fulltext.
908
909
        This is used when we want to decide whether to add a delta or a new
910
        fulltext. It searches for _max_delta_chain parents. When it finds a
911
        fulltext parent, it sees if the total size of the deltas leading up to
912
        it is large enough to indicate that we want a new full text anyway.
913
914
        Return True if we should create a new delta, False if we should use a
915
        full text.
916
        """
917
        delta_size = 0
918
        fulltext_size = None
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
919
        for count in xrange(self._max_delta_chain):
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
920
            try:
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
921
                # Note that this only looks in the index of this particular
922
                # KnitVersionedFiles, not in the fallbacks.  This ensures that
923
                # we won't store a delta spanning physical repository
924
                # boundaries.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
925
                build_details = self._index.get_build_details([parent])
926
                parent_details = build_details[parent]
3973.1.1 by John Arbash Meinel
Trivially fix a bug in _check_should_delta when a parent is not present.
927
            except (RevisionNotPresent, KeyError), e:
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
928
                # Some basis is not locally present: always fulltext
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
929
                return False
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
930
            index_memo, compression_parent, _, _ = parent_details
931
            _, _, size = index_memo
932
            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
933
                fulltext_size = size
934
                break
935
            delta_size += size
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
936
            # We don't explicitly check for presence because this is in an
937
            # 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.
938
            parent = compression_parent
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
939
        else:
940
            # 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
941
            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.
942
        # Simple heuristic - if the total I/O wold be greater as a delta than
943
        # the originally installed fulltext, we create a new fulltext.
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
944
        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
945
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.
946
    def _build_details_to_components(self, build_details):
947
        """Convert a build_details tuple to a position tuple."""
948
        # record_details, access_memo, compression_parent
949
        return build_details[3], build_details[0], build_details[1]
950
3350.6.10 by Martin Pool
VersionedFiles review cleanups
951
    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.
952
        """Produce a map of position data for the components of keys.
953
954
        This data is intended to be used for retrieving the knit records.
955
956
        A dict of key to (record_details, index_memo, next, parents) is
957
        returned.
958
        method is the way referenced data should be applied.
959
        index_memo is the handle to pass to the data access to actually get the
960
            data
961
        next is the build-parent of the version, or None for fulltexts.
962
        parents is the version_ids of the parents of this version
963
3350.6.10 by Martin Pool
VersionedFiles review cleanups
964
        :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.
965
            just ignore it.
966
        """
967
        component_data = {}
968
        pending_components = keys
969
        while pending_components:
970
            build_details = self._index.get_build_details(pending_components)
971
            current_components = set(pending_components)
972
            pending_components = set()
973
            for key, details in build_details.iteritems():
974
                (index_memo, compression_parent, parents,
975
                 record_details) = details
976
                method = record_details[0]
977
                if compression_parent is not None:
978
                    pending_components.add(compression_parent)
979
                component_data[key] = self._build_details_to_components(details)
980
            missing = current_components.difference(build_details)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
981
            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.
982
                raise errors.RevisionNotPresent(missing.pop(), self)
983
        return component_data
984
       
985
    def _get_content(self, key, parent_texts={}):
986
        """Returns a content object that makes up the specified
987
        version."""
988
        cached_version = parent_texts.get(key, None)
989
        if cached_version is not None:
990
            # Ensure the cache dict is valid.
991
            if not self.get_parent_map([key]):
992
                raise RevisionNotPresent(key, self)
993
            return cached_version
994
        text_map, contents_map = self._get_content_maps([key])
995
        return contents_map[key]
996
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
997
    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.
998
        """Produce maps of text and KnitContents
999
        
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1000
        :param keys: The keys to produce content maps for.
1001
        :param nonlocal_keys: An iterable of keys(possibly intersecting keys)
1002
            which are known to not be in this knit, but rather in one of the
1003
            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.
1004
        :return: (text_map, content_map) where text_map contains the texts for
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1005
            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.
1006
        """
1007
        # FUTURE: This function could be improved for the 'extract many' case
1008
        # by tracking each component and only doing the copy when the number of
1009
        # children than need to apply delta's to it is > 1 or it is part of the
1010
        # final output.
1011
        keys = list(keys)
1012
        multiple_versions = len(keys) != 1
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1013
        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.
1014
1015
        text_map = {}
1016
        content_map = {}
1017
        final_content = {}
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1018
        if nonlocal_keys is None:
1019
            nonlocal_keys = set()
1020
        else:
1021
            nonlocal_keys = frozenset(nonlocal_keys)
1022
        missing_keys = set(nonlocal_keys)
1023
        for source in self._fallback_vfs:
1024
            if not missing_keys:
1025
                break
1026
            for record in source.get_record_stream(missing_keys,
1027
                'unordered', True):
1028
                if record.storage_kind == 'absent':
1029
                    continue
1030
                missing_keys.remove(record.key)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1031
                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!).
1032
                text_map[record.key] = lines
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1033
                content_map[record.key] = PlainKnitContent(lines, record.key)
1034
                if record.key in keys:
1035
                    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.
1036
        for key in keys:
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
1037
            if key in nonlocal_keys:
1038
                # already handled
1039
                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.
1040
            components = []
1041
            cursor = key
1042
            while cursor is not None:
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1043
                try:
1044
                    record, record_details, digest, next = record_map[cursor]
1045
                except KeyError:
1046
                    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.
1047
                components.append((cursor, record, record_details, digest))
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1048
                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.
1049
                if cursor in content_map:
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1050
                    # no need to plan further back
1051
                    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.
1052
                    break
1053
1054
            content = None
1055
            for (component_id, record, record_details,
1056
                 digest) in reversed(components):
1057
                if component_id in content_map:
1058
                    content = content_map[component_id]
1059
                else:
1060
                    content, delta = self._factory.parse_record(key[-1],
1061
                        record, record_details, content,
1062
                        copy_base_content=multiple_versions)
1063
                    if multiple_versions:
1064
                        content_map[component_id] = content
1065
1066
            final_content[key] = content
1067
1068
            # digest here is the digest from the last applied component.
1069
            text = content.text()
1070
            actual_sha = sha_strings(text)
1071
            if actual_sha != digest:
3787.1.1 by Robert Collins
Embed the failed text in sha1 knit errors.
1072
                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.
1073
            text_map[key] = text
1074
        return text_map, final_content
1075
1076
    def get_parent_map(self, keys):
3517.4.17 by Martin Pool
Redo base Repository.get_parent_map to use .revisions graph
1077
        """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.
1078
1079
        :param keys: The keys to look up parents for.
1080
        :return: A mapping from keys to parents. Absent keys are absent from
1081
            the mapping.
1082
        """
3350.8.14 by Robert Collins
Review feedback.
1083
        return self._get_parent_map_with_sources(keys)[0]
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1084
3350.8.14 by Robert Collins
Review feedback.
1085
    def _get_parent_map_with_sources(self, keys):
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1086
        """Get a map of the parents of keys.
1087
1088
        :param keys: The keys to look up parents for.
1089
        :return: A tuple. The first element is a mapping from keys to parents.
1090
            Absent keys are absent from the mapping. The second element is a
1091
            list with the locations each key was found in. The first element
1092
            is the in-this-knit parents, the second the first fallback source,
1093
            and so on.
1094
        """
3350.8.2 by Robert Collins
stacked get_parent_map.
1095
        result = {}
1096
        sources = [self._index] + self._fallback_vfs
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1097
        source_results = []
3350.8.2 by Robert Collins
stacked get_parent_map.
1098
        missing = set(keys)
1099
        for source in sources:
1100
            if not missing:
1101
                break
1102
            new_result = source.get_parent_map(missing)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1103
            source_results.append(new_result)
3350.8.2 by Robert Collins
stacked get_parent_map.
1104
            result.update(new_result)
1105
            missing.difference_update(set(new_result))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1106
        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.
1107
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1108
    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.
1109
        """Produce a dictionary of knit records.
1110
        
1111
        :return: {key:(record, record_details, digest, next)}
1112
            record
1113
                data returned from read_records
1114
            record_details
1115
                opaque information to pass to parse_record
1116
            digest
1117
                SHA1 digest of the full text after all steps are done
1118
            next
1119
                build-parent of the version, i.e. the leftmost ancestor.
1120
                Will be None if the record is not a delta.
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1121
        :param keys: The keys to build a map for
1122
        :param allow_missing: If some records are missing, rather than 
1123
            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.
1124
        """
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1125
        # This retries the whole request if anything fails. Potentially we
1126
        # could be a bit more selective. We could track the keys whose records
1127
        # we have successfully found, and then only request the new records
1128
        # from there. However, _get_components_positions grabs the whole build
1129
        # chain, which means we'll likely try to grab the same records again
1130
        # anyway. Also, can the build chains change as part of a pack
1131
        # 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.
1132
        while True:
1133
            try:
1134
                position_map = self._get_components_positions(keys,
1135
                    allow_missing=allow_missing)
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1136
                # key = component_id, r = record_details, i_m = index_memo,
1137
                # n = next
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1138
                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.
1139
                                       in position_map.iteritems()]
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1140
                record_map = {}
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1141
                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.
1142
                    (record_details, index_memo, next) = position_map[key]
1143
                    record_map[key] = record, record_details, digest, next
1144
                return record_map
1145
            except errors.RetryWithNewPacks, e:
1146
                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.
1147
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1148
    def _split_by_prefix(self, keys):
1149
        """For the given keys, split them up based on their prefix.
1150
1151
        To keep memory pressure somewhat under control, split the
1152
        requests back into per-file-id requests, otherwise "bzr co"
1153
        extracts the full tree into memory before writing it to disk.
1154
        This should be revisited if _get_content_maps() can ever cross
1155
        file-id boundaries.
1156
1157
        :param keys: An iterable of key tuples
1158
        :return: A dict of {prefix: [key_list]}
1159
        """
1160
        split_by_prefix = {}
1161
        for key in keys:
1162
            if len(key) == 1:
1163
                split_by_prefix.setdefault('', []).append(key)
1164
            else:
1165
                split_by_prefix.setdefault(key[0], []).append(key)
1166
        return split_by_prefix
1167
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.
1168
    def get_record_stream(self, keys, ordering, include_delta_closure):
1169
        """Get a stream of records for keys.
1170
1171
        :param keys: The keys to include.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1172
        :param ordering: Either 'unordered' or 'topological'. A topologically
1173
            sorted stream has compression parents strictly before their
1174
            children.
1175
        :param include_delta_closure: If True then the closure across any
1176
            compression parents will be included (in the opaque data).
1177
        :return: An iterator of ContentFactory objects, each of which is only
1178
            valid until the iterator is advanced.
1179
        """
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.
1180
        # keys might be a generator
1181
        keys = set(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1182
        if not keys:
1183
            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.
1184
        if not self._index.has_graph:
1185
            # Cannot topological order when no graph has been stored.
1186
            ordering = 'unordered'
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1187
1188
        remaining_keys = keys
1189
        while True:
1190
            try:
1191
                keys = set(remaining_keys)
1192
                for content_factory in self._get_remaining_record_stream(keys,
1193
                                            ordering, include_delta_closure):
1194
                    remaining_keys.discard(content_factory.key)
1195
                    yield content_factory
1196
                return
1197
            except errors.RetryWithNewPacks, e:
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1198
                self._access.reload_or_raise(e)
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1199
1200
    def _get_remaining_record_stream(self, keys, ordering,
1201
                                     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.
1202
        """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.
1203
        if include_delta_closure:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1204
            positions = self._get_components_positions(keys, allow_missing=True)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1205
        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.
1206
            build_details = self._index.get_build_details(keys)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1207
            # map from key to
1208
            # (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.
1209
            positions = dict((key, self._build_details_to_components(details))
1210
                for key, details in build_details.iteritems())
1211
        absent_keys = keys.difference(set(positions))
1212
        # There may be more absent keys : if we're missing the basis component
1213
        # and are trying to include the delta closure.
1214
        if include_delta_closure:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1215
            needed_from_fallback = set()
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1216
            # Build up reconstructable_keys dict.  key:True in this dict means
1217
            # the key can be reconstructed.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1218
            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.
1219
            for key in keys:
1220
                # the delta chain
1221
                try:
1222
                    chain = [key, positions[key][2]]
1223
                except KeyError:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1224
                    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.
1225
                    continue
1226
                result = True
1227
                while chain[-1] is not None:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1228
                    if chain[-1] in reconstructable_keys:
1229
                        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.
1230
                        break
1231
                    else:
1232
                        try:
1233
                            chain.append(positions[chain[-1]][2])
1234
                        except KeyError:
1235
                            # missing basis component
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1236
                            needed_from_fallback.add(chain[-1])
1237
                            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.
1238
                            break
1239
                for chain_key in chain[:-1]:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1240
                    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.
1241
                if not result:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1242
                    needed_from_fallback.add(key)
1243
        # Double index lookups here : need a unified api ?
3350.8.14 by Robert Collins
Review feedback.
1244
        global_map, parent_maps = self._get_parent_map_with_sources(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1245
        if ordering == 'topological':
1246
            # Global topological sort
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1247
            present_keys = tsort.topo_sort(global_map)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1248
            # Now group by source:
1249
            source_keys = []
1250
            current_source = None
1251
            for key in present_keys:
1252
                for parent_map in parent_maps:
1253
                    if key in parent_map:
1254
                        key_source = parent_map
1255
                        break
1256
                if current_source is not key_source:
1257
                    source_keys.append((key_source, []))
1258
                    current_source = key_source
1259
                source_keys[-1][1].append(key)
1260
        else:
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1261
            if ordering != 'unordered':
1262
                raise AssertionError('valid values for ordering are:'
1263
                    ' "unordered" or "topological" not: %r'
1264
                    % (ordering,))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1265
            # Just group by source; remote sources first.
1266
            present_keys = []
1267
            source_keys = []
1268
            for parent_map in reversed(parent_maps):
1269
                source_keys.append((parent_map, []))
1270
                for key in parent_map:
1271
                    present_keys.append(key)
1272
                    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.
1273
            # 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.
1274
            # suits us. So we ask the index to give us an optimally sorted
1275
            # order.
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1276
            for source, sub_keys in source_keys:
1277
                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.
1278
                    # Only sort the keys for this VF
1279
                    self._index._sort_keys_by_io(sub_keys, positions)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1280
        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.
1281
        for key in absent_keys:
1282
            yield AbsentContentFactory(key)
1283
        # restrict our view to the keys we can answer.
1284
        # 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.
1285
        # XXX: At that point we need to consider the impact of double reads by
1286
        # 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.
1287
        if include_delta_closure:
1288
            # XXX: get_content_maps performs its own index queries; allow state
1289
            # to be passed in.
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1290
            non_local_keys = needed_from_fallback - absent_keys
1291
            prefix_split_keys = self._split_by_prefix(present_keys)
1292
            prefix_split_non_local_keys = self._split_by_prefix(non_local_keys)
1293
            for prefix, keys in prefix_split_keys.iteritems():
1294
                non_local = prefix_split_non_local_keys.get(prefix, [])
1295
                non_local = set(non_local)
1296
                text_map, _ = self._get_content_maps(keys, non_local)
1297
                for key in keys:
1298
                    lines = text_map.pop(key)
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1299
                    yield ChunkedContentFactory(key, global_map[key], None,
1300
                                                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.
1301
        else:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1302
            for source, keys in source_keys:
1303
                if source is parent_maps[0]:
1304
                    # this KnitVersionedFiles
1305
                    records = [(key, positions[key][1]) for key in keys]
1306
                    for key, raw_data, sha1 in self._read_records_iter_raw(records):
1307
                        (record_details, index_memo, _) = positions[key]
1308
                        yield KnitContentFactory(key, global_map[key],
1309
                            record_details, sha1, raw_data, self._factory.annotated, None)
1310
                else:
1311
                    vf = self._fallback_vfs[parent_maps.index(source) - 1]
1312
                    for record in vf.get_record_stream(keys, ordering,
1313
                        include_delta_closure):
1314
                        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.
1315
1316
    def get_sha1s(self, keys):
1317
        """See VersionedFiles.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1318
        missing = set(keys)
1319
        record_map = self._get_record_map(missing, allow_missing=True)
1320
        result = {}
1321
        for key, details in record_map.iteritems():
1322
            if key not in missing:
1323
                continue
1324
            # record entry 2 is the 'digest'.
1325
            result[key] = details[2]
1326
        missing.difference_update(set(result))
1327
        for source in self._fallback_vfs:
1328
            if not missing:
1329
                break
1330
            new_result = source.get_sha1s(missing)
1331
            result.update(new_result)
1332
            missing.difference_update(set(new_result))
1333
        return result
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1334
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1335
    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.
1336
        """Insert a record stream into this container.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1337
1338
        :param stream: A stream of records to insert. 
1339
        :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.
1340
        :seealso VersionedFiles.get_record_stream:
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1341
        """
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1342
        def get_adapter(adapter_key):
1343
            try:
1344
                return adapters[adapter_key]
1345
            except KeyError:
1346
                adapter_factory = adapter_registry.get(adapter_key)
1347
                adapter = adapter_factory(self)
1348
                adapters[adapter_key] = adapter
1349
                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.
1350
        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.
1351
        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.
1352
            # 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.
1353
            annotated = "annotated-"
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1354
            convertibles = []
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1355
        else:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1356
            # 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.
1357
            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.
1358
            convertibles = set(["knit-annotated-ft-gz"])
1359
            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.
1360
                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.
1361
                convertibles.add("knit-annotated-delta-gz")
3350.3.22 by Robert Collins
Review feedback.
1362
        # 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.
1363
        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.
1364
        if self._max_delta_chain:
1365
            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.
1366
            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.
1367
        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.
1368
        knit_types = native_types.union(convertibles)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1369
        adapters = {}
3350.3.22 by Robert Collins
Review feedback.
1370
        # 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.
1371
        # basis parent is missing. We don't buffer all because generating
1372
        # annotations may require access to some of the new records. However we
1373
        # can't generate annotations from new deltas until their basis parent
1374
        # is present anyway, so we get away with not needing an index that
3350.3.22 by Robert Collins
Review feedback.
1375
        # 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
1376
        #
1377
        # See <http://launchpad.net/bugs/300177> about ordering of compression
1378
        # parents in the records - to be conservative, we insist that all
1379
        # parents must be present to avoid expanding to a fulltext.
1380
        #
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1381
        # key = basis_parent, value = index entry to add
1382
        buffered_index_entries = {}
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1383
        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.
1384
            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.
1385
            if record.storage_kind in delta_types:
1386
                # TODO: eventually the record itself should track
1387
                #       compression_parent
1388
                compression_parent = parents[0]
1389
            else:
1390
                compression_parent = None
3350.3.15 by Robert Collins
Update the insert_record_stream contract to error if an absent record is provided.
1391
            # Raise an error when a record is missing.
1392
            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.
1393
                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
1394
            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.
1395
                  and (compression_parent is None
3830.3.18 by Martin Pool
Faster expression evaluation order
1396
                       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.
1397
                       or self._index.has_key(compression_parent)
1398
                       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
1399
                # we can insert the knit record literally if either it has no
1400
                # compression parent OR we already have its basis in this kvf
1401
                # OR the basis is not present even in the fallbacks.  In the
1402
                # last case it will either turn up later in the stream and all
1403
                # will be well, or it won't turn up at all and we'll raise an
1404
                # error at the end.
3830.3.13 by Martin Pool
review cleanups to insert_record_stream
1405
                #
1406
                # TODO: self.has_key is somewhat redundant with
1407
                # self._index.has_key; we really want something that directly
1408
                # 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.
1409
                if record.storage_kind not in native_types:
1410
                    try:
1411
                        adapter_key = (record.storage_kind, "knit-delta-gz")
1412
                        adapter = get_adapter(adapter_key)
1413
                    except KeyError:
1414
                        adapter_key = (record.storage_kind, "knit-ft-gz")
1415
                        adapter = get_adapter(adapter_key)
1416
                    bytes = adapter.get_bytes(
1417
                        record, record.get_bytes_as(record.storage_kind))
1418
                else:
1419
                    bytes = record.get_bytes_as(record.storage_kind)
1420
                options = [record._build_details[0]]
1421
                if record._build_details[1]:
1422
                    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.
1423
                # Just blat it across.
1424
                # Note: This does end up adding data on duplicate keys. As
1425
                # modern repositories use atomic insertions this should not
1426
                # lead to excessive growth in the event of interrupted fetches.
1427
                # 'knit' repositories may suffer excessive growth, but as a
1428
                # deprecated format this is tolerable. It can be fixed if
1429
                # needed by in the kndx index support raising on a duplicate
1430
                # 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.
1431
                access_memo = self._access.add_raw_records(
1432
                    [(record.key, len(bytes))], bytes)[0]
1433
                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.
1434
                buffered = False
1435
                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.
1436
                    # Not a fulltext, so we need to make sure the compression
1437
                    # 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.
1438
                    # Note that pack backed knits don't need to buffer here
1439
                    # because they buffer all writes to the transaction level,
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1440
                    # 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.
1441
                    # the query here has sufficient cost to show up in
1442
                    # 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.
1443
                    #
3830.3.7 by Martin Pool
KnitVersionedFiles.insert_record_stream checks that compression parents are in the same kvf, not in a fallback
1444
                    # They're required to be physically in this
1445
                    # 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.
1446
                    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.
1447
                        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.
1448
                            compression_parent, [])
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1449
                        pending.append(index_entry)
1450
                        buffered = True
1451
                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.
1452
                    self._index.add_records([index_entry])
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1453
            elif record.storage_kind == 'chunked':
1454
                self.add_lines(record.key, parents,
1455
                    osutils.chunks_to_lines(record.get_bytes_as('chunked')))
1456
            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
1457
                self.add_lines(record.key, parents,
1458
                    split_lines(record.get_bytes_as('fulltext')))
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1459
            else:
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
1460
                # 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.
1461
                # delta, either because it's not the right format, or this
1462
                # KnitVersionedFiles doesn't permit deltas (_max_delta_chain ==
1463
                # 0) or because it depends on a base only present in the
1464
                # fallback kvfs.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1465
                adapter_key = record.storage_kind, 'fulltext'
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1466
                adapter = get_adapter(adapter_key)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1467
                lines = split_lines(adapter.get_bytes(
1468
                    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.
1469
                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.
1470
                    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.
1471
                except errors.RevisionAlreadyPresent:
1472
                    pass
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1473
            # 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.
1474
            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.
1475
            while added_keys:
1476
                key = added_keys.pop(0)
1477
                if key in buffered_index_entries:
1478
                    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.
1479
                    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.
1480
                    added_keys.extend(
1481
                        [index_entry[0] for index_entry in index_entries])
1482
                    del buffered_index_entries[key]
1483
        # If there were any deltas which had a missing basis parent, error.
1484
        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
1485
            from pprint import pformat
1486
            raise errors.BzrCheckError(
1487
                "record_stream refers to compression parents not in %r:\n%s"
1488
                % (self, pformat(sorted(buffered_index_entries.keys()))))
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1489
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.
1490
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1491
        """Iterate over the lines in the versioned files from keys.
1492
1493
        This may return lines from other keys. Each item the returned
1494
        iterator yields is a tuple of a line and a text version that that line
1495
        is present in (not introduced in).
1496
1497
        Ordering of results is in whatever order is most suitable for the
1498
        underlying storage format.
1499
1500
        If a progress bar is supplied, it may be used to indicate progress.
1501
        The caller is responsible for cleaning up progress bars (because this
1502
        is an iterator).
1503
1504
        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
1505
         * 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.
1506
           terminators.
1507
         * 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
1508
         * If a requested key did not change any lines (or didn't have any
1509
           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.
1510
1511
        :return: An iterator over (line, key).
1512
        """
1513
        if pb is None:
1514
            pb = progress.DummyProgress()
1515
        keys = set(keys)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1516
        total = len(keys)
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1517
        done = False
1518
        while not done:
1519
            try:
1520
                # we don't care about inclusions, the caller cares.
1521
                # but we need to setup a list of records to visit.
1522
                # we need key, position, length
1523
                key_records = []
1524
                build_details = self._index.get_build_details(keys)
1525
                for key, details in build_details.iteritems():
1526
                    if key in keys:
1527
                        key_records.append((key, details[0]))
1528
                records_iter = enumerate(self._read_records_iter(key_records))
1529
                for (key_idx, (key, data, sha_value)) in records_iter:
1530
                    pb.update('Walking content.', key_idx, total)
1531
                    compression_parent = build_details[key][1]
1532
                    if compression_parent is None:
1533
                        # fulltext
1534
                        line_iterator = self._factory.get_fulltext_content(data)
1535
                    else:
1536
                        # Delta 
1537
                        line_iterator = self._factory.get_linedelta_content(data)
1538
                    # Now that we are yielding the data for this key, remove it
1539
                    # from the list
1540
                    keys.remove(key)
1541
                    # XXX: It might be more efficient to yield (key,
1542
                    # line_iterator) in the future. However for now, this is a
1543
                    # simpler change to integrate into the rest of the
1544
                    # codebase. RBC 20071110
1545
                    for line in line_iterator:
1546
                        yield line, key
1547
                done = True
1548
            except errors.RetryWithNewPacks, e:
1549
                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
1550
        # If there are still keys we've not yet found, we look in the fallback
1551
        # vfs, and hope to find them there.  Note that if the keys are found
1552
        # but had no changes or no content, the fallback may not return
1553
        # anything.  
1554
        if keys and not self._fallback_vfs:
1555
            # XXX: strictly the second parameter is meant to be the file id
1556
            # but it's not easily accessible here.
1557
            raise RevisionNotPresent(keys, repr(self))
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1558
        for source in self._fallback_vfs:
1559
            if not keys:
1560
                break
1561
            source_keys = set()
1562
            for line, key in source.iter_lines_added_or_present_in_keys(keys):
1563
                source_keys.add(key)
1564
                yield line, key
1565
            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.
1566
        pb.update('Walking content.', total, total)
1567
1568
    def _make_line_delta(self, delta_seq, new_content):
1569
        """Generate a line delta from delta_seq and new_content."""
1570
        diff_hunks = []
1571
        for op in delta_seq.get_opcodes():
1572
            if op[0] == 'equal':
1573
                continue
1574
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1575
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1576
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1577
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1578
                           delta=None, annotated=None,
1579
                           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.
1580
        """Merge annotations for content and generate deltas.
1581
        
1582
        This is done by comparing the annotations based on changes to the text
1583
        and generating a delta on the resulting full texts. If annotations are
1584
        not being created then a simple delta is created.
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
1585
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1586
        if left_matching_blocks is not None:
1587
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
1588
        else:
1589
            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.
1590
        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.
1591
            for parent_key in parents:
1592
                merge_content = self._get_content(parent_key, parent_texts)
1593
                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
1594
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1595
                else:
1596
                    seq = patiencediff.PatienceSequenceMatcher(
1597
                        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.
1598
                for i, j, n in seq.get_matching_blocks():
1599
                    if n == 0:
1600
                        continue
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
1601
                    # this copies (origin, text) pairs across to the new
1602
                    # content for any line that matches the last-checked
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1603
                    # 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.
1604
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1605
            # XXX: Robert says the following block is a workaround for a
1606
            # 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.
1607
            if content._lines and content._lines[-1][1][-1] != '\n':
1608
                # The copied annotation was from a line without a trailing EOL,
1609
                # reinstate one for the content object, to ensure correct
1610
                # serialization.
1611
                line = content._lines[-1][1] + '\n'
1612
                content._lines[-1] = (content._lines[-1][0], line)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1613
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1614
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1615
                reference_content = self._get_content(parents[0], parent_texts)
1616
                new_texts = content.text()
1617
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
1618
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
1619
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1620
            return self._make_line_delta(delta_seq, content)
1621
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.
1622
    def _parse_record(self, version_id, data):
1623
        """Parse an original format knit record.
1624
1625
        These have the last element of the key only present in the stored data.
1626
        """
1627
        rec, record_contents = self._parse_record_unchecked(data)
1628
        self._check_header_version(rec, version_id)
1629
        return record_contents, rec[3]
1630
1631
    def _parse_record_header(self, key, raw_data):
1632
        """Parse a record header for consistency.
1633
1634
        :return: the header and the decompressor stream.
1635
                 as (stream, header_record)
1636
        """
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1637
        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.
1638
        try:
1639
            # Current serialise
1640
            rec = self._check_header(key, df.readline())
1641
        except Exception, e:
1642
            raise KnitCorrupt(self,
1643
                              "While reading {%s} got %s(%s)"
1644
                              % (key, e.__class__.__name__, str(e)))
1645
        return df, rec
1646
1647
    def _parse_record_unchecked(self, data):
1648
        # profiling notes:
1649
        # 4168 calls in 2880 217 internal
1650
        # 4168 calls to _parse_record_header in 2121
1651
        # 4168 calls to readlines in 330
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1652
        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.
1653
        try:
1654
            record_contents = df.readlines()
1655
        except Exception, e:
1656
            raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
1657
                (data, e.__class__.__name__, str(e)))
1658
        header = record_contents.pop(0)
1659
        rec = self._split_header(header)
1660
        last_line = record_contents.pop()
1661
        if len(record_contents) != int(rec[2]):
1662
            raise KnitCorrupt(self,
1663
                              'incorrect number of lines %s != %s'
1664
                              ' for version {%s} %s'
1665
                              % (len(record_contents), int(rec[2]),
1666
                                 rec[1], record_contents))
1667
        if last_line != 'end %s\n' % rec[1]:
1668
            raise KnitCorrupt(self,
1669
                              'unexpected version end line %r, wanted %r' 
1670
                              % (last_line, rec[1]))
1671
        df.close()
1672
        return rec, record_contents
1673
1674
    def _read_records_iter(self, records):
1675
        """Read text records from data file and yield result.
1676
1677
        The result will be returned in whatever is the fastest to read.
1678
        Not by the order requested. Also, multiple requests for the same
1679
        record will only yield 1 response.
1680
        :param records: A list of (key, access_memo) entries
1681
        :return: Yields (key, contents, digest) in the order
1682
                 read, not the order requested
1683
        """
1684
        if not records:
1685
            return
1686
1687
        # XXX: This smells wrong, IO may not be getting ordered right.
1688
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1689
        if not needed_records:
1690
            return
1691
1692
        # The transport optimizes the fetching as well 
1693
        # (ie, reads continuous ranges.)
1694
        raw_data = self._access.get_raw_records(
1695
            [index_memo for key, index_memo in needed_records])
1696
1697
        for (key, index_memo), data in \
1698
                izip(iter(needed_records), raw_data):
1699
            content, digest = self._parse_record(key[-1], data)
1700
            yield key, content, digest
1701
1702
    def _read_records_iter_raw(self, records):
1703
        """Read text records from data file and yield raw data.
1704
1705
        This unpacks enough of the text record to validate the id is
1706
        as expected but thats all.
1707
1708
        Each item the iterator yields is (key, bytes, sha1_of_full_text).
1709
        """
1710
        # setup an iterator of the external records:
1711
        # uses readv so nice and fast we hope.
1712
        if len(records):
1713
            # grab the disk data needed.
1714
            needed_offsets = [index_memo for key, index_memo
1715
                                           in records]
1716
            raw_records = self._access.get_raw_records(needed_offsets)
1717
1718
        for key, index_memo in records:
1719
            data = raw_records.next()
1720
            # validate the header (note that we can only use the suffix in
1721
            # current knit records).
1722
            df, rec = self._parse_record_header(key, data)
1723
            df.close()
1724
            yield key, data, rec[3]
1725
1726
    def _record_to_data(self, key, digest, lines, dense_lines=None):
1727
        """Convert key, digest, lines into a raw data block.
1728
        
1729
        :param key: The key of the record. Currently keys are always serialised
1730
            using just the trailing component.
1731
        :param dense_lines: The bytes of lines but in a denser form. For
1732
            instance, if lines is a list of 1000 bytestrings each ending in \n,
1733
            dense_lines may be a list with one line in it, containing all the
1734
            1000's lines and their \n's. Using dense_lines if it is already
1735
            known is a win because the string join to create bytes in this
1736
            function spends less time resizing the final string.
1737
        :return: (len, a StringIO instance with the raw data ready to read.)
1738
        """
1739
        # Note: using a string copy here increases memory pressure with e.g.
1740
        # ISO's, but it is about 3 seconds faster on a 1.2Ghz intel machine
1741
        # when doing the initial commit of a mozilla tree. RBC 20070921
1742
        bytes = ''.join(chain(
1743
            ["version %s %d %s\n" % (key[-1],
1744
                                     len(lines),
1745
                                     digest)],
1746
            dense_lines or lines,
1747
            ["end %s\n" % key[-1]]))
1748
        if type(bytes) != str:
1749
            raise AssertionError(
1750
                'data must be plain bytes was %s' % type(bytes))
1751
        if lines and lines[-1][-1] != '\n':
1752
            raise ValueError('corrupt lines value %r' % lines)
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1753
        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.
1754
        return len(compressed_bytes), compressed_bytes
1755
1756
    def _split_header(self, line):
1757
        rec = line.split()
1758
        if len(rec) != 4:
1759
            raise KnitCorrupt(self,
1760
                              'unexpected number of elements in record header')
1761
        return rec
1762
1763
    def keys(self):
1764
        """See VersionedFiles.keys."""
1765
        if 'evil' in debug.debug_flags:
1766
            trace.mutter_callsite(2, "keys scales with size of history")
3350.8.4 by Robert Collins
Vf.keys() stacking support.
1767
        sources = [self._index] + self._fallback_vfs
1768
        result = set()
1769
        for source in sources:
1770
            result.update(source.keys())
1771
        return result
1772
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.
1773
1774
class _KndxIndex(object):
1775
    """Manages knit index files
1776
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1777
    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.
1778
    fast lookups of revision information.  The cursor of the index
1779
    file is always pointing to the end, making it easy to append
1780
    entries.
1781
1782
    _cache is a cache for fast mapping from version id to a Index
1783
    object.
1784
1785
    _history is a cache for fast mapping from indexes to version ids.
1786
1787
    The index data format is dictionary compressed when it comes to
1788
    parent references; a index entry may only have parents that with a
1789
    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.
1790
1791
    Duplicate entries may be written to the index for a single version id
1792
    if this is done then the latter one completely replaces the former:
1793
    this allows updates to correct version and parent information. 
1794
    Note that the two entries may share the delta, and that successive
1795
    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.
1796
1797
    The index file on disc contains a header, followed by one line per knit
1798
    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).
1799
    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.
1800
    
1801
    The format of a single line is
1802
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1803
    REVISION_ID is a utf8-encoded revision id
1804
    FLAGS is a comma separated list of flags about the record. Values include 
1805
        no-eol, line-delta, fulltext.
1806
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1807
        that the the compressed data starts at.
1808
    LENGTH is the ascii representation of the length of the data file.
1809
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1810
        REVISION_ID.
1811
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1812
        revision id already in the knit that is a parent of REVISION_ID.
1813
    The ' :' marker is the end of record marker.
1814
    
1815
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1816
    when a write is interrupted to the index file, it will result in a line
1817
    that does not end in ' :'. If the ' :' is not present at the end of a line,
1818
    or at the end of the file, then the record that is missing it will be
1819
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1820
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1821
    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.
1822
    to ensure that records always start on new lines even if the last write was
1823
    interrupted. As a result its normal for the last line in the index to be
1824
    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
1825
1826
    :ivar _kndx_cache: dict from prefix to the old state of KnitIndex objects,
1827
        where prefix is e.g. the (fileid,) for .texts instances or () for
1828
        constant-mapped things like .revisions, and the old state is
1829
        tuple(history_vector, cache_dict).  This is used to prevent having an
1830
        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.
1831
    """
1832
1666.1.6 by Robert Collins
Make knit the default format.
1833
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1834
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.
1835
    def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
1836
        """Create a _KndxIndex on transport using mapper."""
1837
        self._transport = transport
1838
        self._mapper = mapper
1839
        self._get_scope = get_scope
1840
        self._allow_writes = allow_writes
1841
        self._is_locked = is_locked
1842
        self._reset_cache()
1843
        self.has_graph = True
1844
1845
    def add_records(self, records, random_id=False):
1846
        """Add multiple records to the index.
1847
        
1848
        :param records: a list of tuples:
1849
                         (key, options, access_memo, parents).
1850
        :param random_id: If True the ids being added were randomly generated
1851
            and no check for existence will be performed.
1852
        """
1853
        paths = {}
1854
        for record in records:
1855
            key = record[0]
1856
            prefix = key[:-1]
1857
            path = self._mapper.map(key) + '.kndx'
1858
            path_keys = paths.setdefault(path, (prefix, []))
1859
            path_keys[1].append(record)
1860
        for path in sorted(paths):
1861
            prefix, path_keys = paths[path]
1862
            self._load_prefixes([prefix])
1863
            lines = []
1864
            orig_history = self._kndx_cache[prefix][1][:]
1865
            orig_cache = self._kndx_cache[prefix][0].copy()
1866
1867
            try:
1868
                for key, options, (_, pos, size), parents in path_keys:
1869
                    if parents is None:
1870
                        # kndx indices cannot be parentless.
1871
                        parents = ()
1872
                    line = "\n%s %s %s %s %s :" % (
1873
                        key[-1], ','.join(options), pos, size,
1874
                        self._dictionary_compress(parents))
1875
                    if type(line) != str:
1876
                        raise AssertionError(
1877
                            'data must be utf8 was %s' % type(line))
1878
                    lines.append(line)
1879
                    self._cache_key(key, options, pos, size, parents)
1880
                if len(orig_history):
1881
                    self._transport.append_bytes(path, ''.join(lines))
1882
                else:
1883
                    self._init_index(path, lines)
1884
            except:
1885
                # If any problems happen, restore the original values and re-raise
1886
                self._kndx_cache[prefix] = (orig_cache, orig_history)
1887
                raise
1888
1889
    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.
1890
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1891
1892
        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.
1893
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1894
         indexes).
1895
        """
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.
1896
        prefix = key[:-1]
1897
        version_id = key[-1]
1898
        # last-element only for compatibilty with the C load_data.
1899
        parents = tuple(parent[-1] for parent in parent_keys)
1900
        for parent in parent_keys:
1901
            if parent[:-1] != prefix:
1902
                raise ValueError("mismatched prefixes for %r, %r" % (
1903
                    key, parent_keys))
1904
        cache, history = self._kndx_cache[prefix]
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1905
        # only want the _history index to reference the 1st index entry
1906
        # 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.
1907
        if version_id not in cache:
1908
            index = len(history)
1909
            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
1910
        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.
1911
            index = cache[version_id][5]
1912
        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
1913
                                   options,
1914
                                   pos,
1915
                                   size,
1916
                                   parents,
1917
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1918
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.
1919
    def check_header(self, fp):
1920
        line = fp.readline()
1921
        if line == '':
1922
            # An empty file can actually be treated as though the file doesn't
1923
            # exist yet.
1924
            raise errors.NoSuchFile(self)
1925
        if line != self.HEADER:
1926
            raise KnitHeaderError(badline=line, filename=self)
1927
1928
    def _check_read(self):
1929
        if not self._is_locked():
1930
            raise errors.ObjectNotLocked(self)
1931
        if self._get_scope() != self._scope:
1932
            self._reset_cache()
1933
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1934
    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.
1935
        """Assert if not writes are permitted."""
1936
        if not self._is_locked():
1937
            raise errors.ObjectNotLocked(self)
3316.2.5 by Robert Collins
Review feedback.
1938
        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.
1939
            self._reset_cache()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1940
        if self._mode != 'w':
1941
            raise errors.ReadOnlyObjectDirtiedError(self)
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
    def get_build_details(self, keys):
1944
        """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.
1945
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
1946
        Ghosts are omitted from the result.
1947
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.
1948
        :param keys: An iterable of keys.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1949
        :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.
1950
            record_details).
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1951
            index_memo
1952
                opaque structure to pass to read_records to extract the raw
1953
                data
1954
            compression_parent
1955
                Content that this record is built upon, may be None
1956
            parents
1957
                Logical parents of this node
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1958
            record_details
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1959
                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,
1960
                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.
1961
        """
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.
1962
        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.
1963
        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.
1964
        for key in keys:
1965
            if key not in parent_map:
1966
                continue # Ghost
1967
            method = self.get_method(key)
1968
            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.
1969
            if method == 'fulltext':
1970
                compression_parent = None
1971
            else:
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
1972
                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.
1973
            noeol = 'no-eol' in self.get_options(key)
1974
            index_memo = self.get_position(key)
1975
            result[key] = (index_memo, compression_parent,
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1976
                                  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.
1977
        return result
1978
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.
1979
    def get_method(self, key):
1980
        """Return compression method of specified key."""
1981
        options = self.get_options(key)
1982
        if 'fulltext' in options:
1983
            return 'fulltext'
1984
        elif 'line-delta' in options:
1985
            return 'line-delta'
1986
        else:
1987
            raise errors.KnitIndexUnknownMethod(self, options)
1988
1989
    def get_options(self, key):
1990
        """Return a list representing options.
1991
1992
        e.g. ['foo', 'bar']
1993
        """
1994
        prefix, suffix = self._split_key(key)
1995
        self._load_prefixes([prefix])
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1996
        try:
1997
            return self._kndx_cache[prefix][0][suffix][1]
1998
        except KeyError:
1999
            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.
2000
2001
    def get_parent_map(self, keys):
2002
        """Get a map of the parents of keys.
2003
2004
        :param keys: The keys to look up parents for.
2005
        :return: A mapping from keys to parents. Absent keys are absent from
2006
            the mapping.
2007
        """
2008
        # Parse what we need to up front, this potentially trades off I/O
2009
        # locality (.kndx and .knit in the same block group for the same file
2010
        # id) for less checking in inner loops.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2011
        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.
2012
        self._load_prefixes(prefixes)
2013
        result = {}
2014
        for key in keys:
2015
            prefix = key[:-1]
2016
            try:
2017
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2018
            except KeyError:
2019
                pass
2020
            else:
2021
                result[key] = tuple(prefix + (suffix,) for
2022
                    suffix in suffix_parents)
2023
        return result
2024
2025
    def get_position(self, key):
2026
        """Return details needed to access the version.
2027
        
2028
        :return: a tuple (key, data position, size) to hand to the access
2029
            logic to get the record.
2030
        """
2031
        prefix, suffix = self._split_key(key)
2032
        self._load_prefixes([prefix])
2033
        entry = self._kndx_cache[prefix][0][suffix]
2034
        return key, entry[2], entry[3]
2035
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2036
    has_key = _mod_index._has_key_from_parent_map
2037
    
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.
2038
    def _init_index(self, path, extra_lines=[]):
2039
        """Initialize an index."""
2040
        sio = StringIO()
2041
        sio.write(self.HEADER)
2042
        sio.writelines(extra_lines)
2043
        sio.seek(0)
2044
        self._transport.put_file_non_atomic(path, sio,
2045
                            create_parent_dir=True)
2046
                           # self._create_parent_dir)
2047
                           # mode=self._file_mode,
2048
                           # dir_mode=self._dir_mode)
2049
2050
    def keys(self):
2051
        """Get all the keys in the collection.
2052
        
2053
        The keys are not ordered.
2054
        """
2055
        result = set()
2056
        # Identify all key prefixes.
2057
        # XXX: A bit hacky, needs polish.
2058
        if type(self._mapper) == ConstantMapper:
2059
            prefixes = [()]
2060
        else:
2061
            relpaths = set()
2062
            for quoted_relpath in self._transport.iter_files_recursive():
2063
                path, ext = os.path.splitext(quoted_relpath)
2064
                relpaths.add(path)
2065
            prefixes = [self._mapper.unmap(path) for path in relpaths]
2066
        self._load_prefixes(prefixes)
2067
        for prefix in prefixes:
2068
            for suffix in self._kndx_cache[prefix][1]:
2069
                result.add(prefix + (suffix,))
2070
        return result
2071
    
2072
    def _load_prefixes(self, prefixes):
2073
        """Load the indices for prefixes."""
2074
        self._check_read()
2075
        for prefix in prefixes:
2076
            if prefix not in self._kndx_cache:
2077
                # the load_data interface writes to these variables.
2078
                self._cache = {}
2079
                self._history = []
2080
                self._filename = prefix
2081
                try:
2082
                    path = self._mapper.map(prefix) + '.kndx'
2083
                    fp = self._transport.get(path)
2084
                    try:
2085
                        # _load_data may raise NoSuchFile if the target knit is
2086
                        # completely empty.
2087
                        _load_data(self, fp)
2088
                    finally:
2089
                        fp.close()
2090
                    self._kndx_cache[prefix] = (self._cache, self._history)
2091
                    del self._cache
2092
                    del self._filename
2093
                    del self._history
2094
                except NoSuchFile:
2095
                    self._kndx_cache[prefix] = ({}, [])
2096
                    if type(self._mapper) == ConstantMapper:
2097
                        # preserve behaviour for revisions.kndx etc.
2098
                        self._init_index(path)
2099
                    del self._cache
2100
                    del self._filename
2101
                    del self._history
2102
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2103
    missing_keys = _mod_index._missing_keys_from_parent_map
2104
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.
2105
    def _partition_keys(self, keys):
2106
        """Turn keys into a dict of prefix:suffix_list."""
2107
        result = {}
2108
        for key in keys:
2109
            prefix_keys = result.setdefault(key[:-1], [])
2110
            prefix_keys.append(key[-1])
2111
        return result
2112
2113
    def _dictionary_compress(self, keys):
2114
        """Dictionary compress keys.
2115
        
2116
        :param keys: The keys to generate references to.
2117
        :return: A string representation of keys. keys which are present are
2118
            dictionary compressed, and others are emitted as fulltext with a
2119
            '.' prefix.
2120
        """
2121
        if not keys:
2122
            return ''
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2123
        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.
2124
        prefix = keys[0][:-1]
2125
        cache = self._kndx_cache[prefix][0]
2126
        for key in keys:
2127
            if key[:-1] != prefix:
2128
                # kndx indices cannot refer across partitioned storage.
2129
                raise ValueError("mismatched prefixes for %r" % keys)
2130
            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
2131
                # -- 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.
2132
                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
2133
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2134
            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.
2135
                result_list.append('.' + key[-1])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2136
        return ' '.join(result_list)
2137
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.
2138
    def _reset_cache(self):
2139
        # Possibly this should be a LRU cache. A dictionary from key_prefix to
2140
        # (cache_dict, history_vector) for parsed kndx files.
2141
        self._kndx_cache = {}
2142
        self._scope = self._get_scope()
2143
        allow_writes = self._allow_writes()
2144
        if allow_writes:
2145
            self._mode = 'w'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2146
        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.
2147
            self._mode = 'r'
2148
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2149
    def _sort_keys_by_io(self, keys, positions):
2150
        """Figure out an optimal order to read the records for the given keys.
2151
2152
        Sort keys, grouped by index and sorted by position.
2153
2154
        :param keys: A list of keys whose records we want to read. This will be
2155
            sorted 'in-place'.
2156
        :param positions: A dict, such as the one returned by
2157
            _get_components_positions()
2158
        :return: None
2159
        """
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2160
        def get_sort_key(key):
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2161
            index_memo = positions[key][1]
2162
            # Group by prefix and position. index_memo[0] is the key, so it is
2163
            # (file_id, revision_id) and we don't want to sort on revision_id,
2164
            # index_memo[1] is the position, and index_memo[2] is the size,
2165
            # which doesn't matter for the sort
2166
            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.
2167
        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.
2168
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.
2169
    def _split_key(self, key):
2170
        """Split key into a prefix and suffix."""
2171
        return key[:-1], key[-1]
2172
2173
2174
class _KnitGraphIndex(object):
2175
    """A KnitVersionedFiles index layered on GraphIndex."""
2176
2177
    def __init__(self, graph_index, is_locked, deltas=False, parents=True,
2178
        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.
2179
        """Construct a KnitGraphIndex on a graph_index.
2180
2181
        :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.
2182
        :param is_locked: A callback to check whether the object should answer
2183
            queries.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2184
        :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.
2185
        :param parents: If True, record knits parents, if not do not record 
2186
            parents.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2187
        :param add_callback: If not None, allow additions to the index and call
2188
            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.
2189
            [(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.
2190
        :param is_locked: A callback, returns True if the index is locked and
2191
            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.
2192
        """
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
        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.
2194
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2195
        self._deltas = deltas
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2196
        self._parents = parents
2197
        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.
2198
            # XXX: TODO: Delta tree and parent graph should be conceptually
2199
            # separate.
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2200
            raise KnitCorrupt(self, "Cannot do delta compression without "
2201
                "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.
2202
        self.has_graph = parents
2203
        self._is_locked = is_locked
2204
3517.4.13 by Martin Pool
Add repr methods
2205
    def __repr__(self):
2206
        return "%s(%r)" % (self.__class__.__name__, self._graph_index)
2207
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.
2208
    def add_records(self, records, random_id=False):
2209
        """Add multiple records to the index.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2210
        
2211
        This function does not insert data into the Immutable GraphIndex
2212
        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.
2213
        the caller and checks that it is safe to insert then calls
2214
        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.
2215
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.
2216
        :param records: a list of tuples:
2217
                         (key, options, access_memo, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2218
        :param random_id: If True the ids being added were randomly generated
2219
            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.
2220
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2221
        if not self._add_callback:
2222
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2223
        # we hope there are no repositories with inconsistent parentage
2224
        # anymore.
2225
2226
        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.
2227
        for (key, options, access_memo, parents) in records:
2228
            if self._parents:
2229
                parents = tuple(parents)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2230
            index, pos, size = access_memo
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2231
            if 'no-eol' in options:
2232
                value = 'N'
2233
            else:
2234
                value = ' '
2235
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2236
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2237
                if 'line-delta' in options:
2238
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2239
            if self._parents:
2240
                if self._deltas:
2241
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2242
                        node_refs = (parents, (parents[0],))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2243
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2244
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2245
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2246
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2247
            else:
2248
                if parents:
2249
                    raise KnitCorrupt(self, "attempt to add node with parents "
2250
                        "in parentless index.")
2251
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2252
            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.
2253
        # check for dups
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2254
        if not random_id:
2255
            present_nodes = self._get_entries(keys)
2256
            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.
2257
                if (value[0] != keys[key][0][0] or
3946.2.2 by Jelmer Vernooij
Remove matching test, fix handling of parentless indexes.
2258
                    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.
2259
                    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
2260
                        ": %s %s" % ((value, node_refs), keys[key]))
2261
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2262
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2263
        if self._parents:
2264
            for key, (value, node_refs) in keys.iteritems():
2265
                result.append((key, value, node_refs))
2266
        else:
2267
            for key, (value, node_refs) in keys.iteritems():
2268
                result.append((key, value))
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2269
        self._add_callback(result)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2270
        
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.
2271
    def _check_read(self):
2272
        """raise if reads are not permitted."""
2273
        if not self._is_locked():
2274
            raise errors.ObjectNotLocked(self)
2275
2276
    def _check_write_ok(self):
2277
        """Assert if writes are not permitted."""
2278
        if not self._is_locked():
2279
            raise errors.ObjectNotLocked(self)
2280
2281
    def _compression_parent(self, an_entry):
2282
        # return the key that an_entry is compressed against, or None
2283
        # Grab the second parent list (as deltas implies parents currently)
2284
        compression_parents = an_entry[3][1]
2285
        if not compression_parents:
2286
            return None
2287
        if len(compression_parents) != 1:
2288
            raise AssertionError(
2289
                "Too many compression parents: %r" % compression_parents)
2290
        return compression_parents[0]
2291
2292
    def get_build_details(self, keys):
2293
        """Get the method, index_memo and compression parent for version_ids.
2294
2295
        Ghosts are omitted from the result.
2296
2297
        :param keys: An iterable of keys.
2298
        :return: A dict of key:
2299
            (index_memo, compression_parent, parents, record_details).
2300
            index_memo
2301
                opaque structure to pass to read_records to extract the raw
2302
                data
2303
            compression_parent
2304
                Content that this record is built upon, may be None
2305
            parents
2306
                Logical parents of this node
2307
            record_details
2308
                extra information about the content which needs to be passed to
2309
                Factory.parse_record
2310
        """
2311
        self._check_read()
2312
        result = {}
2313
        entries = self._get_entries(keys, False)
2314
        for entry in entries:
2315
            key = entry[1]
2316
            if not self._parents:
2317
                parents = ()
2318
            else:
2319
                parents = entry[3][0]
2320
            if not self._deltas:
2321
                compression_parent_key = None
2322
            else:
2323
                compression_parent_key = self._compression_parent(entry)
2324
            noeol = (entry[2][0] == 'N')
2325
            if compression_parent_key:
2326
                method = 'line-delta'
2327
            else:
2328
                method = 'fulltext'
2329
            result[key] = (self._node_to_position(entry),
2330
                                  compression_parent_key, parents,
2331
                                  (method, noeol))
2332
        return result
2333
2334
    def _get_entries(self, keys, check_present=False):
2335
        """Get the entries for keys.
2336
        
2337
        :param keys: An iterable of index key tuples.
2338
        """
2339
        keys = set(keys)
2340
        found_keys = set()
2341
        if self._parents:
2342
            for node in self._graph_index.iter_entries(keys):
2343
                yield node
2344
                found_keys.add(node[1])
2345
        else:
2346
            # adapt parentless index to the rest of the code.
2347
            for node in self._graph_index.iter_entries(keys):
2348
                yield node[0], node[1], node[2], ()
2349
                found_keys.add(node[1])
2350
        if check_present:
2351
            missing_keys = keys.difference(found_keys)
2352
            if missing_keys:
2353
                raise RevisionNotPresent(missing_keys.pop(), self)
2354
2355
    def get_method(self, key):
2356
        """Return compression method of specified key."""
2357
        return self._get_method(self._get_node(key))
2358
2359
    def _get_method(self, node):
2360
        if not self._deltas:
2361
            return 'fulltext'
2362
        if self._compression_parent(node):
2363
            return 'line-delta'
2364
        else:
2365
            return 'fulltext'
2366
2367
    def _get_node(self, key):
2368
        try:
2369
            return list(self._get_entries([key]))[0]
2370
        except IndexError:
2371
            raise RevisionNotPresent(key, self)
2372
2373
    def get_options(self, key):
2374
        """Return a list representing options.
2375
2376
        e.g. ['foo', 'bar']
2377
        """
2378
        node = self._get_node(key)
2379
        options = [self._get_method(node)]
2380
        if node[2][0] == 'N':
2381
            options.append('no-eol')
2382
        return options
2383
2384
    def get_parent_map(self, keys):
2385
        """Get a map of the parents of keys.
2386
2387
        :param keys: The keys to look up parents for.
2388
        :return: A mapping from keys to parents. Absent keys are absent from
2389
            the mapping.
2390
        """
2391
        self._check_read()
2392
        nodes = self._get_entries(keys)
2393
        result = {}
2394
        if self._parents:
2395
            for node in nodes:
2396
                result[node[1]] = node[3][0]
2397
        else:
2398
            for node in nodes:
2399
                result[node[1]] = None
2400
        return result
2401
2402
    def get_position(self, key):
2403
        """Return details needed to access the version.
2404
        
2405
        :return: a tuple (index, data position, size) to hand to the access
2406
            logic to get the record.
2407
        """
2408
        node = self._get_node(key)
2409
        return self._node_to_position(node)
2410
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2411
    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
2412
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.
2413
    def keys(self):
2414
        """Get all the keys in the collection.
2415
        
2416
        The keys are not ordered.
2417
        """
2418
        self._check_read()
2419
        return [node[1] for node in self._graph_index.iter_all_entries()]
2420
    
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2421
    missing_keys = _mod_index._missing_keys_from_parent_map
2422
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.
2423
    def _node_to_position(self, node):
2424
        """Convert an index value to position details."""
2425
        bits = node[2][1:].split(' ')
2426
        return node[0], int(bits[0]), int(bits[1])
2427
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2428
    def _sort_keys_by_io(self, keys, positions):
2429
        """Figure out an optimal order to read the records for the given keys.
2430
2431
        Sort keys, grouped by index and sorted by position.
2432
2433
        :param keys: A list of keys whose records we want to read. This will be
2434
            sorted 'in-place'.
2435
        :param positions: A dict, such as the one returned by
2436
            _get_components_positions()
2437
        :return: None
2438
        """
2439
        def get_index_memo(key):
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2440
            # index_memo is at offset [1]. It is made up of (GraphIndex,
2441
            # position, size). GI is an object, which will be unique for each
2442
            # pack file. This causes us to group by pack file, then sort by
2443
            # position. Size doesn't matter, but it isn't worth breaking up the
2444
            # tuple.
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2445
            return positions[key][1]
2446
        return keys.sort(key=get_index_memo)
2447
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.
2448
2449
class _KnitKeyAccess(object):
2450
    """Access to records in .knit files."""
2451
2452
    def __init__(self, transport, mapper):
2453
        """Create a _KnitKeyAccess with transport and mapper.
2454
2455
        :param transport: The transport the access object is rooted at.
2456
        :param mapper: The mapper used to map keys to .knit files.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2457
        """
2458
        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.
2459
        self._mapper = mapper
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2460
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.
2461
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2462
        """Add raw knit bytes to a storage area.
2463
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.
2464
        The data is spooled to the container writer in one bytes-record per
2465
        raw data item.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2466
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.
2467
        :param sizes: An iterable of tuples containing the key and size of each
2468
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2469
        :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.
2470
        :return: A list of memos to retrieve the record later. Each memo is an
2471
            opaque index memo. For _KnitKeyAccess the memo is (key, pos,
2472
            length), where the key is the record key.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2473
        """
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.
2474
        if type(raw_data) != str:
2475
            raise AssertionError(
2476
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2477
        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.
2478
        offset = 0
2479
        # TODO: This can be tuned for writing to sftp and other servers where
2480
        # append() is relatively expensive by grouping the writes to each key
2481
        # prefix.
2482
        for key, size in key_sizes:
2483
            path = self._mapper.map(key)
2484
            try:
2485
                base = self._transport.append_bytes(path + '.knit',
2486
                    raw_data[offset:offset+size])
2487
            except errors.NoSuchFile:
2488
                self._transport.mkdir(osutils.dirname(path))
2489
                base = self._transport.append_bytes(path + '.knit',
2490
                    raw_data[offset:offset+size])
2491
            # if base == 0:
2492
            # chmod.
2493
            offset += size
2494
            result.append((key, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2495
        return result
2496
2497
    def get_raw_records(self, memos_for_retrieval):
2498
        """Get the raw bytes for a records.
2499
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.
2500
        :param memos_for_retrieval: An iterable containing the access memo for
2501
            retrieving the bytes.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2502
        :return: An iterator over the bytes of the records.
2503
        """
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.
2504
        # first pass, group into same-index request to minimise readv's issued.
2505
        request_lists = []
2506
        current_prefix = None
2507
        for (key, offset, length) in memos_for_retrieval:
2508
            if current_prefix == key[:-1]:
2509
                current_list.append((offset, length))
2510
            else:
2511
                if current_prefix is not None:
2512
                    request_lists.append((current_prefix, current_list))
2513
                current_prefix = key[:-1]
2514
                current_list = [(offset, length)]
2515
        # handle the last entry
2516
        if current_prefix is not None:
2517
            request_lists.append((current_prefix, current_list))
2518
        for prefix, read_vector in request_lists:
2519
            path = self._mapper.map(prefix) + '.knit'
2520
            for pos, data in self._transport.readv(path, read_vector):
2521
                yield data
2522
2523
2524
class _DirectPackAccess(object):
2525
    """Access to data in one or more packs with less translation."""
2526
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2527
    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.
2528
        """Create a _DirectPackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2529
2530
        :param index_to_packs: A dict mapping index objects to the transport
2531
            and file names for obtaining data.
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2532
        :param reload_func: A function to call if we determine that the pack
2533
            files have moved and we need to reload our caches. See
2534
            bzrlib.repo_fmt.pack_repo.AggregateIndex for more details.
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
        self._container_writer = None
2537
        self._write_index = None
2538
        self._indices = index_to_packs
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2539
        self._reload_func = reload_func
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2540
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.
2541
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2542
        """Add raw knit bytes to a storage area.
2543
2670.2.3 by Robert Collins
Review feedback.
2544
        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.
2545
        raw data item.
2546
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.
2547
        :param sizes: An iterable of tuples containing the key and size of each
2548
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2549
        :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.
2550
        :return: A list of memos to retrieve the record later. Each memo is an
2551
            opaque index memo. For _DirectPackAccess the memo is (index, pos,
2552
            length), where the index field is the write_index object supplied
2553
            to the PackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2554
        """
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
        if type(raw_data) != str:
2556
            raise AssertionError(
2557
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2558
        result = []
2559
        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.
2560
        for key, size in key_sizes:
2561
            p_offset, p_length = self._container_writer.add_bytes_record(
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2562
                raw_data[offset:offset+size], [])
2563
            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.
2564
            result.append((self._write_index, p_offset, p_length))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2565
        return result
2566
2567
    def get_raw_records(self, memos_for_retrieval):
2568
        """Get the raw bytes for a records.
2569
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2570
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2571
            length) memo for retrieving the bytes. The Pack access method
2572
            looks up the pack to use for a given record in its index_to_pack
2573
            map.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2574
        :return: An iterator over the bytes of the records.
2575
        """
2576
        # first pass, group into same-index requests
2577
        request_lists = []
2578
        current_index = None
2579
        for (index, offset, length) in memos_for_retrieval:
2580
            if current_index == index:
2581
                current_list.append((offset, length))
2582
            else:
2583
                if current_index is not None:
2584
                    request_lists.append((current_index, current_list))
2585
                current_index = index
2586
                current_list = [(offset, length)]
2587
        # handle the last entry
2588
        if current_index is not None:
2589
            request_lists.append((current_index, current_list))
2590
        for index, offsets in request_lists:
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2591
            try:
2592
                transport, path = self._indices[index]
2593
            except KeyError:
2594
                # A KeyError here indicates that someone has triggered an index
2595
                # reload, and this index has gone missing, we need to start
2596
                # over.
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2597
                if self._reload_func is None:
2598
                    # If we don't have a _reload_func there is nothing that can
2599
                    # be done
2600
                    raise
3789.2.28 by John Arbash Meinel
We don't actually have a transport yet, so we can't use it as context.
2601
                raise errors.RetryWithNewPacks(index,
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
2602
                                               reload_occurred=True,
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2603
                                               exc_info=sys.exc_info())
2604
            try:
2605
                reader = pack.make_readv_reader(transport, path, offsets)
2606
                for names, read_func in reader.iter_records():
2607
                    yield read_func(None)
2608
            except errors.NoSuchFile:
2609
                # A NoSuchFile error indicates that a pack file has gone
2610
                # 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.
2611
                if self._reload_func is None:
2612
                    raise
3789.2.27 by John Arbash Meinel
Add some context information to the Retry exceptions.
2613
                raise errors.RetryWithNewPacks(transport.abspath(path),
2614
                                               reload_occurred=False,
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2615
                                               exc_info=sys.exc_info())
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2616
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.
2617
    def set_writer(self, writer, index, transport_packname):
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2618
        """Set a writer to use for adding data."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
2619
        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.
2620
            self._indices[index] = transport_packname
2621
        self._container_writer = writer
2622
        self._write_index = index
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2623
3789.2.5 by John Arbash Meinel
Change _DirectPackAccess to only raise Retry when _reload_func is defined.
2624
    def reload_or_raise(self, retry_exc):
2625
        """Try calling the reload function, or re-raise the original exception.
2626
2627
        This should be called after _DirectPackAccess raises a
2628
        RetryWithNewPacks exception. This function will handle the common logic
2629
        of determining when the error is fatal versus being temporary.
2630
        It will also make sure that the original exception is raised, rather
2631
        than the RetryWithNewPacks exception.
2632
2633
        If this function returns, then the calling function should retry
2634
        whatever operation was being performed. Otherwise an exception will
2635
        be raised.
2636
2637
        :param retry_exc: A RetryWithNewPacks exception.
2638
        """
3789.2.6 by John Arbash Meinel
Make _DirectPackAccess.reload_or_raise maintain the logic.
2639
        is_error = False
2640
        if self._reload_func is None:
2641
            is_error = True
2642
        elif not self._reload_func():
2643
            # The reload claimed that nothing changed
2644
            if not retry_exc.reload_occurred:
2645
                # If there wasn't an earlier reload, then we really were
2646
                # expecting to find changes. We didn't find them, so this is a
2647
                # hard error
2648
                is_error = True
2649
        if is_error:
2650
            exc_class, exc_value, exc_traceback = retry_exc.exc_info
2651
            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.
2652
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2653
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
2654
# Deprecated, use PatienceSequenceMatcher instead
2655
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2656
2657
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2658
def annotate_knit(knit, revision_id):
2659
    """Annotate a knit with no cached annotations.
2660
2661
    This implementation is for knits with no cached annotations.
2662
    It will work for knits with cached annotations, but this is not
2663
    recommended.
2664
    """
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2665
    annotator = _KnitAnnotator(knit)
3224.1.25 by John Arbash Meinel
Quick change to the _KnitAnnotator api to use .annotate() instead of get_annotated_lines()
2666
    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.
2667
2668
2669
class _KnitAnnotator(object):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2670
    """Build up the annotations for a text."""
2671
2672
    def __init__(self, knit):
2673
        self._knit = knit
2674
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2675
        # Content objects, differs from fulltexts because of how final newlines
2676
        # are treated by knits. the content objects here will always have a
2677
        # final newline
2678
        self._fulltext_contents = {}
2679
2680
        # Annotated lines of specific revisions
2681
        self._annotated_lines = {}
2682
2683
        # Track the raw data for nodes that we could not process yet.
2684
        # This maps the revision_id of the base to a list of children that will
2685
        # annotated from it.
2686
        self._pending_children = {}
2687
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2688
        # Nodes which cannot be extracted
2689
        self._ghosts = set()
2690
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2691
        # Track how many children this node has, so we know if we need to keep
2692
        # it
2693
        self._annotate_children = {}
2694
        self._compression_children = {}
2695
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2696
        self._all_build_details = {}
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2697
        # The children => parent revision_id graph
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2698
        self._revision_id_graph = {}
2699
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2700
        self._heads_provider = None
2701
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2702
        self._nodes_to_keep_annotations = set()
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2703
        self._generations_until_keep = 100
2704
2705
    def set_generations_until_keep(self, value):
2706
        """Set the number of generations before caching a node.
2707
2708
        Setting this to -1 will cache every merge node, setting this higher
2709
        will cache fewer nodes.
2710
        """
2711
        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.
2712
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2713
    def _add_fulltext_content(self, revision_id, content_obj):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2714
        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.
2715
        # 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.
2716
        return content_obj.text()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2717
2718
    def _check_parents(self, child, nodes_to_annotate):
2719
        """Check if all parents have been processed.
2720
2721
        :param child: A tuple of (rev_id, parents, raw_content)
2722
        :param nodes_to_annotate: If child is ready, add it to
2723
            nodes_to_annotate, otherwise put it back in self._pending_children
2724
        """
2725
        for parent_id in child[1]:
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2726
            if (parent_id not in self._annotated_lines):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2727
                # This parent is present, but another parent is missing
2728
                self._pending_children.setdefault(parent_id,
2729
                                                  []).append(child)
2730
                break
2731
        else:
2732
            # This one is ready to be processed
2733
            nodes_to_annotate.append(child)
2734
2735
    def _add_annotation(self, revision_id, fulltext, parent_ids,
2736
                        left_matching_blocks=None):
2737
        """Add an annotation entry.
2738
2739
        All parents should already have been annotated.
2740
        :return: A list of children that now have their parents satisfied.
2741
        """
2742
        a = self._annotated_lines
2743
        annotated_parent_lines = [a[p] for p in parent_ids]
2744
        annotated_lines = list(annotate.reannotate(annotated_parent_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2745
            fulltext, revision_id, left_matching_blocks,
2746
            heads_provider=self._get_heads_provider()))
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2747
        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.
2748
        for p in parent_ids:
2749
            ann_children = self._annotate_children[p]
2750
            ann_children.remove(revision_id)
2751
            if (not ann_children
2752
                and p not in self._nodes_to_keep_annotations):
2753
                del self._annotated_lines[p]
2754
                del self._all_build_details[p]
2755
                if p in self._fulltext_contents:
2756
                    del self._fulltext_contents[p]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2757
        # Now that we've added this one, see if there are any pending
2758
        # deltas to be done, certainly this parent is finished
2759
        nodes_to_annotate = []
2760
        for child in self._pending_children.pop(revision_id, []):
2761
            self._check_parents(child, nodes_to_annotate)
2762
        return nodes_to_annotate
2763
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.
2764
    def _get_build_graph(self, key):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2765
        """Get the graphs for building texts and annotations.
2766
2767
        The data you need for creating a full text may be different than the
2768
        data you need to annotate that text. (At a minimum, you need both
2769
        parents to create an annotation, but only need 1 parent to generate the
2770
        fulltext.)
2771
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.
2772
        :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.
2773
            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.
2774
            the pack file.
2775
        """
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.
2776
        if key in self._annotated_lines:
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2777
            # Nothing to do
2778
            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.
2779
        pending = set([key])
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2780
        records = []
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2781
        generation = 0
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2782
        kept_generation = 0
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2783
        while pending:
2784
            # get all pending nodes
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2785
            generation += 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2786
            this_iteration = pending
2787
            build_details = self._knit._index.get_build_details(this_iteration)
2788
            self._all_build_details.update(build_details)
2789
            # new_nodes = self._knit._index._get_entries(this_iteration)
2790
            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.
2791
            for key, details in build_details.iteritems():
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2792
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2793
                 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.
2794
                self._revision_id_graph[key] = parents
2795
                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.
2796
                # Do we actually need to check _annotated_lines?
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2797
                pending.update(p for p in parents
2798
                                 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.
2799
                if compression_parent:
2800
                    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.
2801
                        []).append(key)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2802
                if parents:
2803
                    for parent in parents:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2804
                        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.
2805
                            []).append(key)
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2806
                    num_gens = generation - kept_generation
2807
                    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.
2808
                        and len(parents) > 1):
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2809
                        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.
2810
                        self._nodes_to_keep_annotations.add(key)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2811
2812
            missing_versions = this_iteration.difference(build_details.keys())
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2813
            self._ghosts.update(missing_versions)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2814
            for missing_version in missing_versions:
2815
                # add a key, no parents
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2816
                self._revision_id_graph[missing_version] = ()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2817
                pending.discard(missing_version) # don't look for it
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2818
        if self._ghosts.intersection(self._compression_children):
2819
            raise KnitCorrupt(
2820
                "We cannot have nodes which have a ghost compression parent:\n"
2821
                "ghosts: %r\n"
2822
                "compression children: %r"
2823
                % (self._ghosts, self._compression_children))
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2824
        # Cleanout anything that depends on a ghost so that we don't wait for
2825
        # the ghost to show up
2826
        for node in self._ghosts:
2827
            if node in self._annotate_children:
2828
                # We won't be building this node
2829
                del self._annotate_children[node]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2830
        # Generally we will want to read the records in reverse order, because
2831
        # we find the parent nodes after the children
2832
        records.reverse()
2833
        return records
2834
2835
    def _annotate_records(self, records):
2836
        """Build the annotations for the listed records."""
2837
        # 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.
2838
        # However, process what we can, and put off to the side things that
2839
        # still need parents, cleaning them up when those parents are
2840
        # processed.
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2841
        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.
2842
             digest) in self._knit._read_records_iter(records):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2843
            if rev_id in self._annotated_lines:
2844
                continue
2845
            parent_ids = self._revision_id_graph[rev_id]
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2846
            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.
2847
            details = self._all_build_details[rev_id]
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2848
            (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2849
             record_details) = details
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2850
            nodes_to_annotate = []
2851
            # TODO: Remove the punning between compression parents, and
2852
            #       parent_ids, we should be able to do this without assuming
2853
            #       the build order
2854
            if len(parent_ids) == 0:
2855
                # There are no parents for this node, so just add it
2856
                # 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.
2857
                fulltext_content, delta = self._knit._factory.parse_record(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2858
                    rev_id, record, record_details, None)
2859
                fulltext = self._add_fulltext_content(rev_id, fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2860
                nodes_to_annotate.extend(self._add_annotation(rev_id, fulltext,
2861
                    parent_ids, left_matching_blocks=None))
2862
            else:
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2863
                child = (rev_id, parent_ids, record)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2864
                # Check if all the parents are present
2865
                self._check_parents(child, nodes_to_annotate)
2866
            while nodes_to_annotate:
2867
                # 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,
2868
                (rev_id, parent_ids, record) = nodes_to_annotate.pop()
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2869
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2870
                 record_details) = self._all_build_details[rev_id]
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2871
                blocks = None
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2872
                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.
2873
                    comp_children = self._compression_children[compression_parent]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2874
                    if rev_id not in comp_children:
2875
                        raise AssertionError("%r not in compression children %r"
2876
                            % (rev_id, comp_children))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2877
                    # If there is only 1 child, it is safe to reuse this
2878
                    # content
2879
                    reuse_content = (len(comp_children) == 1
2880
                        and compression_parent not in
2881
                            self._nodes_to_keep_annotations)
2882
                    if reuse_content:
2883
                        # Remove it from the cache since it will be changing
2884
                        parent_fulltext_content = self._fulltext_contents.pop(compression_parent)
2885
                        # Make sure to copy the fulltext since it might be
2886
                        # modified
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2887
                        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.
2888
                    else:
2889
                        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.
2890
                        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.
2891
                    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.
2892
                    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.
2893
                        rev_id, record, record_details,
2894
                        parent_fulltext_content,
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2895
                        copy_base_content=(not reuse_content))
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2896
                    fulltext = self._add_fulltext_content(rev_id,
2897
                                                          fulltext_content)
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2898
                    if compression_parent == parent_ids[0]:
2899
                        # the compression_parent is the left parent, so we can
2900
                        # re-use the delta
2901
                        blocks = KnitContent.get_line_delta_blocks(delta,
2902
                                parent_fulltext, fulltext)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2903
                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.
2904
                    fulltext_content = self._knit._factory.parse_fulltext(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2905
                        record, rev_id)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2906
                    fulltext = self._add_fulltext_content(rev_id,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2907
                        fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2908
                nodes_to_annotate.extend(
2909
                    self._add_annotation(rev_id, fulltext, parent_ids,
2910
                                     left_matching_blocks=blocks))
2911
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2912
    def _get_heads_provider(self):
2913
        """Create a heads provider for resolving ancestry issues."""
2914
        if self._heads_provider is not None:
2915
            return self._heads_provider
2916
        parent_provider = _mod_graph.DictParentsProvider(
2917
            self._revision_id_graph)
2918
        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
2919
        head_cache = _mod_graph.FrozenHeadsCache(graph_obj)
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2920
        self._heads_provider = head_cache
2921
        return head_cache
2922
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.
2923
    def annotate(self, key):
2924
        """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.
2925
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.
2926
        :param key: The key to annotate.
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2927
        """
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2928
        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
2929
            # stacked knits can't use the fast path at present.
2930
            return self._simple_annotate(key)
3789.2.13 by John Arbash Meinel
KnitVersionedFile.annotate() now retries when appropriate.
2931
        while True:
2932
            try:
2933
                records = self._get_build_graph(key)
2934
                if key in self._ghosts:
2935
                    raise errors.RevisionNotPresent(key, self._knit)
2936
                self._annotate_records(records)
2937
                return self._annotated_lines[key]
2938
            except errors.RetryWithNewPacks, e:
2939
                self._knit._access.reload_or_raise(e)
2940
                # The cached build_details are no longer valid
2941
                self._all_build_details.clear()
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2942
3517.4.1 by Martin Pool
Merge unoptimized annotate code for stacking, and only use it when needed
2943
    def _simple_annotate(self, key):
2944
        """Return annotated fulltext, rediffing from the full texts.
2945
2946
        This is slow but makes no assumptions about the repository
2947
        being able to produce line deltas.
2948
        """
2949
        # TODO: this code generates a parent maps of present ancestors; it
2950
        # could be split out into a separate method, and probably should use
2951
        # iter_ancestry instead. -- mbp and robertc 20080704
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
2952
        graph = _mod_graph.Graph(self._knit)
3350.9.1 by Robert Collins
Redo annotate more simply, using just the public interfaces for VersionedFiles.
2953
        head_cache = _mod_graph.FrozenHeadsCache(graph)
2954
        search = graph._make_breadth_first_searcher([key])
2955
        keys = set()
2956
        while True:
2957
            try:
2958
                present, ghosts = search.next_with_ghosts()
2959
            except StopIteration:
2960
                break
2961
            keys.update(present)
2962
        parent_map = self._knit.get_parent_map(keys)
2963
        parent_cache = {}
2964
        reannotate = annotate.reannotate
2965
        for record in self._knit.get_record_stream(keys, 'topological', True):
2966
            key = record.key
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
2967
            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
2968
            parents = parent_map[key]
2969
            if parents is not None:
2970
                parent_lines = [parent_cache[parent] for parent in parent_map[key]]
2971
            else:
2972
                parent_lines = []
3350.9.1 by Robert Collins
Redo annotate more simply, using just the public interfaces for VersionedFiles.
2973
            parent_cache[key] = list(
2974
                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
2975
        try:
2976
            return parent_cache[key]
2977
        except KeyError, e:
2978
            raise errors.RevisionNotPresent(key, self._knit)
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2979
2980
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2981
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
2982
    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.
2983
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
2984
    from bzrlib._knit_load_data_py import _load_data_py as _load_data