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