/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
        """
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1116
        position_map = self._get_components_positions(keys,
3350.8.13 by Robert Collins
Merge bzr.dev, fixing minor skew.
1117
            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.
1118
        # key = component_id, r = record_details, i_m = index_memo, n = next
1119
        records = [(key, i_m) for key, (r, i_m, n)
1120
                             in position_map.iteritems()]
1121
        record_map = {}
1122
        for key, record, digest in \
1123
                self._read_records_iter(records):
1124
            (record_details, index_memo, next) = position_map[key]
1125
            record_map[key] = record, record_details, digest, next
1126
        return record_map
1127
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1128
    def _split_by_prefix(self, keys):
1129
        """For the given keys, split them up based on their prefix.
1130
1131
        To keep memory pressure somewhat under control, split the
1132
        requests back into per-file-id requests, otherwise "bzr co"
1133
        extracts the full tree into memory before writing it to disk.
1134
        This should be revisited if _get_content_maps() can ever cross
1135
        file-id boundaries.
1136
1137
        :param keys: An iterable of key tuples
1138
        :return: A dict of {prefix: [key_list]}
1139
        """
1140
        split_by_prefix = {}
1141
        for key in keys:
1142
            if len(key) == 1:
1143
                split_by_prefix.setdefault('', []).append(key)
1144
            else:
1145
                split_by_prefix.setdefault(key[0], []).append(key)
1146
        return split_by_prefix
1147
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1148
    def get_record_stream(self, keys, ordering, include_delta_closure):
1149
        """Get a stream of records for keys.
1150
1151
        :param keys: The keys to include.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1152
        :param ordering: Either 'unordered' or 'topological'. A topologically
1153
            sorted stream has compression parents strictly before their
1154
            children.
1155
        :param include_delta_closure: If True then the closure across any
1156
            compression parents will be included (in the opaque data).
1157
        :return: An iterator of ContentFactory objects, each of which is only
1158
            valid until the iterator is advanced.
1159
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1160
        # keys might be a generator
