/brz/remove-bazaar

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