1161
        keys = set(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1162
        if not keys:
1163
            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.
1164
        if not self._index.has_graph:
1165
            # Cannot topological order when no graph has been stored.
1166
            ordering = 'unordered'
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1167
1168
        remaining_keys = keys
1169
        while True:
1170
            try:
1171
                keys = set(remaining_keys)
1172
                for content_factory in self._get_remaining_record_stream(keys,
1173
                                            ordering, include_delta_closure):
1174
                    remaining_keys.discard(content_factory.key)
1175
                    yield content_factory
1176
                return
1177
            except errors.RetryWithNewPacks, e:
1178
                # reload_func
1179
                raise
1180
1181
    def _get_remaining_record_stream(self, keys, ordering,
1182
                                     include_delta_closure):
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1183
        if include_delta_closure:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1184
            positions = self._get_components_positions(keys, allow_missing=True)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1185
        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.
1186
            build_details = self._index.get_build_details(keys)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1187
            # map from key to
1188
            # (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.
1189
            positions = dict((key, self._build_details_to_components(details))
1190
                for key, details in build_details.iteritems())
1191
        absent_keys = keys.difference(set(positions))
1192
        # There may be more absent keys : if we're missing the basis component
1193
        # and are trying to include the delta closure.
1194
        if include_delta_closure:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1195
            needed_from_fallback = set()
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1196
            # Build up reconstructable_keys dict.  key:True in this dict means
1197
            # the key can be reconstructed.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1198
            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.
1199
            for key in keys:
1200
                # the delta chain
1201
                try:
1202
                    chain = [key, positions[key][2]]
1203
                except KeyError:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1204
                    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.
1205
                    continue
1206
                result = True
1207
                while chain[-1] is not None:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1208
                    if chain[-1] in reconstructable_keys:
1209
                        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.
1210
                        break
1211
                    else:
1212
                        try:
1213
                            chain.append(positions[chain[-1]][2])
1214
                        except KeyError:
1215
                            # missing basis component
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1216
                            needed_from_fallback.add(chain[-1])
1217
                            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.
1218
                            break
1219
                for chain_key in chain[:-1]:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1220
                    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.
1221
                if not result:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1222
                    needed_from_fallback.add(key)
1223
        # Double index lookups here : need a unified api ?
3350.8.14 by Robert Collins
Review feedback.
1224
        global_map, parent_maps = self._get_parent_map_with_sources(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1225
        if ordering == 'topological':
1226
            # Global topological sort
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1227
            present_keys = tsort.topo_sort(global_map)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1228
            # Now group by source:
1229
            source_keys = []
1230
            current_source = None
1231
            for key in present_keys:
1232
                for parent_map in parent_maps:
1233
                    if key in parent_map:
1234
                        key_source = parent_map
1235
                        break
1236
                if current_source is not key_source:
1237
                    source_keys.append((key_source, []))
1238
                    current_source = key_source
1239
                source_keys[-1][1].append(key)
1240
        else:
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1241
            if ordering != 'unordered':
1242
                raise AssertionError('valid values for ordering are:'
1243
                    ' "unordered" or "topological" not: %r'
1244
                    % (ordering,))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1245
            # Just group by source; remote sources first.
1246
            present_keys = []
1247
            source_keys = []
1248
            for parent_map in reversed(parent_maps):
1249
                source_keys.append((parent_map, []))
1250
                for key in parent_map:
1251
                    present_keys.append(key)
1252
                    source_keys[-1][1].append(key)
1253
        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.
1254
        for key in absent_keys:
1255
            yield AbsentContentFactory(key)
1256
        # restrict our view to the keys we can answer.
1257
        # 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.
1258
        # XXX: At that point we need to consider the impact of double reads by
1259
        # 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.
1260
        if include_delta_closure:
1261
            # XXX: get_content_maps performs its own index queries; allow state
1262
            # to be passed in.
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1263
            non_local_keys = needed_from_fallback - absent_keys
1264
            prefix_split_keys = self._split_by_prefix(present_keys)
1265
            prefix_split_non_local_keys = self._split_by_prefix(non_local_keys)
1266
            for prefix, keys in prefix_split_keys.iteritems():
1267
                non_local = prefix_split_non_local_keys.get(prefix, [])
1268
                non_local = set(non_local)
1269
                text_map, _ = self._get_content_maps(keys, non_local)
1270
                for key in keys:
1271
                    lines = text_map.pop(key)
1272
                    text = ''.join(lines)
1273
                    yield FulltextContentFactory(key, global_map[key], None,
1274
                                                 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.
1275
        else:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1276
            for source, keys in source_keys:
1277
                if source is parent_maps[0]:
1278
                    # this KnitVersionedFiles
1279
                    records = [(key, positions[key][1]) for key in keys]
1280
                    for key, raw_data, sha1 in self._read_records_iter_raw(records):
1281
                        (record_details, index_memo, _) = positions[key]
1282
                        yield KnitContentFactory(key, global_map[key],
1283
                            record_details, sha1, raw_data, self._factory.annotated, None)
1284
                else:
1285
                    vf = self._fallback_vfs[parent_maps.index(source) - 1]
1286
                    for record in vf.get_record_stream(keys, ordering,
1287
                        include_delta_closure):
1288
                        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.
1289
1290
    def get_sha1s(self, keys):
1291
        """See VersionedFiles.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1292
        missing = set(keys)
1293
        record_map = self._get_record_map(missing, allow_missing=True)
1294
        result = {}
1295
        for key, details in record_map.iteritems():
1296
            if key not in missing:
1297
                continue
1298
            # record entry 2 is the 'digest'.
1299
            result[key] = details[2]
1300
        missing.difference_update(set(result))
1301
        for source in self._fallback_vfs:
1302
            if not missing:
1303
                break
1304
            new_result = source.get_sha1s(missing)
1305
            result.update(new_result)
1306
            missing.difference_update(set(new_result))
1307
        return result
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1308
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1309
    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.
1310
        """Insert a record stream into this container.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1311
1312
        :param stream: A stream of records to insert. 
1313
        :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.
1314
        :seealso VersionedFiles.get_record_stream:
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1315
        """
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1316
        def get_adapter(adapter_key):
1317
            try:
1318
                return adapters[adapter_key]
1319
            except KeyError:
1320
                adapter_factory = adapter_registry.get(adapter_key)
1321
                adapter = adapter_factory(self)
1322
                adapters[adapter_key] = adapter
1323
                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.
1324
        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.
1325
            # 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.
1326
            annotated = "annotated-"
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1327
            convertibles = []
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1328
        else:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1329
            # 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.
1330
            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.
1331
            convertibles = set(["knit-annotated-ft-gz"])
1332
            if self._max_delta_chain:
1333
                convertibles.add("knit-annotated-delta-gz")
3350.3.22 by Robert Collins
Review feedback.
1334
        # 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.
1335
        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.
1336
        if self._max_delta_chain:
1337
            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.
1338
        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.
1339
        knit_types = native_types.union(convertibles)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1340
        adapters = {}
3350.3.22 by Robert Collins
Review feedback.
1341
        # 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.
1342
        # basis parent is missing. We don't buffer all because generating
1343
        # annotations may require access to some of the new records. However we
1344
        # can't generate annotations from new deltas until their basis parent
1345
        # is present anyway, so we get away with not needing an index that
3350.3.22 by Robert Collins
Review feedback.
1346
        # 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.
1347
        # key = basis_parent, value = index entry to add
1348
        buffered_index_entries = {}
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1349
        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.
1350
            parents = record.parents
3350.3.15 by Robert Collins
Update the insert_record_stream contract to error if an absent record is provided.
1351
            # Raise an error when a record is missing.
1352
            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.
1353
                raise RevisionNotPresent([record.key], self)
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1354
            if record.storage_kind in knit_types:
1355
                if record.storage_kind not in native_types:
1356
                    try:
1357
                        adapter_key = (record.storage_kind, "knit-delta-gz")
1358
                        adapter = get_adapter(adapter_key)
1359
                    except KeyError:
1360
                        adapter_key = (record.storage_kind, "knit-ft-gz")
1361
                        adapter = get_adapter(adapter_key)
1362
                    bytes = adapter.get_bytes(
1363
                        record, record.get_bytes_as(record.storage_kind))
1364
                else:
1365
                    bytes = record.get_bytes_as(record.storage_kind)
1366
                options = [record._build_details[0]]
1367
                if record._build_details[1]:
1368
                    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.
1369
                # Just blat it across.
1370
                # Note: This does end up adding data on duplicate keys. As
1371
                # modern repositories use atomic insertions this should not
1372
                # lead to excessive growth in the event of interrupted fetches.
1373
                # 'knit' repositories may suffer excessive growth, but as a
1374
                # deprecated format this is tolerable. It can be fixed if
1375
                # needed by in the kndx index support raising on a duplicate
1376
                # 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.
1377
                access_memo = self._access.add_raw_records(
1378
                    [(record.key, len(bytes))], bytes)[0]
1379
                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.
1380
                buffered = False
1381
                if 'fulltext' not in options:
1382
                    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.
1383
                    # Note that pack backed knits don't need to buffer here
1384
                    # because they buffer all writes to the transaction level,
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1385
                    # 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.
1386
                    # the query here has sufficient cost to show up in
1387
                    # profiling we should do that.
1388
                    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.
1389
                        pending = buffered_index_entries.setdefault(
1390
                            basis_parent, [])
1391
                        pending.append(index_entry)
1392
                        buffered = True
1393
                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.
1394
                    self._index.add_records([index_entry])
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1395
            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.
1396
                self.add_lines(record.key, parents,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1397
                    split_lines(record.get_bytes_as('fulltext')))
1398
            else:
1399
                adapter_key = record.storage_kind, 'fulltext'
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1400
                adapter = get_adapter(adapter_key)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1401
                lines = split_lines(adapter.get_bytes(
1402
                    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.
1403
                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.
1404
                    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.
1405
                except errors.RevisionAlreadyPresent:
1406
                    pass
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1407
            # 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.
1408
            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.
1409
            while added_keys:
1410
                key = added_keys.pop(0)
1411
                if key in buffered_index_entries:
1412
                    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.
1413
                    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.
1414
                    added_keys.extend(
1415
                        [index_entry[0] for index_entry in index_entries])
1416
                    del buffered_index_entries[key]
1417
        # If there were any deltas which had a missing basis parent, error.
1418
        if buffered_index_entries:
1419
            raise errors.RevisionNotPresent(buffered_index_entries.keys()[0],
1420
                self)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1421
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1422
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1423
        """Iterate over the lines in the versioned files from keys.
1424
1425
        This may return lines from other keys. Each item the returned
1426
        iterator yields is a tuple of a line and a text version that that line
1427
        is present in (not introduced in).
1428
1429
        Ordering of results is in whatever order is most suitable for the
1430
        underlying storage format.
1431
1432
        If a progress bar is supplied, it may be used to indicate progress.
1433
        The caller is responsible for cleaning up progress bars (because this
1434
        is an iterator).
1435
1436
        NOTES:
1437
         * Lines are normalised by the underlying store: they will all have \n
1438
           terminators.
1439
         * Lines are returned in arbitrary order.
1440
1441
        :return: An iterator over (line, key).
1442
        """
1443
        if pb is None:
1444
            pb = progress.DummyProgress()
1445
        keys = set(keys)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1446
        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.
1447
        # we don't care about inclusions, the caller cares.
1448
        # but we need to setup a list of records to visit.
1449
        # we need key, position, length
1450
        key_records = []
1451
        build_details = self._index.get_build_details(keys)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1452
        for key, details in build_details.iteritems():
1453
            if key in keys:
1454
                key_records.append((key, details[0]))
1455
                keys.remove(key)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1456
        records_iter = enumerate(self._read_records_iter(key_records))
1457
        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.
1458
            pb.update('Walking content.', key_idx, total)
1459
            compression_parent = build_details[key][1]
1460
            if compression_parent is None:
1461
                # fulltext
1462
                line_iterator = self._factory.get_fulltext_content(data)
1463
            else:
1464
                # Delta 
1465
                line_iterator = self._factory.get_linedelta_content(data)
1466
            # XXX: It might be more efficient to yield (key,
1467
            # line_iterator) in the future. However for now, this is a simpler
1468
            # change to integrate into the rest of the codebase. RBC 20071110
1469
            for line in line_iterator:
1470
                yield line, key
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1471
        for source in self._fallback_vfs:
1472
            if not keys:
1473
                break
1474
            source_keys = set()
1475
            for line, key in source.iter_lines_added_or_present_in_keys(keys):
1476
                source_keys.add(key)
1477
                yield line, key
1478
            keys.difference_update(source_keys)
1479
        if keys:
3749.1.1 by Martin Pool
Fix error construction in KnitVersionedFiles
1480
            # XXX: strictly the second parameter is meant to be the file id
1481
            # but it's not easily accessible here.
1482
            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.
1483
        pb.update('Walking content.', total, total)
1484
1485
    def _make_line_delta(self, delta_seq, new_content):
1486
        """Generate a line delta from delta_seq and new_content."""
1487
        diff_hunks = []
1488
        for op in delta_seq.get_opcodes():
1489
            if op[0] == 'equal':
1490
                continue
1491
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1492
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1493
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1494
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1495
                           delta=None, annotated=None,
1496
                           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.
1497
        """Merge annotations for content and generate deltas.
1498
        
1499
        This is done by comparing the annotations based on changes to the text
1500
        and generating a delta on the resulting full texts. If annotations are
1501
        not being created then a simple delta is created.
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
1502
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1503
        if left_matching_blocks is not None:
1504
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
1505
        else:
1506
            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.
1507
        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.
1508
            for parent_key in parents:
1509
                merge_content = self._get_content(parent_key, parent_texts)
1510
                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
1511
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1512
                else:
1513
                    seq = patiencediff.PatienceSequenceMatcher(
1514
                        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.
1515
                for i, j, n in seq.get_matching_blocks():
1516
                    if n == 0:
1517
                        continue
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
1518
                    # this copies (origin, text) pairs across to the new
1519
                    # content for any line that matches the last-checked
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1520
                    # 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.
1521
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1522
            # XXX: Robert says the following block is a workaround for a
1523
            # 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.
1524
            if content._lines and content._lines[-1][1][-1] != '\n':
1525
                # The copied annotation was from a line without a trailing EOL,
1526
                # reinstate one for the content object, to ensure correct
1527
                # serialization.
1528
                line = content._lines[-1][1] + '\n'
1529
                content._lines[-1] = (content._lines[-1][0], line)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1530
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1531
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1532
                reference_content = self._get_content(parents[0], parent_texts)
1533
                new_texts = content.text()
1534
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
1535
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
1536
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1537
            return self._make_line_delta(delta_seq, content)
1538
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1539
    def _parse_record(self, version_id, data):
1540
        """Parse an original format knit record.
1541
1542
        These have the last element of the key only present in the stored data.
1543
        """
1544
        rec, record_contents = self._parse_record_unchecked(data)
1545
        self._check_header_version(rec, version_id)
1546
        return record_contents, rec[3]
1547
1548
    def _parse_record_header(self, key, raw_data):
1549
        """Parse a record header for consistency.
1550
1551
        :return: the header and the decompressor stream.
1552
                 as (stream, header_record)
1553
        """
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1554
        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.
1555
        try:
1556
            # Current serialise
1557
            rec = self._check_header(key, df.readline())
1558
        except Exception, e:
1559
            raise KnitCorrupt(self,
1560
                              "While reading {%s} got %s(%s)"
1561
                              % (key, e.__class__.__name__, str(e)))
1562
        return df, rec
1563
1564
    def _parse_record_unchecked(self, data):
1565
        # profiling notes:
1566
        # 4168 calls in 2880 217 internal
1567
        # 4168 calls to _parse_record_header in 2121
1568
        # 4168 calls to readlines in 330
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1569
        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.
1570
        try:
1571
            record_contents = df.readlines()
1572
        except Exception, e:
1573
            raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
1574
                (data, e.__class__.__name__, str(e)))
1575
        header = record_contents.pop(0)
1576
        rec = self._split_header(header)
1577
        last_line = record_contents.pop()
1578
        if len(record_contents) != int(rec[2]):
1579
            raise KnitCorrupt(self,
1580
                              'incorrect number of lines %s != %s'
1581
                              ' for version {%s} %s'
1582
                              % (len(record_contents), int(rec[2]),
1583
                                 rec[1], record_contents))
1584
        if last_line != 'end %s\n' % rec[1]:
1585
            raise KnitCorrupt(self,
1586
                              'unexpected version end line %r, wanted %r' 
1587
                              % (last_line, rec[1]))
1588
        df.close()
1589
        return rec, record_contents
1590
1591
    def _read_records_iter(self, records):
1592
        """Read text records from data file and yield result.
1593
1594
        The result will be returned in whatever is the fastest to read.
1595
        Not by the order requested. Also, multiple requests for the same
1596
        record will only yield 1 response.
1597
        :param records: A list of (key, access_memo) entries
1598
        :return: Yields (key, contents, digest) in the order
1599
                 read, not the order requested
1600
        """
1601
        if not records:
1602
            return
1603
1604
        # XXX: This smells wrong, IO may not be getting ordered right.
1605
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1606
        if not needed_records:
1607
            return
1608
1609
        # The transport optimizes the fetching as well 
1610
        # (ie, reads continuous ranges.)
1611
        raw_data = self._access.get_raw_records(
1612
            [index_memo for key, index_memo in needed_records])
1613
1614
        for (key, index_memo), data in \
1615
                izip(iter(needed_records), raw_data):
1616
            content, digest = self._parse_record(key[-1], data)
1617
            yield key, content, digest
1618
1619
    def _read_records_iter_raw(self, records):
1620
        """Read text records from data file and yield raw data.
1621
1622
        This unpacks enough of the text record to validate the id is
1623
        as expected but thats all.
1624
1625
        Each item the iterator yields is (key, bytes, sha1_of_full_text).
1626
        """
1627
        # setup an iterator of the external records:
1628
        # uses readv so nice and fast we hope.
1629
        if len(records):
1630
            # grab the disk data needed.
1631
            needed_offsets = [index_memo for key, index_memo
1632
                                           in records]
1633
            raw_records = self._access.get_raw_records(needed_offsets)
1634
1635
        for key, index_memo in records:
1636
            data = raw_records.next()
1637
            # validate the header (note that we can only use the suffix in
1638
            # current knit records).
1639
            df, rec = self._parse_record_header(key, data)
1640
            df.close()
1641
            yield key, data, rec[3]
1642
1643
    def _record_to_data(self, key, digest, lines, dense_lines=None):
1644
        """Convert key, digest, lines into a raw data block.
1645
        
1646
        :param key: The key of the record. Currently keys are always serialised
1647
            using just the trailing component.
1648
        :param dense_lines: The bytes of lines but in a denser form. For
1649
            instance, if lines is a list of 1000 bytestrings each ending in \n,
1650
            dense_lines may be a list with one line in it, containing all the
1651
            1000's lines and their \n's. Using dense_lines if it is already
1652
            known is a win because the string join to create bytes in this
1653
            function spends less time resizing the final string.
1654
        :return: (len, a StringIO instance with the raw data ready to read.)
1655
        """
1656
        # Note: using a string copy here increases memory pressure with e.g.
1657
        # ISO's, but it is about 3 seconds faster on a 1.2Ghz intel machine
1658
        # when doing the initial commit of a mozilla tree. RBC 20070921
1659
        bytes = ''.join(chain(
1660
            ["version %s %d %s\n" % (key[-1],
1661
                                     len(lines),
1662
                                     digest)],
1663
            dense_lines or lines,
1664
            ["end %s\n" % key[-1]]))
1665
        if type(bytes) != str:
1666
            raise AssertionError(
1667
                'data must be plain bytes was %s' % type(bytes))
1668
        if lines and lines[-1][-1] != '\n':
1669
            raise ValueError('corrupt lines value %r' % lines)
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
1670
        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.
1671
        return len(compressed_bytes), compressed_bytes
1672
1673
    def _split_header(self, line):
1674
        rec = line.split()
1675
        if len(rec) != 4:
1676
            raise KnitCorrupt(self,
1677
                              'unexpected number of elements in record header')
1678
        return rec
1679
1680
    def keys(self):
1681
        """See VersionedFiles.keys."""
1682
        if 'evil' in debug.debug_flags:
1683
            trace.mutter_callsite(2, "keys scales with size of history")
3350.8.4 by Robert Collins
Vf.keys() stacking support.
1684
        sources = [self._index] + self._fallback_vfs
1685
        result = set()
1686
        for source in sources:
1687
            result.update(source.keys())
1688
        return result
1689
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1690
1691
class _KndxIndex(object):
1692
    """Manages knit index files
1693
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1694
    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.
1695
    fast lookups of revision information.  The cursor of the index
1696
    file is always pointing to the end, making it easy to append
1697
    entries.
1698
1699
    _cache is a cache for fast mapping from version id to a Index
1700
    object.
1701
1702
    _history is a cache for fast mapping from indexes to version ids.
1703
1704
    The index data format is dictionary compressed when it comes to
1705
    parent references; a index entry may only have parents that with a
1706
    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.
1707
1708
    Duplicate entries may be written to the index for a single version id
1709
    if this is done then the latter one completely replaces the former:
1710
    this allows updates to correct version and parent information. 
1711
    Note that the two entries may share the delta, and that successive
1712
    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.
1713
1714
    The index file on disc contains a header, followed by one line per knit
1715
    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).
1716
    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.
1717
    
1718
    The format of a single line is
1719
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1720
    REVISION_ID is a utf8-encoded revision id
1721
    FLAGS is a comma separated list of flags about the record. Values include 
1722
        no-eol, line-delta, fulltext.
1723
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1724
        that the the compressed data starts at.
1725
    LENGTH is the ascii representation of the length of the data file.
1726
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1727
        REVISION_ID.
1728
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1729
        revision id already in the knit that is a parent of REVISION_ID.
1730
    The ' :' marker is the end of record marker.
1731
    
1732
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1733
    when a write is interrupted to the index file, it will result in a line
1734
    that does not end in ' :'. If the ' :' is not present at the end of a line,
1735
    or at the end of the file, then the record that is missing it will be
1736
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1737
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1738
    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.
1739
    to ensure that records always start on new lines even if the last write was
1740
    interrupted. As a result its normal for the last line in the index to be
1741
    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
1742
1743
    :ivar _kndx_cache: dict from prefix to the old state of KnitIndex objects,
1744
        where prefix is e.g. the (fileid,) for .texts instances or () for
1745
        constant-mapped things like .revisions, and the old state is
1746
        tuple(history_vector, cache_dict).  This is used to prevent having an
1747
        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.
1748
    """
1749
1666.1.6 by Robert Collins
Make knit the default format.
1750
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1751
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1752
    def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
1753
        """Create a _KndxIndex on transport using mapper."""
1754
        self._transport = transport
1755
        self._mapper = mapper
1756
        self._get_scope = get_scope
1757
        self._allow_writes = allow_writes
1758
        self._is_locked = is_locked
1759
        self._reset_cache()
1760
        self.has_graph = True
1761
1762
    def add_records(self, records, random_id=False):
1763
        """Add multiple records to the index.
1764
        
1765
        :param records: a list of tuples:
1766
                         (key, options, access_memo, parents).
1767
        :param random_id: If True the ids being added were randomly generated
1768
            and no check for existence will be performed.
1769
        """
1770
        paths = {}
1771
        for record in records:
1772
            key = record[0]
1773
            prefix = key[:-1]
1774
            path = self._mapper.map(key) + '.kndx'
1775
            path_keys = paths.setdefault(path, (prefix, []))
1776
            path_keys[1].append(record)
1777
        for path in sorted(paths):
1778
            prefix, path_keys = paths[path]
1779
            self._load_prefixes([prefix])
1780
            lines = []
1781
            orig_history = self._kndx_cache[prefix][1][:]
1782
            orig_cache = self._kndx_cache[prefix][0].copy()
1783
1784
            try:
1785
                for key, options, (_, pos, size), parents in path_keys:
1786
                    if parents is None:
1787
                        # kndx indices cannot be parentless.
1788
                        parents = ()
1789
                    line = "\n%s %s %s %s %s :" % (
1790
                        key[-1], ','.join(options), pos, size,
1791
                        self._dictionary_compress(parents))
1792
                    if type(line) != str:
1793
                        raise AssertionError(
1794
                            'data must be utf8 was %s' % type(line))
1795
                    lines.append(line)
1796
                    self._cache_key(key, options, pos, size, parents)
1797
                if len(orig_history):
1798
                    self._transport.append_bytes(path, ''.join(lines))
1799
                else:
1800
                    self._init_index(path, lines)
1801
            except:
1802
                # If any problems happen, restore the original values and re-raise
1803
                self._kndx_cache[prefix] = (orig_cache, orig_history)
1804
                raise
1805
1806
    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.
1807
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1808
1809
        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.
1810
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1811
         indexes).
1812
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1813
        prefix = key[:-1]
1814
        version_id = key[-1]
1815
        # last-element only for compatibilty with the C load_data.
1816
        parents = tuple(parent[-1] for parent in parent_keys)
1817
        for parent in parent_keys:
1818
            if parent[:-1] != prefix:
1819
                raise ValueError("mismatched prefixes for %r, %r" % (
1820
                    key, parent_keys))
1821
        cache, history = self._kndx_cache[prefix]
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1822
        # only want the _history index to reference the 1st index entry
1823
        # 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.
1824
        if version_id not in cache:
1825
            index = len(history)
1826
            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
1827
        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.
1828
            index = cache[version_id][5]
1829
        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
1830
                                   options,
1831
                                   pos,
1832
                                   size,
1833
                                   parents,
1834
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1835
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1836
    def check_header(self, fp):
1837
        line = fp.readline()
1838
        if line == '':
1839
            # An empty file can actually be treated as though the file doesn't
1840
            # exist yet.
1841
            raise errors.NoSuchFile(self)
1842
        if line != self.HEADER:
1843
            raise KnitHeaderError(badline=line, filename=self)
1844
1845
    def _check_read(self):
1846
        if not self._is_locked():
1847
            raise errors.ObjectNotLocked(self)
1848
        if self._get_scope() != self._scope:
1849
            self._reset_cache()
1850
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1851
    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.
1852
        """Assert if not writes are permitted."""
1853
        if not self._is_locked():
1854
            raise errors.ObjectNotLocked(self)
3316.2.5 by Robert Collins
Review feedback.
1855
        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.
1856
            self._reset_cache()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1857
        if self._mode != 'w':
1858
            raise errors.ReadOnlyObjectDirtiedError(self)
1859
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1860
    def get_build_details(self, keys):
1861
        """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.
1862
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
1863
        Ghosts are omitted from the result.
1864
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1865
        :param keys: An iterable of keys.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1866
        :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.
1867
            record_details).
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1868
            index_memo
1869
                opaque structure to pass to read_records to extract the raw
1870
                data
1871
            compression_parent
1872
                Content that this record is built upon, may be None
1873
            parents
1874
                Logical parents of this node
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1875
            record_details
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1876
                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,
1877
                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.
1878
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1879
        prefixes = self._partition_keys(keys)
1880
        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.
1881
        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.
1882
        for key in keys:
1883
            if key not in parent_map:
1884
                continue # Ghost
1885
            method = self.get_method(key)
1886
            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.
1887
            if method == 'fulltext':
1888
                compression_parent = None
1889
            else:
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
1890
                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.
1891
            noeol = 'no-eol' in self.get_options(key)
1892
            index_memo = self.get_position(key)
1893
            result[key] = (index_memo, compression_parent,
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1894
                                  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.
1895
        return result
1896
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1897
    def get_method(self, key):
1898
        """Return compression method of specified key."""
1899
        options = self.get_options(key)
1900
        if 'fulltext' in options:
1901
            return 'fulltext'
1902
        elif 'line-delta' in options:
1903
            return 'line-delta'
1904
        else:
1905
            raise errors.KnitIndexUnknownMethod(self, options)
1906
1907
    def get_options(self, key):
1908
        """Return a list representing options.
1909
1910
        e.g. ['foo', 'bar']
1911
        """
1912
        prefix, suffix = self._split_key(key)
1913
        self._load_prefixes([prefix])
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1914
        try:
1915
            return self._kndx_cache[prefix][0][suffix][1]
1916
        except KeyError:
1917
            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.
1918
1919
    def get_parent_map(self, keys):
1920
        """Get a map of the parents of keys.
1921
1922
        :param keys: The keys to look up parents for.
1923
        :return: A mapping from keys to parents. Absent keys are absent from
1924
            the mapping.
1925
        """
1926
        # Parse what we need to up front, this potentially trades off I/O
1927
        # locality (.kndx and .knit in the same block group for the same file
1928
        # id) for less checking in inner loops.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1929
        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.
1930
        self._load_prefixes(prefixes)
1931
        result = {}
1932
        for key in keys:
1933
            prefix = key[:-1]
1934
            try:
1935
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
1936
            except KeyError:
1937
                pass
1938
            else:
1939
                result[key] = tuple(prefix + (suffix,) for
1940
                    suffix in suffix_parents)
1941
        return result
1942
1943
    def get_position(self, key):
1944
        """Return details needed to access the version.
1945
        
1946
        :return: a tuple (key, data position, size) to hand to the access
1947
            logic to get the record.
1948
        """
1949
        prefix, suffix = self._split_key(key)
1950
        self._load_prefixes([prefix])
1951
        entry = self._kndx_cache[prefix][0][suffix]
1952
        return key, entry[2], entry[3]
1953
1954
    def _init_index(self, path, extra_lines=[]):
1955
        """Initialize an index."""
1956
        sio = StringIO()
1957
        sio.write(self.HEADER)
1958
        sio.writelines(extra_lines)
1959
        sio.seek(0)
1960
        self._transport.put_file_non_atomic(path, sio,
1961
                            create_parent_dir=True)
1962
                           # self._create_parent_dir)
1963
                           # mode=self._file_mode,
1964
                           # dir_mode=self._dir_mode)
1965
1966
    def keys(self):
1967
        """Get all the keys in the collection.
1968
        
1969
        The keys are not ordered.
1970
        """
1971
        result = set()
1972
        # Identify all key prefixes.
1973
        # XXX: A bit hacky, needs polish.
1974
        if type(self._mapper) == ConstantMapper:
1975
            prefixes = [()]
1976
        else:
1977
            relpaths = set()
1978
            for quoted_relpath in self._transport.iter_files_recursive():
1979
                path, ext = os.path.splitext(quoted_relpath)
1980
                relpaths.add(path)
1981
            prefixes = [self._mapper.unmap(path) for path in relpaths]
1982
        self._load_prefixes(prefixes)
1983
        for prefix in prefixes:
1984
            for suffix in self._kndx_cache[prefix][1]:
1985
                result.add(prefix + (suffix,))
1986
        return result
1987
    
1988
    def _load_prefixes(self, prefixes):
1989
        """Load the indices for prefixes."""
1990
        self._check_read()
1991
        for prefix in prefixes:
1992
            if prefix not in self._kndx_cache:
1993
                # the load_data interface writes to these variables.
1994
                self._cache = {}
1995
                self._history = []
1996
                self._filename = prefix
1997
                try:
1998
                    path = self._mapper.map(prefix) + '.kndx'
1999
                    fp = self._transport.get(path)
2000
                    try:
2001
                        # _load_data may raise NoSuchFile if the target knit is
2002
                        # completely empty.
2003
                        _load_data(self, fp)
2004
                    finally:
2005
                        fp.close()
2006
                    self._kndx_cache[prefix] = (self._cache, self._history)
2007
                    del self._cache
2008
                    del self._filename
2009
                    del self._history
2010
                except NoSuchFile:
2011
                    self._kndx_cache[prefix] = ({}, [])
2012
                    if type(self._mapper) == ConstantMapper:
2013
                        # preserve behaviour for revisions.kndx etc.
2014
                        self._init_index(path)
2015
                    del self._cache
2016
                    del self._filename
2017
                    del self._history
2018
2019
    def _partition_keys(self, keys):
2020
        """Turn keys into a dict of prefix:suffix_list."""
2021
        result = {}
2022
        for key in keys:
2023
            prefix_keys = result.setdefault(key[:-1], [])
2024
            prefix_keys.append(key[-1])
2025
        return result
2026
2027
    def _dictionary_compress(self, keys):
2028
        """Dictionary compress keys.
2029
        
2030
        :param keys: The keys to generate references to.
2031
        :return: A string representation of keys. keys which are present are
2032
            dictionary compressed, and others are emitted as fulltext with a
2033
            '.' prefix.
2034
        """
2035
        if not keys:
2036
            return ''
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2037
        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.
2038
        prefix = keys[0][:-1]
2039
        cache = self._kndx_cache[prefix][0]
2040
        for key in keys:
2041
            if key[:-1] != prefix:
2042
                # kndx indices cannot refer across partitioned storage.
2043
                raise ValueError("mismatched prefixes for %r" % keys)
2044
            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
2045
                # -- 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.
2046
                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
2047
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2048
            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.
2049
                result_list.append('.' + key[-1])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2050
        return ' '.join(result_list)
2051
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2052
    def _reset_cache(self):
2053
        # Possibly this should be a LRU cache. A dictionary from key_prefix to
2054
        # (cache_dict, history_vector) for parsed kndx files.
2055
        self._kndx_cache = {}
2056
        self._scope = self._get_scope()
2057
        allow_writes = self._allow_writes()
2058
        if allow_writes:
2059
            self._mode = 'w'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2060
        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.
2061
            self._mode = 'r'
2062
2063
    def _split_key(self, key):
2064
        """Split key into a prefix and suffix."""
2065
        return key[:-1], key[-1]
2066
2067
2068
class _KnitGraphIndex(object):
2069
    """A KnitVersionedFiles index layered on GraphIndex."""
2070
2071
    def __init__(self, graph_index, is_locked, deltas=False, parents=True,
2072
        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.
2073
        """Construct a KnitGraphIndex on a graph_index.
2074
2075
        :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.
2076
        :param is_locked: A callback to check whether the object should answer
2077
            queries.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2078
        :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.
2079
        :param parents: If True, record knits parents, if not do not record 
2080
            parents.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2081
        :param add_callback: If not None, allow additions to the index and call
2082
            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.
2083
            [(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.
2084
        :param is_locked: A callback, returns True if the index is locked and
2085
            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.
2086
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2087
        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.
2088
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2089
        self._deltas = deltas
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2090
        self._parents = parents
2091
        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.
2092
            # XXX: TODO: Delta tree and parent graph should be conceptually
2093
            # separate.
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2094
            raise KnitCorrupt(self, "Cannot do delta compression without "
2095
                "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.
2096
        self.has_graph = parents
2097
        self._is_locked = is_locked
2098
3517.4.13 by Martin Pool
Add repr methods
2099
    def __repr__(self):
2100
        return "%s(%r)" % (self.__class__.__name__, self._graph_index)
2101
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2102
    def add_records(self, records, random_id=False):
2103
        """Add multiple records to the index.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2104
        
2105
        This function does not insert data into the Immutable GraphIndex
2106
        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.
2107
        the caller and checks that it is safe to insert then calls
2108
        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.
2109
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2110
        :param records: a list of tuples:
2111
                         (key, options, access_memo, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2112
        :param random_id: If True the ids being added were randomly generated
2113
            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.
2114
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2115
        if not self._add_callback:
2116
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2117
        # we hope there are no repositories with inconsistent parentage
2118
        # anymore.
2119
2120
        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.
2121
        for (key, options, access_memo, parents) in records:
2122
            if self._parents:
2123
                parents = tuple(parents)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2124
            index, pos, size = access_memo
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2125
            if 'no-eol' in options:
2126
                value = 'N'
2127
            else:
2128
                value = ' '
2129
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2130
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2131
                if 'line-delta' in options:
2132
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2133
            if self._parents:
2134
                if self._deltas:
2135
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2136
                        node_refs = (parents, (parents[0],))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2137
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2138
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2139
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2140
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2141
            else:
2142
                if parents:
2143
                    raise KnitCorrupt(self, "attempt to add node with parents "
2144
                        "in parentless index.")
2145
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2146
            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.
2147
        # check for dups
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2148
        if not random_id:
2149
            present_nodes = self._get_entries(keys)
2150
            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.
2151
                if (value[0] != keys[key][0][0] or
2152
                    node_refs != keys[key][1]):
2153
                    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
2154
                        ": %s %s" % ((value, node_refs), keys[key]))
2155
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2156
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2157
        if self._parents:
2158
            for key, (value, node_refs) in keys.iteritems():
2159
                result.append((key, value, node_refs))
2160
        else:
2161
            for key, (value, node_refs) in keys.iteritems():
2162
                result.append((key, value))
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2163
        self._add_callback(result)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2164
        
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2165
    def _check_read(self):
2166
        """raise if reads are not permitted."""
2167
        if not self._is_locked():
2168
            raise errors.ObjectNotLocked(self)
2169
2170
    def _check_write_ok(self):
2171
        """Assert if writes are not permitted."""
2172
        if not self._is_locked():
2173
            raise errors.ObjectNotLocked(self)
2174
2175
    def _compression_parent(self, an_entry):
2176
        # return the key that an_entry is compressed against, or None
2177
        # Grab the second parent list (as deltas implies parents currently)
2178
        compression_parents = an_entry[3][1]
2179
        if not compression_parents:
2180
            return None
2181
        if len(compression_parents) != 1:
2182
            raise AssertionError(
2183
                "Too many compression parents: %r" % compression_parents)
2184
        return compression_parents[0]
2185
2186
    def get_build_details(self, keys):
2187
        """Get the method, index_memo and compression parent for version_ids.
2188
2189
        Ghosts are omitted from the result.
2190
2191
        :param keys: An iterable of keys.
2192
        :return: A dict of key:
2193
            (index_memo, compression_parent, parents, record_details).
2194
            index_memo
2195
                opaque structure to pass to read_records to extract the raw
2196
                data
2197
            compression_parent
2198
                Content that this record is built upon, may be None
2199
            parents
2200
                Logical parents of this node
2201
            record_details
2202
                extra information about the content which needs to be passed to
2203
                Factory.parse_record
2204
        """
2205
        self._check_read()
2206
        result = {}
2207
        entries = self._get_entries(keys, False)
2208
        for entry in entries:
2209
            key = entry[1]
2210
            if not self._parents:
2211
                parents = ()
2212
            else:
2213
                parents = entry[3][0]
2214
            if not self._deltas:
2215
                compression_parent_key = None
2216
            else:
2217
                compression_parent_key = self._compression_parent(entry)
2218
            noeol = (entry[2][0] == 'N')
2219
            if compression_parent_key:
2220
                method = 'line-delta'
2221
            else:
2222
                method = 'fulltext'
2223
            result[key] = (self._node_to_position(entry),
2224
                                  compression_parent_key, parents,
2225
                                  (method, noeol))
2226
        return result
2227
2228
    def _get_entries(self, keys, check_present=False):
2229
        """Get the entries for keys.
2230
        
2231
        :param keys: An iterable of index key tuples.
2232
        """
2233
        keys = set(keys)
2234
        found_keys = set()
2235
        if self._parents:
2236
            for node in self._graph_index.iter_entries(keys):
2237
                yield node
2238
                found_keys.add(node[1])
2239
        else:
2240
            # adapt parentless index to the rest of the code.
2241
            for node in self._graph_index.iter_entries(keys):
2242
                yield node[0], node[1], node[2], ()
2243
                found_keys.add(node[1])
2244
        if check_present:
2245
            missing_keys = keys.difference(found_keys)
2246
            if missing_keys:
2247
                raise RevisionNotPresent(missing_keys.pop(), self)
2248
2249
    def get_method(self, key):
2250
        """Return compression method of specified key."""
2251
        return self._get_method(self._get_node(key))
2252
2253
    def _get_method(self, node):
2254
        if not self._deltas:
2255
            return 'fulltext'
2256
        if self._compression_parent(node):
2257
            return 'line-delta'
2258
        else:
2259
            return 'fulltext'
2260
2261
    def _get_node(self, key):
2262
        try:
2263
            return list(self._get_entries([key]))[0]
2264
        except IndexError:
2265
            raise RevisionNotPresent(key, self)
2266
2267
    def get_options(self, key):
2268
        """Return a list representing options.
2269
2270
        e.g. ['foo', 'bar']
2271
        """
2272
        node = self._get_node(key)
2273
        options = [self._get_method(node)]
2274
        if node[2][0] == 'N':
2275
            options.append('no-eol')
2276
        return options
2277
2278
    def get_parent_map(self, keys):
2279
        """Get a map of the parents of keys.
2280
2281
        :param keys: The keys to look up parents for.
2282
        :return: A mapping from keys to parents. Absent keys are absent from
2283
            the mapping.
2284
        """
2285
        self._check_read()
2286
        nodes = self._get_entries(keys)
2287
        result = {}
2288
        if self._parents:
2289
            for node in nodes:
2290
                result[node[1]] = node[3][0]
2291
        else:
2292
            for node in nodes:
2293
                result[node[1]] = None
2294
        return result
2295
2296
    def get_position(self, key):
2297
        """Return details needed to access the version.
2298
        
2299
        :return: a tuple (index, data position, size) to hand to the access
2300
            logic to get the record.
2301
        """
2302
        node = self._get_node(key)
2303
        return self._node_to_position(node)
2304
2305
    def keys(self):
2306
        """Get all the keys in the collection.
2307
        
2308
        The keys are not ordered.
2309
        """
2310
        self._check_read()
2311
        return [node[1] for node in self._graph_index.iter_all_entries()]
2312
    
2313
    def _node_to_position(self, node):
2314
        """Convert an index value to position details."""
2315
        bits = node[2][1:].split(' ')
2316
        return node[0], int(bits[0]), int(bits[1])
2317
2318
2319
class _KnitKeyAccess(object):
2320
    """Access to records in .knit files."""
2321
2322
    def __init__(self, transport, mapper):
2323
        """Create a _KnitKeyAccess with transport and mapper.
2324
2325
        :param transport: The transport the access object is rooted at.
2326
        :param mapper: The mapper used to map keys to .knit files.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2327
        """
2328
        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.
2329
        self._mapper = mapper
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2330
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2331
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2332
        """Add raw knit bytes to a storage area.
2333
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2334
        The data is spooled to the container writer in one bytes-record per
2335
        raw data item.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2336
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2337
        :param sizes: An iterable of tuples containing the key and size of each
2338
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2339
        :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.
2340
        :return: A list of memos to retrieve the record later. Each memo is an
2341
            opaque index memo. For _KnitKeyAccess the memo is (key, pos,
2342
            length), where the key is the record key.
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
        if type(raw_data) != str:
2345
            raise AssertionError(
2346
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2347
        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.
2348
        offset = 0
2349
        # TODO: This can be tuned for writing to sftp and other servers where
2350
        # append() is relatively expensive by grouping the writes to each key
2351
        # prefix.
2352
        for key, size in key_sizes:
2353
            path = self._mapper.map(key)
2354
            try:
2355
                base = self._transport.append_bytes(path + '.knit',
2356
                    raw_data[offset:offset+size])
2357
            except errors.NoSuchFile:
2358
                self._transport.mkdir(osutils.dirname(path))
2359
                base = self._transport.append_bytes(path + '.knit',
2360
                    raw_data[offset:offset+size])
2361
            # if base == 0:
2362
            # chmod.
2363
            offset += size
2364
            result.append((key, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2365
        return result
2366
2367
    def get_raw_records(self, memos_for_retrieval):
2368
        """Get the raw bytes for a records.
2369
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2370
        :param memos_for_retrieval: An iterable containing the access memo for
2371
            retrieving the bytes.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2372
        :return: An iterator over the bytes of the records.
2373
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2374
        # first pass, group into same-index request to minimise readv's issued.
2375
        request_lists = []
2376
        current_prefix = None
2377
        for (key, offset, length) in memos_for_retrieval:
2378
            if current_prefix == key[:-1]:
2379
                current_list.append((offset, length))
2380
            else:
2381
                if current_prefix is not None:
2382
                    request_lists.append((current_prefix, current_list))
2383
                current_prefix = key[:-1]
2384
                current_list = [(offset, length)]
2385
        # handle the last entry
2386
        if current_prefix is not None:
2387
            request_lists.append((current_prefix, current_list))
2388
        for prefix, read_vector in request_lists:
2389
            path = self._mapper.map(prefix) + '.knit'
2390
            for pos, data in self._transport.readv(path, read_vector):
2391
                yield data
2392
2393
2394
class _DirectPackAccess(object):
2395
    """Access to data in one or more packs with less translation."""
2396
2397
    def __init__(self, index_to_packs):
2398
        """Create a _DirectPackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2399
2400
        :param index_to_packs: A dict mapping index objects to the transport
2401
            and file names for obtaining data.
2402
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2403
        self._container_writer = None
2404
        self._write_index = None
2405
        self._indices = index_to_packs
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2406
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2407
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2408
        """Add raw knit bytes to a storage area.
2409
2670.2.3 by Robert Collins
Review feedback.
2410
        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.
2411
        raw data item.
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
        :param sizes: An iterable of tuples containing the key and size of each
2414
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2415
        :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.
2416
        :return: A list of memos to retrieve the record later. Each memo is an
2417
            opaque index memo. For _DirectPackAccess the memo is (index, pos,
2418
            length), where the index field is the write_index object supplied
2419
            to the PackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2420
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2421
        if type(raw_data) != str:
2422
            raise AssertionError(
2423
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2424
        result = []
2425
        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.
2426
        for key, size in key_sizes:
2427
            p_offset, p_length = self._container_writer.add_bytes_record(
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2428
                raw_data[offset:offset+size], [])
2429
            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.
2430
            result.append((self._write_index, p_offset, p_length))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2431
        return result
2432
2433
    def get_raw_records(self, memos_for_retrieval):
2434
        """Get the raw bytes for a records.
2435
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2436
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2437
            length) memo for retrieving the bytes. The Pack access method
2438
            looks up the pack to use for a given record in its index_to_pack
2439
            map.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2440
        :return: An iterator over the bytes of the records.
2441
        """
2442
        # first pass, group into same-index requests
2443
        request_lists = []
2444
        current_index = None
2445
        for (index, offset, length) in memos_for_retrieval:
2446
            if current_index == index:
2447
                current_list.append((offset, length))
2448
            else:
2449
                if current_index is not None:
2450
                    request_lists.append((current_index, current_list))
2451
                current_index = index
2452
                current_list = [(offset, length)]
2453
        # handle the last entry
2454
        if current_index is not None:
2455
            request_lists.append((current_index, current_list))
2456
        for index, offsets in request_lists:
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
2457
            try:
2458
                transport, path = self._indices[index]
2459
            except KeyError:
2460
                # A KeyError here indicates that someone has triggered an index
2461
                # reload, and this index has gone missing, we need to start
2462
                # over.
2463
                raise errors.RetryWithNewPacks(reload_occurred=True,
2464
                                               exc_info=sys.exc_info())
2465
            try:
2466
                reader = pack.make_readv_reader(transport, path, offsets)
2467
                for names, read_func in reader.iter_records():
2468
                    yield read_func(None)
2469
            except errors.NoSuchFile:
2470
                # A NoSuchFile error indicates that a pack file has gone
2471
                # missing on disk, we need to trigger a reload, and start over.
2472
                raise errors.RetryWithNewPacks(reload_occurred=False,
2473
                                               exc_info=sys.exc_info())
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2474
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2475
    def set_writer(self, writer, index, transport_packname):
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2476
        """Set a writer to use for adding data."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
2477
        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.
2478
            self._indices[index] = transport_packname
2479
        self._container_writer = writer
2480
        self._write_index = index
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2481
2482
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
2483
# Deprecated, use PatienceSequenceMatcher instead
2484
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2485
2486
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2487
def annotate_knit(knit, revision_id):
2488
    """Annotate a knit with no cached annotations.
2489
2490
    This implementation is for knits with no cached annotations.
2491
    It will work for knits with cached annotations, but this is not
2492
    recommended.
2493
    """
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2494
    annotator = _KnitAnnotator(knit)
3224.1.25 by John Arbash Meinel
Quick change to the _KnitAnnotator api to use .annotate() instead of get_annotated_lines()
2495
    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.
2496
2497
2498
class _KnitAnnotator(object):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2499
    """Build up the annotations for a text."""
2500
2501
    def __init__(self, knit):
2502
        self._knit = knit
2503
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2504
        # Content objects, differs from fulltexts because of how final newlines
2505
        # are treated by knits. the content objects here will always have a
2506
        # final newline
2507
        self._fulltext_contents = {}
2508
2509
        # Annotated lines of specific revisions
2510
        self._annotated_lines = {}
2511
2512
        # Track the raw data for nodes that we could not process yet.
2513
        # This maps the revision_id of the base to a list of children that will
2514
        # annotated from it.
2515
        self._pending_children = {}
2516
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2517
        # Nodes which cannot be extracted
2518
        self._ghosts = set()
2519
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2520
        # Track how many children this node has, so we know if we need to keep
2521
        # it
2522
        self._annotate_children = {}
2523
        self._compression_children = {}
2524
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2525
        self._all_build_details = {}
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2526
        # The children => parent revision_id graph
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2527
        self._revision_id_graph = {}
2528
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2529
        self._heads_provider = None
2530
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2531
        self._nodes_to_keep_annotations = set()
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2532
        self._generations_until_keep = 100
2533
2534
    def set_generations_until_keep(self, value):
2535
        """Set the number of generations before caching a node.
2536
2537
        Setting this to -1 will cache every merge node, setting this higher
2538
        will cache fewer nodes.
2539
        """
2540
        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.
2541
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2542
    def _add_fulltext_content(self, revision_id, content_obj):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2543
        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.
2544
        # 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.
2545
        return content_obj.text()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2546
2547
    def _check_parents(self, child, nodes_to_annotate):
2548
        """Check if all parents have been processed.
2549
2550
        :param child: A tuple of (rev_id, parents, raw_content)
2551
        :param nodes_to_annotate: If child is ready, add it to
2552
            nodes_to_annotate, otherwise put it back in self._pending_children
2553
        """
2554
        for parent_id in child[1]:
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2555
            if (parent_id not in self._annotated_lines):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2556
                # This parent is present, but another parent is missing
2557
                self._pending_children.setdefault(parent_id,
2558
                                                  []).append(child)
2559
                break
2560
        else:
2561
            # This one is ready to be processed
2562
            nodes_to_annotate.append(child)
2563
2564
    def _add_annotation(self, revision_id, fulltext, parent_ids,
2565
                        left_matching_blocks=None):
2566
        """Add an annotation entry.
2567
2568
        All parents should already have been annotated.
2569
        :return: A list of children that now have their parents satisfied.
2570
        """
2571
        a = self._annotated_lines
2572
        annotated_parent_lines = [a[p] for p in parent_ids]
2573
        annotated_lines = list(annotate.reannotate(annotated_parent_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2574
            fulltext, revision_id, left_matching_blocks,
2575
            heads_provider=self._get_heads_provider()))
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2576
        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.
2577
        for p in parent_ids:
2578
            ann_children = self._annotate_children[p]
2579
            ann_children.remove(revision_id)
2580
            if (not ann_children
2581
                and p not in self._nodes_to_keep_annotations):
2582
                del self._annotated_lines[p]
2583
                del self._all_build_details[p]
2584
                if p in self._fulltext_contents:
2585
                    del self._fulltext_contents[p]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2586
        # Now that we've added this one, see if there are any pending
2587
        # deltas to be done, certainly this parent is finished
2588
        nodes_to_annotate = []
2589
        for child in self._pending_children.pop(revision_id, []):
2590
            self._check_parents(child, nodes_to_annotate)
2591
        return nodes_to_annotate
2592
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2593
    def _get_build_graph(self, key):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2594
        """Get the graphs for building texts and annotations.
2595
2596
        The data you need for creating a full text may be different than the
2597
        data you need to annotate that text. (At a minimum, you need both
2598
        parents to create an annotation, but only need 1 parent to generate the
2599
        fulltext.)
2600
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2601
        :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.
2602
            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.
2603
            the pack file.
2604
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2605
        if key in self._annotated_lines:
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2606
            # Nothing to do
2607
            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.
2608
        pending = set([key])
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2609
        records = []
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2610
        generation = 0
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2611
        kept_generation = 0
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2612
        while pending:
2613
            # get all pending nodes
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2614
            generation += 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2615
            this_iteration = pending
2616
            build_details = self._knit._index.get_build_details(this_iteration)
2617
            self._all_build_details.update(build_details)
2618
            # new_nodes = self._knit._index._get_entries(this_iteration)
2619
            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.
2620
            for key, details in build_details.iteritems():
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2621
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2622
                 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.
2623
                self._revision_id_graph[key] = parents
2624
                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.
2625
                # Do we actually need to check _annotated_lines?
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2626
                pending.update(p for p in parents
2627
                                 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.
2628
                if compression_parent:
2629
                    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.
2630
                        []).append(key)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2631
                if parents:
2632
                    for parent in parents:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2633
                        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.
2634
                            []).append(key)
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2635
                    num_gens = generation - kept_generation
2636
                    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.
2637
                        and len(parents) > 1):
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2638
                        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.
2639
                        self._nodes_to_keep_annotations.add(key)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2640
2641
            missing_versions = this_iteration.difference(build_details.keys())
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2642
            self._ghosts.update(missing_versions)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2643
            for missing_version in missing_versions:
2644
                # add a key, no parents
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2645
                self._revision_id_graph[missing_version] = ()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2646
                pending.discard(missing_version) # don't look for it
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2647
        if self._ghosts.intersection(self._compression_children):
2648
            raise KnitCorrupt(
2649
                "We cannot have nodes which have a ghost compression parent:\n"
2650
                "ghosts: %r\n"
2651
                "compression children: %r"
2652
                % (self._ghosts, self._compression_children))
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2653
        # Cleanout anything that depends on a ghost so that we don't wait for
2654
        # the ghost to show up
2655
        for node in self._ghosts:
2656
            if node in self._annotate_children:
2657
                # We won't be building this node
2658
                del self._annotate_children[node]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2659
        # Generally we will want to read the records in reverse order, because
2660
        # we find the parent nodes after the children
2661
        records.reverse()
2662
        return records
2663
2664
    def _annotate_records(self, records):
2665
        """Build the annotations for the listed records."""
2666
        # 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.
2667
        # However, process what we can, and put off to the side things that
2668
        # still need parents, cleaning them up when those parents are
2669
        # processed.
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2670
        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.
2671
             digest) in self._knit._read_records_iter(records):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2672
            if rev_id in self._annotated_lines:
2673
                continue
2674
            parent_ids = self._revision_id_graph[rev_id]
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2675
            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.
2676
            details = self._all_build_details[rev_id]
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2677
            (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2678
             record_details) = details
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2679
            nodes_to_annotate = []
2680
            # TODO: Remove the punning between compression parents, and
2681
            #       parent_ids, we should be able to do this without assuming
2682
            #       the build order
2683
            if len(parent_ids) == 0:
2684
                # There are no parents for this node, so just add it
2685
                # 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.
2686
                fulltext_content, delta = self._knit._factory.parse_record(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2687
                    rev_id, record, record_details, None)
2688
                fulltext = self._add_fulltext_content(rev_id, fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2689
                nodes_to_annotate.extend(self._add_annotation(rev_id, fulltext,
2690
                    parent_ids, left_matching_blocks=None))
2691
            else:
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2692
                child = (rev_id, parent_ids, record)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2693
                # Check if all the parents are present
2694
                self._check_parents(child, nodes_to_annotate)
2695
            while nodes_to_annotate:
2696
                # 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,
2697
                (rev_id, parent_ids, record) = nodes_to_annotate.pop()
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2698
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2699
                 record_details) = self._all_build_details[rev_id]
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2700
                blocks = None
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2701
                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.
2702
                    comp_children = self._compression_children[compression_parent]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2703
                    if rev_id not in comp_children:
2704
                        raise AssertionError("%r not in compression children %r"
2705
                            % (rev_id, comp_children))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2706
                    # If there is only 1 child, it is safe to reuse this
2707
                    # content
2708
                    reuse_content = (len(comp_children) == 1
2709
                        and compression_parent not in
2710
                            self._nodes_to_keep_annotations)
2711
                    if reuse_content:
2712
                        # Remove it from the cache since it will be changing
2713
                        parent_fulltext_content = self._fulltext_contents.pop(compression_parent)
2714
                        # Make sure to copy the fulltext since it might be
2715
                        # modified
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2716
                        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.
2717
                    else:
2718
                        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.
2719
                        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.
2720
                    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.
2721
                    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.
2722
                        rev_id, record, record_details,
2723
                        parent_fulltext_content,
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2724
                        copy_base_content=(not reuse_content))
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2725
                    fulltext = self._add_fulltext_content(rev_id,
2726
                                                          fulltext_content)
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2727
                    if compression_parent == parent_ids[0]:
2728
                        # the compression_parent is the left parent, so we can
2729
                        # re-use the delta
2730
                        blocks = KnitContent.get_line_delta_blocks(delta,
2731
                                parent_fulltext, fulltext)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2732
                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.
2733
                    fulltext_content = self._knit._factory.parse_fulltext(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2734
                        record, rev_id)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2735
                    fulltext = self._add_fulltext_content(rev_id,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2736
                        fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2737
                nodes_to_annotate.extend(
2738
                    self._add_annotation(rev_id, fulltext, parent_ids,
2739
                                     left_matching_blocks=blocks))
2740
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2741
    def _get_heads_provider(self):
2742
        """Create a heads provider for resolving ancestry issues."""
2743
        if self._heads_provider is not None:
2744
            return self._heads_provider
2745
        parent_provider = _mod_graph.DictParentsProvider(
2746
            self._revision_id_graph)
2747
        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
2748
        head_cache = _mod_graph.FrozenHeadsCache(graph_obj)
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2749
        self._heads_provider = head_cache
2750
        return head_cache
2751
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2752
    def annotate(self, key):
2753
        """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.
2754
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2755
        :param key: The key to annotate.
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2756
        """
3777.4.1 by John Arbash Meinel
Two fixes for annotate code.
2757
        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
2758
            # stacked knits can't use the fast path at present.
2759
            return self._simple_annotate(key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2760
        records = self._get_build_graph(key)
2761
        if key in self._ghosts:
2762
            raise errors.RevisionNotPresent(key, self._knit)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2763
        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.
2764
        return self._annotated_lines[key]
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2765
3517.4.1 by Martin Pool
Merge unoptimized annotate code for stacking, and only use it when needed
2766
    def _simple_annotate(self, key):
2767
        """Return annotated fulltext, rediffing from the full texts.
2768
2769
        This is slow but makes no assumptions about the repository
2770
        being able to produce line deltas.
2771
        """
2772
        # TODO: this code generates a parent maps of present ancestors; it
2773
        # could be split out into a separate method, and probably should use
2774
        # iter_ancestry instead. -- mbp and robertc 20080704
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
2775
        graph = _mod_graph.Graph(self._knit)
3350.9.1 by Robert Collins
Redo annotate more simply, using just the public interfaces for VersionedFiles.
2776
        head_cache = _mod_graph.FrozenHeadsCache(graph)
2777
        search = graph._make_breadth_first_searcher([key])
2778
        keys = set()
2779
        while True:
2780
            try:
2781
                present, ghosts = search.next_with_ghosts()
2782
            except StopIteration:
2783
                break
2784
            keys.update(present)
2785
        parent_map = self._knit.get_parent_map(keys)
2786
        parent_cache = {}
2787
        reannotate = annotate.reannotate
2788
        for record in self._knit.get_record_stream(keys, 'topological', True):
2789
            key = record.key
2790
            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
2791
            parents = parent_map[key]
2792
            if parents is not None:
2793
                parent_lines = [parent_cache[parent] for parent in parent_map[key]]
2794
            else:
2795
                parent_lines = []
3350.9.1 by Robert Collins
Redo annotate more simply, using just the public interfaces for VersionedFiles.
2796
            parent_cache[key] = list(
2797
                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
2798
        try:
2799
            return parent_cache[key]
2800
        except KeyError, e:
2801
            raise errors.RevisionNotPresent(key, self._knit)
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2802
2803
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2804
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
2805
    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.
2806
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
2807
    from bzrlib._knit_load_data_py import _load_data_py as _load_data