/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5590.1.5 by John Arbash Meinel
Don't use tuned_gzip.GzipFile in knit.py
1
# Copyright (C) 2006-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
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:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
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
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
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
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
38
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
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
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
54
from __future__ import absolute_import
55
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
56
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
57
import os
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
58
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
59
from .lazy_import import lazy_import
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
60
lazy_import(globals(), """
5671.1.2 by Jelmer Vernooij
Lazy load gzip (we don't use it when doing 2a), remove some unused imports.
61
import gzip
62
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
63
from breezy import (
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
64
    debug,
65
    diff,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
66
    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.
67
    index as _mod_index,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
68
    pack,
5279.1.1 by Andrew Bennetts
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.
69
    patiencediff,
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
70
    static_tuple,
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.
71
    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.
72
    tsort,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
73
    tuned_gzip,
4961.2.13 by Martin Pool
Further progress bar string-pulling
74
    ui,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
75
    )
5757.8.9 by Jelmer Vernooij
Fix pack_repo imports.
76
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
77
from breezy.repofmt import pack_repo
78
from breezy.i18n import gettext
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
79
""")
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
80
from . import (
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
81
    annotate,
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
82
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
83
    osutils,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
84
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
85
from .errors import (
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
86
    NoSuchFile,
87
    InvalidRevisionId,
88
    KnitCorrupt,
89
    KnitHeaderError,
90
    RevisionNotPresent,
3787.1.1 by Robert Collins
Embed the failed text in sha1 knit errors.
91
    SHA1KnitCorrupt,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
92
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
93
from .osutils import (
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
94
    contains_whitespace,
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
95
    sha_string,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
96
    sha_strings,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
97
    split_lines,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
98
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
99
from .sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
100
    BytesIO,
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
101
    range,
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
102
    viewitems,
103
    viewvalues,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
104
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
105
from .versionedfile import (
5757.8.1 by Jelmer Vernooij
Avoid bzrlib.knit imports when using groupcompress repositories.
106
    _KeyRefs,
3350.3.12 by Robert Collins
Generate streams with absent records.
107
    AbsentContentFactory,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
108
    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.
109
    ConstantMapper,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
110
    ContentFactory,
4111.1.1 by Robert Collins
Add a groupcompress sort order.
111
    sort_groupcompress,
5816.8.1 by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls.
112
    VersionedFilesWithFallbacks,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
113
    )
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
114
115
116
# TODO: Split out code specific to this format into an associated object.
117
118
# TODO: Can we put in some kind of value to check that the index and data
119
# files belong together?
120
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
121
# 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.
122
123
# TODO: function to check whole file
124
125
# TODO: atomically append data, then measure backwards from the cursor
126
# position after writing to work out where it was located.  we may need to
127
# bypass python file buffering.
128
129
DATA_SUFFIX = '.knit'
130
INDEX_SUFFIX = '.kndx'
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
131
_STREAM_MIN_BUFFER_SIZE = 5*1024*1024
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
132
133
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
134
class KnitAdapter(object):
135
    """Base class for knit record adaption."""
136
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
137
    def __init__(self, basis_vf):
138
        """Create an adapter which accesses full texts from basis_vf.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
139
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
140
        :param basis_vf: A versioned file to access basis texts of deltas from.
141
            May be None for adapters that do not need to access basis texts.
142
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
143
        self._data = KnitVersionedFiles(None, None)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
144
        self._annotate_factory = KnitAnnotateFactory()
145
        self._plain_factory = KnitPlainFactory()
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
146
        self._basis_vf = basis_vf
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
147
148
149
class FTAnnotatedToUnannotated(KnitAdapter):
150
    """An adapter from FT annotated knits to unannotated ones."""
151
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
152
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
153
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
154
        rec, contents = \
155
            self._data._parse_record_unchecked(annotated_compressed_bytes)
156
        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.
157
        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.
158
        return bytes
159
160
161
class DeltaAnnotatedToUnannotated(KnitAdapter):
162
    """An adapter for deltas from annotated to unannotated."""
163
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
164
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
165
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
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
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
178
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
179
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
180
        rec, contents = \
181
            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.
182
        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.
183
            contents, factory._build_details, None)
184
        return ''.join(content.text())
185
186
187
class DeltaAnnotatedToFullText(KnitAdapter):
188
    """An adapter for deltas from annotated to unannotated."""
189
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
190
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
191
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
192
        rec, contents = \
193
            self._data._parse_record_unchecked(annotated_compressed_bytes)
194
        delta = self._annotate_factory.parse_line_delta(contents, rec[1],
195
            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.
196
        compression_parent = factory.parents[0]
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
197
        basis_entry = next(self._basis_vf.get_record_stream(
198
            [compression_parent], 'unordered', 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.
199
        if basis_entry.storage_kind == 'absent':
200
            raise errors.RevisionNotPresent(compression_parent, self._basis_vf)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
201
        basis_chunks = basis_entry.get_bytes_as('chunked')
202
        basis_lines = osutils.chunks_to_lines(basis_chunks)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
203
        # Manually apply the delta because we have one annotated content and
204
        # one plain.
205
        basis_content = PlainKnitContent(basis_lines, compression_parent)
206
        basis_content.apply_delta(delta, rec[1])
207
        basis_content._should_strip_eol = factory._build_details[1]
208
        return ''.join(basis_content.text())
209
210
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
211
class FTPlainToFullText(KnitAdapter):
212
    """An adapter from FT plain knits to unannotated ones."""
213
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
214
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
215
        compressed_bytes = factory._raw_record
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
216
        rec, contents = \
217
            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.
218
        content, delta = self._plain_factory.parse_record(factory.key[-1],
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
219
            contents, factory._build_details, None)
220
        return ''.join(content.text())
221
222
223
class DeltaPlainToFullText(KnitAdapter):
224
    """An adapter for deltas from annotated to unannotated."""
225
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
226
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
227
        compressed_bytes = factory._raw_record
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
228
        rec, contents = \
229
            self._data._parse_record_unchecked(compressed_bytes)
230
        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.
231
        compression_parent = factory.parents[0]
232
        # XXX: string splitting overhead.
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
233
        basis_entry = next(self._basis_vf.get_record_stream(
234
            [compression_parent], 'unordered', 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.
235
        if basis_entry.storage_kind == 'absent':
236
            raise errors.RevisionNotPresent(compression_parent, self._basis_vf)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
237
        basis_chunks = basis_entry.get_bytes_as('chunked')
238
        basis_lines = osutils.chunks_to_lines(basis_chunks)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
239
        basis_content = PlainKnitContent(basis_lines, compression_parent)
240
        # Manually apply the delta because we have one annotated content and
241
        # one plain.
242
        content, _ = self._plain_factory.parse_record(rec[1], contents,
243
            factory._build_details, basis_content)
244
        return ''.join(content.text())
245
246
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
247
class KnitContentFactory(ContentFactory):
248
    """Content factory for streaming from knits.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
249
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
250
    :seealso ContentFactory:
251
    """
252
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
253
    def __init__(self, key, parents, build_details, sha1, raw_record,
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
254
        annotated, knit=None, network_bytes=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.
255
        """Create a KnitContentFactory for key.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
256
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
257
        :param key: The key.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
258
        :param parents: The parents.
259
        :param build_details: The build details as returned from
260
            get_build_details.
261
        :param sha1: The sha1 expected from the full text of this object.
262
        :param raw_record: The bytes of the knit data from disk.
263
        :param annotated: True if the raw data is annotated.
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
264
        :param network_bytes: None to calculate the network bytes on demand,
265
            not-none if they are already known.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
266
        """
267
        ContentFactory.__init__(self)
268
        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.
269
        self.key = key
270
        self.parents = parents
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
271
        if build_details[0] == 'line-delta':
272
            kind = 'delta'
273
        else:
274
            kind = 'ft'
275
        if annotated:
276
            annotated_kind = 'annotated-'
277
        else:
278
            annotated_kind = ''
279
        self.storage_kind = 'knit-%s%s-gz' % (annotated_kind, kind)
280
        self._raw_record = raw_record
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
281
        self._network_bytes = network_bytes
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
282
        self._build_details = build_details
283
        self._knit = knit
284
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
285
    def _create_network_bytes(self):
286
        """Create a fully serialised network version for transmission."""
287
        # storage_kind, key, parents, Noeol, raw_record
288
        key_bytes = '\x00'.join(self.key)
289
        if self.parents is None:
290
            parent_bytes = 'None:'
291
        else:
292
            parent_bytes = '\t'.join('\x00'.join(key) for key in self.parents)
293
        if self._build_details[1]:
294
            noeol = 'N'
295
        else:
296
            noeol = ' '
297
        network_bytes = "%s\n%s\n%s\n%s%s" % (self.storage_kind, key_bytes,
298
            parent_bytes, noeol, self._raw_record)
299
        self._network_bytes = network_bytes
300
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
301
    def get_bytes_as(self, storage_kind):
302
        if storage_kind == self.storage_kind:
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
303
            if self._network_bytes is None:
304
                self._create_network_bytes()
305
            return self._network_bytes
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
306
        if ('-ft-' in self.storage_kind and
307
            storage_kind in ('chunked', 'fulltext')):
308
            adapter_key = (self.storage_kind, 'fulltext')
309
            adapter_factory = adapter_registry.get(adapter_key)
310
            adapter = adapter_factory(None)
311
            bytes = adapter.get_bytes(self)
312
            if storage_kind == 'chunked':
313
                return [bytes]
314
            else:
315
                return bytes
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
316
        if self._knit is not None:
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
317
            # Not redundant with direct conversion above - that only handles
318
            # fulltext cases.
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
319
            if storage_kind == 'chunked':
320
                return self._knit.get_lines(self.key[0])
321
            elif storage_kind == 'fulltext':
322
                return self._knit.get_text(self.key[0])
323
        raise errors.UnavailableRepresentation(self.key, storage_kind,
324
            self.storage_kind)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
325
326
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
327
class LazyKnitContentFactory(ContentFactory):
328
    """A ContentFactory which can either generate full text or a wire form.
329
330
    :seealso ContentFactory:
331
    """
332
333
    def __init__(self, key, parents, generator, first):
334
        """Create a LazyKnitContentFactory.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
335
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
336
        :param key: The key of the record.
337
        :param parents: The parents of the record.
338
        :param generator: A _ContentMapGenerator containing the record for this
339
            key.
340
        :param first: Is this the first content object returned from generator?
341
            if it is, its storage kind is knit-delta-closure, otherwise it is
342
            knit-delta-closure-ref
343
        """
344
        self.key = key
345
        self.parents = parents
346
        self.sha1 = None
347
        self._generator = generator
348
        self.storage_kind = "knit-delta-closure"
349
        if not first:
350
            self.storage_kind = self.storage_kind + "-ref"
351
        self._first = first
352
353
    def get_bytes_as(self, storage_kind):
354
        if storage_kind == self.storage_kind:
355
            if self._first:
356
                return self._generator._wire_bytes()
357
            else:
358
                # all the keys etc are contained in the bytes returned in the
359
                # first record.
360
                return ''
361
        if storage_kind in ('chunked', 'fulltext'):
362
            chunks = self._generator._get_one_work(self.key).text()
363
            if storage_kind == 'chunked':
364
                return chunks
365
            else:
366
                return ''.join(chunks)
367
        raise errors.UnavailableRepresentation(self.key, storage_kind,
368
            self.storage_kind)
369
370
371
def knit_delta_closure_to_records(storage_kind, bytes, line_end):
372
    """Convert a network record to a iterator over stream records.
373
374
    :param storage_kind: The storage kind of the record.
375
        Must be 'knit-delta-closure'.
376
    :param bytes: The bytes of the record on the network.
377
    """
378
    generator = _NetworkContentMapGenerator(bytes, line_end)
379
    return generator.get_record_stream()
380
381
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
382
def knit_network_to_record(storage_kind, bytes, line_end):
383
    """Convert a network record to a record object.
384
385
    :param storage_kind: The storage kind of the record.
386
    :param bytes: The bytes of the record on the network.
387
    """
388
    start = line_end
389
    line_end = bytes.find('\n', start)
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
390
    key = tuple(bytes[start:line_end].split('\x00'))
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
391
    start = line_end + 1
392
    line_end = bytes.find('\n', start)
393
    parent_line = bytes[start:line_end]
394
    if parent_line == 'None:':
395
        parents = None
396
    else:
397
        parents = tuple(
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
398
            [tuple(segment.split('\x00')) for segment in parent_line.split('\t')
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
399
             if segment])
400
    start = line_end + 1
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
401
    noeol = bytes[start] == 'N'
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
402
    if 'ft' in storage_kind:
403
        method = 'fulltext'
404
    else:
405
        method = 'line-delta'
406
    build_details = (method, noeol)
407
    start = start + 1
408
    raw_record = bytes[start:]
409
    annotated = 'annotated' in storage_kind
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
410
    return [KnitContentFactory(key, parents, build_details, None, raw_record,
411
        annotated, network_bytes=bytes)]
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
412
413
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
414
class KnitContent(object):
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
415
    """Content of a knit version to which deltas can be applied.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
416
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
417
    This is always stored in memory as a list of lines with \\n at the end,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
418
    plus a flag saying if the final ending is really there or not, because that
3468.2.5 by Martin Pool
Correct comment and remove overbroad except block
419
    corresponds to the on-disk knit representation.
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
420
    """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
421
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
422
    def __init__(self):
423
        self._should_strip_eol = False
424
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
425
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
426
        """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
427
        raise NotImplementedError(self.apply_delta)
428
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
429
    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.
430
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
431
        new_texts = new_lines.text()
432
        old_texts = self.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
433
        s = patiencediff.PatienceSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
434
        for tag, i1, i2, j1, j2 in s.get_opcodes():
435
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
436
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
437
            # ofrom, oto, length, data
438
            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.
439
440
    def line_delta(self, new_lines):
441
        return list(self.line_delta_iter(new_lines))
442
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
443
    @staticmethod
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
444
    def get_line_delta_blocks(knit_delta, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
445
        """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
446
        target_len = len(target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
447
        s_pos = 0
448
        t_pos = 0
449
        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
450
            true_n = s_begin - s_pos
451
            n = true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
452
            if n > 0:
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
453
                # knit deltas do not provide reliable info about whether the
454
                # last line of a file matches, due to eol handling.
455
                if source[s_pos + n -1] != target[t_pos + n -1]:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
456
                    n-=1
457
                if n > 0:
458
                    yield s_pos, t_pos, n
459
            t_pos += t_len + true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
460
            s_pos = s_end
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
461
        n = target_len - t_pos
462
        if n > 0:
463
            if source[s_pos + n -1] != target[t_pos + n -1]:
464
                n-=1
465
            if n > 0:
466
                yield s_pos, t_pos, n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
467
        yield s_pos + (target_len - t_pos), target_len, 0
468
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
469
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.
470
class AnnotatedKnitContent(KnitContent):
471
    """Annotated content."""
472
473
    def __init__(self, lines):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
474
        KnitContent.__init__(self)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
475
        self._lines = list(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.
476
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
477
    def annotate(self):
478
        """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
479
        lines = self._lines[:]
480
        if self._should_strip_eol:
481
            origin, last_line = lines[-1]
482
            lines[-1] = (origin, last_line.rstrip('\n'))
483
        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.
484
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
485
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
486
        """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
487
        offset = 0
488
        lines = self._lines
489
        for start, end, count, delta_lines in delta:
490
            lines[offset+start:offset+end] = delta_lines
491
            offset = offset + (start - end) + count
492
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.
493
    def text(self):
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
494
        try:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
495
            lines = [text for origin, text in self._lines]
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
496
        except ValueError as e:
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
497
            # most commonly (only?) caused by the internal form of the knit
498
            # missing annotation information because of a bug - see thread
499
            # around 20071015
500
            raise KnitCorrupt(self,
501
                "line in annotated knit missing annotation information: %s"
502
                % (e,))
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
503
        if self._should_strip_eol:
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
504
            lines[-1] = lines[-1].rstrip('\n')
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
505
        return lines
506
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.
507
    def copy(self):
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
508
        return AnnotatedKnitContent(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.
509
510
511
class PlainKnitContent(KnitContent):
2794.1.3 by Robert Collins
Review feedback.
512
    """Unannotated content.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
513
2794.1.3 by Robert Collins
Review feedback.
514
    When annotate[_iter] is called on this content, the same version is reported
515
    for all lines. Generally, annotate[_iter] is not useful on PlainKnitContent
516
    objects.
517
    """
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.
518
519
    def __init__(self, lines, version_id):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
520
        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.
521
        self._lines = lines
522
        self._version_id = version_id
523
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
524
    def annotate(self):
525
        """Return a list of (origin, text) for each content line."""
526
        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.
527
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
528
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
529
        """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
530
        offset = 0
531
        lines = self._lines
532
        for start, end, count, delta_lines in delta:
533
            lines[offset+start:offset+end] = delta_lines
534
            offset = offset + (start - end) + count
535
        self._version_id = new_version_id
536
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.
537
    def copy(self):
538
        return PlainKnitContent(self._lines[:], self._version_id)
539
540
    def text(self):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
541
        lines = self._lines
542
        if self._should_strip_eol:
543
            lines = lines[:]
544
            lines[-1] = lines[-1].rstrip('\n')
545
        return lines
546
547
548
class _KnitFactory(object):
549
    """Base class for common Factory functions."""
550
551
    def parse_record(self, version_id, record, record_details,
552
                     base_content, copy_base_content=True):
553
        """Parse a record into a full content object.
554
555
        :param version_id: The official version id for this content
556
        :param record: The data returned by read_records_iter()
557
        :param record_details: Details about the record returned by
558
            get_build_details
559
        :param base_content: If get_build_details returns a compression_parent,
560
            you must return a base_content here, else use None
561
        :param copy_base_content: When building from the base_content, decide
562
            you can either copy it and return a new object, or modify it in
563
            place.
564
        :return: (content, delta) A Content object and possibly a line-delta,
565
            delta may be None
566
        """
567
        method, noeol = record_details
568
        if method == 'line-delta':
569
            if copy_base_content:
570
                content = base_content.copy()
571
            else:
572
                content = base_content
573
            delta = self.parse_line_delta(record, version_id)
574
            content.apply_delta(delta, version_id)
575
        else:
576
            content = self.parse_fulltext(record, version_id)
577
            delta = None
578
        content._should_strip_eol = noeol
579
        return (content, delta)
580
581
582
class KnitAnnotateFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
583
    """Factory for creating annotated Content objects."""
584
585
    annotated = True
586
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
587
    def make(self, lines, version_id):
588
        num_lines = len(lines)
589
        return AnnotatedKnitContent(zip([version_id] * num_lines, lines))
590
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
591
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
592
        """Convert fulltext to internal representation
593
594
        fulltext content is of the format
595
        revid(utf8) plaintext\n
596
        internal representation is of the format:
597
        (revid, plaintext)
598
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
599
        # TODO: jam 20070209 The tests expect this to be returned as tuples,
600
        #       but the code itself doesn't really depend on that.
601
        #       Figure out a way to not require the overhead of turning the
602
        #       list back into tuples.
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
603
        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.
604
        return AnnotatedKnitContent(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
605
606
    def parse_line_delta_iter(self, lines):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
607
        return iter(self.parse_line_delta(lines))
1628.1.2 by Robert Collins
More knit micro-optimisations.
608
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
609
    def parse_line_delta(self, lines, version_id, plain=False):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
610
        """Convert a line based delta into internal representation.
611
612
        line delta is in the form of:
613
        intstart intend intcount
614
        1..count lines:
615
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
616
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
617
        (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
618
619
        :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
620
            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
621
            (start, end, count, [1..count newline])
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
622
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
623
        result = []
624
        lines = iter(lines)
2249.5.1 by John Arbash Meinel
Leave revision-ids in utf-8 when reading.
625
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
626
        cache = {}
627
        def cache_and_return(line):
628
            origin, text = line.split(' ', 1)
629
            return cache.setdefault(origin, origin), text
630
1628.1.2 by Robert Collins
More knit micro-optimisations.
631
        # walk through the lines parsing.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
632
        # Note that the plain test is explicitly pulled out of the
633
        # loop to minimise any performance impact
634
        if plain:
635
            for header in lines:
636
                start, end, count = [int(n) for n in header.split(',')]
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
637
                contents = [next(lines).split(' ', 1)[1] for _ in range(count)]
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
638
                result.append((start, end, count, contents))
639
        else:
640
            for header in lines:
641
                start, end, count = [int(n) for n in header.split(',')]
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
642
                contents = [tuple(next(lines).split(' ', 1))
643
                    for _ in range(count)]
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
644
                result.append((start, end, count, contents))
1628.1.2 by Robert Collins
More knit micro-optimisations.
645
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
646
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
647
    def get_fulltext_content(self, lines):
648
        """Extract just the content lines from a fulltext."""
649
        return (line.split(' ', 1)[1] for line in lines)
650
651
    def get_linedelta_content(self, lines):
652
        """Extract just the content from a line delta.
653
654
        This doesn't return all of the extra information stored in a delta.
655
        Only the actual content lines.
656
        """
657
        lines = iter(lines)
658
        for header in lines:
659
            header = header.split(',')
660
            count = int(header[2])
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
661
            for _ in range(count):
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
662
                origin, text = next(lines).split(' ', 1)
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
663
                yield text
664
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
665
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
666
        """convert a fulltext content record into a serializable form.
667
668
        see parse_fulltext which this inverts.
669
        """
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
670
        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.
671
672
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
673
        """convert a delta into a serializable form.
674
1628.1.2 by Robert Collins
More knit micro-optimisations.
675
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
676
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
677
        # TODO: jam 20070209 We only do the caching thing to make sure that
678
        #       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.
679
        out = []
680
        for start, end, c, lines in delta:
681
            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.
682
            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
683
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
684
        return out
685
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
686
    def annotate(self, knit, key):
687
        content = knit._get_content(key)
688
        # adjust for the fact that serialised annotations are only key suffixes
689
        # for this factory.
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
690
        if isinstance(key, tuple):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
691
            prefix = key[:-1]
692
            origins = content.annotate()
693
            result = []
694
            for origin, line in origins:
695
                result.append((prefix + (origin,), line))
696
            return result
697
        else:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
698
            # XXX: This smells a bit.  Why would key ever be a non-tuple here?
699
            # 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.
700
            return content.annotate()
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
701
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
702
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
703
class KnitPlainFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
704
    """Factory for creating plain Content objects."""
705
706
    annotated = False
707
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.
708
    def make(self, lines, version_id):
709
        return PlainKnitContent(lines, version_id)
710
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
711
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
712
        """This parses an unannotated fulltext.
713
714
        Note that this is not a noop - the internal representation
715
        has (versionid, line) - its just a constant versionid.
716
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
717
        return self.make(content, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
718
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
719
    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
720
        cur = 0
721
        num_lines = len(lines)
722
        while cur < num_lines:
723
            header = lines[cur]
724
            cur += 1
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
725
            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.
726
            yield start, end, c, lines[cur:cur+c]
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
727
            cur += c
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
728
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
729
    def parse_line_delta(self, lines, version_id):
730
        return list(self.parse_line_delta_iter(lines, version_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
731
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
732
    def get_fulltext_content(self, lines):
733
        """Extract just the content lines from a fulltext."""
734
        return iter(lines)
735
736
    def get_linedelta_content(self, lines):
737
        """Extract just the content from a line delta.
738
739
        This doesn't return all of the extra information stored in a delta.
740
        Only the actual content lines.
741
        """
742
        lines = iter(lines)
743
        for header in lines:
744
            header = header.split(',')
745
            count = int(header[2])
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
746
            for _ in range(count):
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
747
                yield next(lines)
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
748
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
749
    def lower_fulltext(self, content):
750
        return content.text()
751
752
    def lower_line_delta(self, delta):
753
        out = []
754
        for start, end, c, lines in delta:
755
            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.
756
            out.extend(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
757
        return out
758
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
759
    def annotate(self, knit, key):
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
760
        annotator = _KnitAnnotator(knit)
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
761
        return annotator.annotate_flat(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.
762
763
764
765
def make_file_factory(annotated, mapper):
766
    """Create a factory for creating a file based KnitVersionedFiles.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
767
768
    This is only functional enough to run interface tests, it doesn't try to
769
    provide a full pack environment.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
770
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
771
    :param annotated: knit annotations are wanted.
772
    :param mapper: The mapper from keys to paths.
773
    """
774
    def factory(transport):
775
        index = _KndxIndex(transport, mapper, lambda:None, lambda:True, lambda:True)
776
        access = _KnitKeyAccess(transport, mapper)
777
        return KnitVersionedFiles(index, access, annotated=annotated)
778
    return factory
779
780
781
def make_pack_factory(graph, delta, keylength):
782
    """Create a factory for creating a pack based VersionedFiles.
783
784
    This is only functional enough to run interface tests, it doesn't try to
785
    provide a full pack environment.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
786
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
787
    :param graph: Store a graph.
788
    :param delta: Delta compress contents.
789
    :param keylength: How long should keys be.
790
    """
791
    def factory(transport):
792
        parents = graph or delta
793
        ref_length = 0
794
        if graph:
795
            ref_length += 1
796
        if delta:
797
            ref_length += 1
798
            max_delta_chain = 200
799
        else:
800
            max_delta_chain = 0
801
        graph_index = _mod_index.InMemoryGraphIndex(reference_lists=ref_length,
802
            key_elements=keylength)
803
        stream = transport.open_write_stream('newpack')
804
        writer = pack.ContainerWriter(stream.write)
805
        writer.begin()
806
        index = _KnitGraphIndex(graph_index, lambda:True, parents=parents,
807
            deltas=delta, add_callback=graph_index.add_nodes)
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
808
        access = pack_repo._DirectPackAccess({})
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
809
        access.set_writer(writer, graph_index, (transport, 'newpack'))
810
        result = KnitVersionedFiles(index, access,
811
            max_delta_chain=max_delta_chain)
812
        result.stream = stream
813
        result.writer = writer
814
        return result
815
    return factory
816
817
818
def cleanup_pack_knit(versioned_files):
819
    versioned_files.stream.close()
820
    versioned_files.writer.end()
821
822
4039.3.5 by John Arbash Meinel
Add direct tests for _get_total_build_size.
823
def _get_total_build_size(self, keys, positions):
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
824
    """Determine the total bytes to build these keys.
825
826
    (helper function because _KnitGraphIndex and _KndxIndex work the same, but
827
    don't inherit from a common base.)
828
829
    :param keys: Keys that we want to build
830
    :param positions: dict of {key, (info, index_memo, comp_parent)} (such
831
        as returned by _get_components_positions)
832
    :return: Number of bytes to build those keys
833
    """
834
    all_build_index_memos = {}
835
    build_keys = keys
836
    while build_keys:
837
        next_keys = set()
838
        for key in build_keys:
839
            # This is mostly for the 'stacked' case
840
            # Where we will be getting the data from a fallback
841
            if key not in positions:
842
                continue
843
            _, index_memo, compression_parent = positions[key]
844
            all_build_index_memos[key] = index_memo
845
            if compression_parent not in all_build_index_memos:
846
                next_keys.add(compression_parent)
847
        build_keys = next_keys
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
848
    return sum(index_memo[2]
849
               for index_memo in viewvalues(all_build_index_memos))
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
850
851
5816.8.1 by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls.
852
class KnitVersionedFiles(VersionedFilesWithFallbacks):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
853
    """Storage for many versioned files using knit compression.
854
855
    Backend storage is managed by indices and data objects.
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
856
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
857
    :ivar _index: A _KnitGraphIndex or similar that can describe the
858
        parents, graph, compression and data location of entries in this
859
        KnitVersionedFiles.  Note that this is only the index for
3582.1.16 by Martin Pool
Review feedback and news entry
860
        *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.
861
    """
862
863
    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.
864
                 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.
865
        """Create a KnitVersionedFiles with index and data_access.
866
867
        :param index: The index for the knit data.
868
        :param data_access: The access object to store and retrieve knit
869
            records.
870
        :param max_delta_chain: The maximum number of deltas to permit during
871
            insertion. Set to 0 to prohibit the use of deltas.
872
        :param annotated: Set to True to cause annotations to be calculated and
873
            stored during insertion.
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
874
        :param reload_func: An function that can be called if we think we need
875
            to reload the pack listing and try again. See
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
876
            'breezy.repofmt.pack_repo.AggregateIndex' for the signature.
1563.2.25 by Robert Collins
Merge in upstream.
877
        """
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
878
        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.
879
        self._access = data_access
880
        self._max_delta_chain = max_delta_chain
881
        if annotated:
882
            self._factory = KnitAnnotateFactory()
883
        else:
884
            self._factory = KnitPlainFactory()
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
885
        self._immediate_fallback_vfs = []
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
886
        self._reload_func = reload_func
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
887
3702.1.1 by Martin Pool
Add repr for KnitVersionedFiles
888
    def __repr__(self):
889
        return "%s(%r, %r)" % (
890
            self.__class__.__name__,
891
            self._index,
892
            self._access)
893
5816.8.1 by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls.
894
    def without_fallbacks(self):
895
        """Return a clone of this object without any fallbacks configured."""
896
        return KnitVersionedFiles(self._index, self._access,
897
            self._max_delta_chain, self._factory.annotated,
898
            self._reload_func)
899
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
900
    def add_fallback_versioned_files(self, a_versioned_files):
901
        """Add a source of texts for texts not present in this knit.
902
903
        :param a_versioned_files: A VersionedFiles object.
904
        """
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
905
        self._immediate_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.
906
907
    def add_lines(self, key, parents, lines, parent_texts=None,
908
        left_matching_blocks=None, nostore_sha=None, random_id=False,
909
        check_content=True):
910
        """See VersionedFiles.add_lines()."""
911
        self._index._check_write_ok()
912
        self._check_add(key, lines, random_id, check_content)
913
        if parents is None:
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
914
            # The caller might pass None if there is no graph data, but kndx
915
            # indexes can't directly store that, so we give them
916
            # 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.
917
            parents = ()
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
918
        line_bytes = ''.join(lines)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
919
        return self._add(key, lines, parents,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
920
            parent_texts, left_matching_blocks, nostore_sha, random_id,
921
            line_bytes=line_bytes)
922
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
923
    def _add_text(self, key, parents, text, nostore_sha=None, random_id=False):
4398.9.1 by Matt Nordhoff
Update _add_text docstrings that still referred to add_text.
924
        """See VersionedFiles._add_text()."""
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
925
        self._index._check_write_ok()
926
        self._check_add(key, None, random_id, check_content=False)
927
        if text.__class__ is not str:
4398.8.5 by John Arbash Meinel
Fix a few more cases where we were adding a list rather than an empty string.
928
            raise errors.BzrBadParameterUnicode("text")
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
929
        if parents is None:
930
            # The caller might pass None if there is no graph data, but kndx
931
            # indexes can't directly store that, so we give them
932
            # an empty tuple instead.
933
            parents = ()
934
        return self._add(key, None, parents,
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
935
            None, None, nostore_sha, random_id,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
936
            line_bytes=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.
937
938
    def _add(self, key, lines, parents, parent_texts,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
939
        left_matching_blocks, nostore_sha, random_id,
940
        line_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.
941
        """Add a set of lines on top of version specified by parents.
942
943
        Any versions not present will be converted into ghosts.
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
944
945
        :param lines: A list of strings where each one is a single line (has a
946
            single newline at the end of the string) This is now optional
947
            (callers can pass None). It is left in its location for backwards
948
            compatibility. It should ''.join(lines) must == line_bytes
949
        :param line_bytes: A single string containing the content
950
951
        We pass both lines and line_bytes because different routes bring the
952
        values to this function. And for memory efficiency, we don't want to
953
        have to split/join on-demand.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
954
        """
955
        # first thing, if the content is something we don't need to store, find
956
        # that out.
957
        digest = sha_string(line_bytes)
958
        if nostore_sha == digest:
959
            raise errors.ExistingContent
960
961
        present_parents = []
962
        if parent_texts is None:
963
            parent_texts = {}
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
964
        # Do a single query to ascertain parent presence; we only compress
965
        # against parents in the same kvf.
966
        present_parent_map = self._index.get_parent_map(parents)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
967
        for parent in parents:
968
            if parent in present_parent_map:
969
                present_parents.append(parent)
970
971
        # Currently we can only compress against the left most present parent.
972
        if (len(present_parents) == 0 or
973
            present_parents[0] != parents[0]):
974
            delta = False
975
        else:
976
            # To speed the extract of texts the delta chain is limited
977
            # to a fixed number of deltas.  This should minimize both
978
            # I/O and the time spend applying deltas.
979
            delta = self._check_should_delta(present_parents[0])
980
981
        text_length = len(line_bytes)
982
        options = []
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
983
        no_eol = False
984
        # Note: line_bytes is not modified to add a newline, that is tracked
985
        #       via the no_eol flag. 'lines' *is* modified, because that is the
986
        #       general values needed by the Content code.
987
        if line_bytes and line_bytes[-1] != '\n':
988
            options.append('no-eol')
989
            no_eol = True
990
            # Copy the existing list, or create a new one
991
            if lines is None:
992
                lines = osutils.split_lines(line_bytes)
993
            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.
994
                lines = lines[:]
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
995
            # Replace the last line with one that ends in a final newline
996
            lines[-1] = lines[-1] + '\n'
997
        if lines is None:
998
            lines = osutils.split_lines(line_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.
999
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1000
        for element in key[:-1]:
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
1001
            if not isinstance(element, str):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1002
                raise TypeError("key contains non-strings: %r" % (key,))
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1003
        if key[-1] is None:
1004
            key = key[:-1] + ('sha1:' + digest,)
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
1005
        elif not isinstance(key[-1], str):
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1006
                raise TypeError("key contains non-strings: %r" % (key,))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1007
        # Knit hunks are still last-element only
1008
        version_id = key[-1]
1009
        content = self._factory.make(lines, version_id)
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1010
        if no_eol:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1011
            # Hint to the content object that its text() call should strip the
1012
            # EOL.
1013
            content._should_strip_eol = True
1014
        if delta or (self._factory.annotated and len(present_parents) > 0):
1015
            # Merge annotations from parent texts if needed.
1016
            delta_hunks = self._merge_annotations(content, present_parents,
1017
                parent_texts, delta, self._factory.annotated,
1018
                left_matching_blocks)
1019
1020
        if delta:
1021
            options.append('line-delta')
1022
            store_lines = self._factory.lower_line_delta(delta_hunks)
1023
            size, bytes = self._record_to_data(key, digest,
1024
                store_lines)
1025
        else:
1026
            options.append('fulltext')
1027
            # isinstance is slower and we have no hierarchy.
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
1028
            if self._factory.__class__ is KnitPlainFactory:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1029
                # Use the already joined bytes saving iteration time in
1030
                # _record_to_data.
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1031
                dense_lines = [line_bytes]
1032
                if no_eol:
1033
                    dense_lines.append('\n')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1034
                size, bytes = self._record_to_data(key, digest,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1035
                    lines, dense_lines)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1036
            else:
1037
                # get mixed annotation + content and feed it into the
1038
                # serialiser.
1039
                store_lines = self._factory.lower_fulltext(content)
1040
                size, bytes = self._record_to_data(key, digest,
1041
                    store_lines)
1042
1043
        access_memo = self._access.add_raw_records([(key, size)], bytes)[0]
1044
        self._index.add_records(
1045
            ((key, options, access_memo, parents),),
1046
            random_id=random_id)
1047
        return digest, text_length, content
1048
1049
    def annotate(self, key):
1050
        """See VersionedFiles.annotate."""
1051
        return self._factory.annotate(self, key)
1052
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1053
    def get_annotator(self):
1054
        return _KnitAnnotator(self)
1055
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1056
    def check(self, progress_bar=None, 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.
1057
        """See VersionedFiles.check()."""
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1058
        if keys is None:
1059
            return self._logical_check()
1060
        else:
1061
            # At the moment, check does not extra work over get_record_stream
1062
            return self.get_record_stream(keys, 'unordered', True)
1063
1064
    def _logical_check(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.
1065
        # This doesn't actually test extraction of everything, but that will
1066
        # impact 'bzr check' substantially, and needs to be integrated with
1067
        # care. However, it does check for the obvious problem of a delta with
1068
        # no basis.
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
1069
        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.
1070
        parent_map = self.get_parent_map(keys)
1071
        for key in keys:
1072
            if self._index.get_method(key) != 'fulltext':
1073
                compression_parent = parent_map[key][0]
1074
                if compression_parent not in parent_map:
1075
                    raise errors.KnitCorrupt(self,
1076
                        "Missing basis parent %s for %s" % (
1077
                        compression_parent, key))
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1078
        for fallback_vfs in self._immediate_fallback_vfs:
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
1079
            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.
1080
1081
    def _check_add(self, key, lines, random_id, check_content):
1082
        """check that version_id and lines are safe to add."""
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1083
        version_id = key[-1]
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1084
        if version_id is not None:
1085
            if contains_whitespace(version_id):
1086
                raise InvalidRevisionId(version_id, self)
1087
            self.check_not_reserved_id(version_id)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1088
        # TODO: If random_id==False and the key is already present, we should
1089
        # probably check that the existing content is identical to what is
1090
        # being inserted, and otherwise raise an exception.  This would make
1091
        # 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.
1092
        if check_content:
1093
            self._check_lines_not_unicode(lines)
1094
            self._check_lines_are_lines(lines)
1095
1096
    def _check_header(self, key, line):
1097
        rec = self._split_header(line)
1098
        self._check_header_version(rec, key[-1])
1099
        return rec
1100
1101
    def _check_header_version(self, rec, version_id):
1102
        """Checks the header version on original format knit records.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1103
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1104
        These have the last component of the key embedded in the record.
1105
        """
1106
        if rec[1] != version_id:
1107
            raise KnitCorrupt(self,
1108
                'unexpected version, wanted %r, got %r' % (version_id, rec[1]))
1109
1110
    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
1111
        """Iterate back through the parent listing, looking for a fulltext.
1112
1113
        This is used when we want to decide whether to add a delta or a new
1114
        fulltext. It searches for _max_delta_chain parents. When it finds a
1115
        fulltext parent, it sees if the total size of the deltas leading up to
1116
        it is large enough to indicate that we want a new full text anyway.
1117
1118
        Return True if we should create a new delta, False if we should use a
1119
        full text.
1120
        """
1121
        delta_size = 0
1122
        fulltext_size = None
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1123
        for count in range(self._max_delta_chain):
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1124
            try:
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
1125
                # Note that this only looks in the index of this particular
1126
                # KnitVersionedFiles, not in the fallbacks.  This ensures that
1127
                # we won't store a delta spanning physical repository
1128
                # boundaries.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1129
                build_details = self._index.get_build_details([parent])
1130
                parent_details = build_details[parent]
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1131
            except (RevisionNotPresent, KeyError) as e:
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1132
                # Some basis is not locally present: always fulltext
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1133
                return False
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1134
            index_memo, compression_parent, _, _ = parent_details
1135
            _, _, size = index_memo
1136
            if compression_parent is None:
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
1137
                fulltext_size = size
1138
                break
1139
            delta_size += size
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1140
            # We don't explicitly check for presence because this is in an
1141
            # inner loop, and if it's missing it'll fail anyhow.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1142
            parent = compression_parent
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
1143
        else:
1144
            # 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
1145
            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.
1146
        # Simple heuristic - if the total I/O wold be greater as a delta than
1147
        # the originally installed fulltext, we create a new fulltext.
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
1148
        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
1149
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1150
    def _build_details_to_components(self, build_details):
1151
        """Convert a build_details tuple to a position tuple."""
1152
        # record_details, access_memo, compression_parent
1153
        return build_details[3], build_details[0], build_details[1]
1154
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1155
    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.
1156
        """Produce a map of position data for the components of keys.
1157
1158
        This data is intended to be used for retrieving the knit records.
1159
1160
        A dict of key to (record_details, index_memo, next, parents) is
1161
        returned.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1162
1163
        * method is the way referenced data should be applied.
1164
        * index_memo is the handle to pass to the data access to actually get
1165
          the data
1166
        * next is the build-parent of the version, or None for fulltexts.
1167
        * parents is the version_ids of the parents of this version
1168
1169
        :param allow_missing: If True do not raise an error on a missing
1170
            component, just ignore it.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1171
        """
1172
        component_data = {}
1173
        pending_components = keys
1174
        while pending_components:
1175
            build_details = self._index.get_build_details(pending_components)
1176
            current_components = set(pending_components)
1177
            pending_components = set()
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1178
            for key, details in viewitems(build_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.
1179
                (index_memo, compression_parent, parents,
1180
                 record_details) = details
1181
                method = record_details[0]
1182
                if compression_parent is not None:
1183
                    pending_components.add(compression_parent)
1184
                component_data[key] = self._build_details_to_components(details)
1185
            missing = current_components.difference(build_details)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1186
            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.
1187
                raise errors.RevisionNotPresent(missing.pop(), self)
1188
        return component_data
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1189
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1190
    def _get_content(self, key, parent_texts={}):
1191
        """Returns a content object that makes up the specified
1192
        version."""
1193
        cached_version = parent_texts.get(key, None)
1194
        if cached_version is not None:
1195
            # Ensure the cache dict is valid.
1196
            if not self.get_parent_map([key]):
1197
                raise RevisionNotPresent(key, self)
1198
            return cached_version
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1199
        generator = _VFContentMapGenerator(self, [key])
1200
        return generator._get_content(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.
1201
1202
    def get_parent_map(self, keys):
3517.4.17 by Martin Pool
Redo base Repository.get_parent_map to use .revisions graph
1203
        """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.
1204
1205
        :param keys: The keys to look up parents for.
1206
        :return: A mapping from keys to parents. Absent keys are absent from
1207
            the mapping.
1208
        """
3350.8.14 by Robert Collins
Review feedback.
1209
        return self._get_parent_map_with_sources(keys)[0]
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1210
3350.8.14 by Robert Collins
Review feedback.
1211
    def _get_parent_map_with_sources(self, keys):
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1212
        """Get a map of the parents of keys.
1213
1214
        :param keys: The keys to look up parents for.
1215
        :return: A tuple. The first element is a mapping from keys to parents.
1216
            Absent keys are absent from the mapping. The second element is a
1217
            list with the locations each key was found in. The first element
1218
            is the in-this-knit parents, the second the first fallback source,
1219
            and so on.
1220
        """
3350.8.2 by Robert Collins
stacked get_parent_map.
1221
        result = {}
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1222
        sources = [self._index] + self._immediate_fallback_vfs
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1223
        source_results = []
3350.8.2 by Robert Collins
stacked get_parent_map.
1224
        missing = set(keys)
1225
        for source in sources:
1226
            if not missing:
1227
                break
1228
            new_result = source.get_parent_map(missing)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1229
            source_results.append(new_result)
3350.8.2 by Robert Collins
stacked get_parent_map.
1230
            result.update(new_result)
1231
            missing.difference_update(set(new_result))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1232
        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.
1233
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1234
    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.
1235
        """Produce a dictionary of knit records.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1236
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1237
        :return: {key:(record, record_details, digest, next)}
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1238
1239
            * record: data returned from read_records (a KnitContentobject)
1240
            * record_details: opaque information to pass to parse_record
1241
            * digest: SHA1 digest of the full text after all steps are done
1242
            * next: build-parent of the version, i.e. the leftmost ancestor.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1243
                Will be None if the record is not a delta.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1244
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1245
        :param keys: The keys to build a map for
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1246
        :param allow_missing: If some records are missing, rather than
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1247
            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.
1248
        """
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1249
        raw_map = self._get_record_map_unparsed(keys,
1250
            allow_missing=allow_missing)
1251
        return self._raw_map_to_record_map(raw_map)
1252
1253
    def _raw_map_to_record_map(self, raw_map):
1254
        """Parse the contents of _get_record_map_unparsed.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1255
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1256
        :return: see _get_record_map.
1257
        """
1258
        result = {}
1259
        for key in raw_map:
1260
            data, record_details, next = raw_map[key]
1261
            content, digest = self._parse_record(key[-1], data)
1262
            result[key] = content, record_details, digest, next
1263
        return result
1264
1265
    def _get_record_map_unparsed(self, keys, allow_missing=False):
1266
        """Get the raw data for reconstructing keys without parsing it.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1267
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1268
        :return: A dict suitable for parsing via _raw_map_to_record_map.
1269
            key-> raw_bytes, (method, noeol), compression_parent
1270
        """
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1271
        # This retries the whole request if anything fails. Potentially we
1272
        # could be a bit more selective. We could track the keys whose records
1273
        # we have successfully found, and then only request the new records
1274
        # from there. However, _get_components_positions grabs the whole build
1275
        # chain, which means we'll likely try to grab the same records again
4005.3.7 by Robert Collins
Review feedback.
1276
        # anyway. Also, can the build chains change as part of a pack
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1277
        # operation? We wouldn't want to end up with a broken chain.
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1278
        while True:
1279
            try:
1280
                position_map = self._get_components_positions(keys,
1281
                    allow_missing=allow_missing)
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1282
                # key = component_id, r = record_details, i_m = index_memo,
1283
                # n = next
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1284
                records = [(key, i_m) for key, (r, i_m, n)
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1285
                                       in viewitems(position_map)]
4039.3.1 by John Arbash Meinel
Group records to read by pack file and sort by offset.
1286
                # Sort by the index memo, so that we request records from the
1287
                # same pack file together, and in forward-sorted order
1288
                records.sort(key=operator.itemgetter(1))
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1289
                raw_record_map = {}
1290
                for key, data in self._read_records_iter_unchecked(records):
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1291
                    (record_details, index_memo, next) = position_map[key]
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1292
                    raw_record_map[key] = data, record_details, next
1293
                return raw_record_map
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1294
            except errors.RetryWithNewPacks as e:
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1295
                self._access.reload_or_raise(e)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1296
4039.3.6 by John Arbash Meinel
Turn _split_by_prefix into a classmethod, and add direct tests.
1297
    @classmethod
1298
    def _split_by_prefix(cls, keys):
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1299
        """For the given keys, split them up based on their prefix.
1300
1301
        To keep memory pressure somewhat under control, split the
1302
        requests back into per-file-id requests, otherwise "bzr co"
1303
        extracts the full tree into memory before writing it to disk.
1304
        This should be revisited if _get_content_maps() can ever cross
1305
        file-id boundaries.
1306
4039.3.6 by John Arbash Meinel
Turn _split_by_prefix into a classmethod, and add direct tests.
1307
        The keys for a given file_id are kept in the same relative order.
1308
        Ordering between file_ids is not, though prefix_order will return the
1309
        order that the key was first seen.
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1310
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1311
        :param keys: An iterable of key tuples
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1312
        :return: (split_map, prefix_order)
1313
            split_map       A dictionary mapping prefix => keys
1314
            prefix_order    The order that we saw the various prefixes
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1315
        """
1316
        split_by_prefix = {}
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1317
        prefix_order = []
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1318
        for key in keys:
1319
            if len(key) == 1:
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1320
                prefix = ''
1321
            else:
1322
                prefix = key[0]
1323
1324
            if prefix in split_by_prefix:
1325
                split_by_prefix[prefix].append(key)
1326
            else:
1327
                split_by_prefix[prefix] = [key]
1328
                prefix_order.append(prefix)
1329
        return split_by_prefix, prefix_order
1330
4039.3.7 by John Arbash Meinel
Some direct tests for _group_keys_for_io
1331
    def _group_keys_for_io(self, keys, non_local_keys, positions,
1332
                           _min_buffer_size=_STREAM_MIN_BUFFER_SIZE):
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1333
        """For the given keys, group them into 'best-sized' requests.
1334
1335
        The idea is to avoid making 1 request per file, but to never try to
1336
        unpack an entire 1.5GB source tree in a single pass. Also when
1337
        possible, we should try to group requests to the same pack file
1338
        together.
1339
4039.3.7 by John Arbash Meinel
Some direct tests for _group_keys_for_io
1340
        :return: list of (keys, non_local) tuples that indicate what keys
1341
            should be fetched next.
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1342
        """
1343
        # TODO: Ideally we would group on 2 factors. We want to extract texts
1344
        #       from the same pack file together, and we want to extract all
1345
        #       the texts for a given build-chain together. Ultimately it
1346
        #       probably needs a better global view.
4039.3.3 by John Arbash Meinel
Add some debugging code.
1347
        total_keys = len(keys)
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1348
        prefix_split_keys, prefix_order = self._split_by_prefix(keys)
1349
        prefix_split_non_local_keys, _ = self._split_by_prefix(non_local_keys)
1350
        cur_keys = []
1351
        cur_non_local = set()
1352
        cur_size = 0
4039.3.3 by John Arbash Meinel
Add some debugging code.
1353
        result = []
1354
        sizes = []
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1355
        for prefix in prefix_order:
1356
            keys = prefix_split_keys[prefix]
1357
            non_local = prefix_split_non_local_keys.get(prefix, [])
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
1358
1359
            this_size = self._index._get_total_build_size(keys, positions)
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1360
            cur_size += this_size
1361
            cur_keys.extend(keys)
1362
            cur_non_local.update(non_local)
4039.3.7 by John Arbash Meinel
Some direct tests for _group_keys_for_io
1363
            if cur_size > _min_buffer_size:
4039.3.3 by John Arbash Meinel
Add some debugging code.
1364
                result.append((cur_keys, cur_non_local))
1365
                sizes.append(cur_size)
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1366
                cur_keys = []
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
1367
                cur_non_local = set()
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1368
                cur_size = 0
1369
        if cur_keys:
4039.3.3 by John Arbash Meinel
Add some debugging code.
1370
            result.append((cur_keys, cur_non_local))
1371
            sizes.append(cur_size)
1372
        return result
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1373
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1374
    def get_record_stream(self, keys, ordering, include_delta_closure):
1375
        """Get a stream of records for keys.
1376
1377
        :param keys: The keys to include.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1378
        :param ordering: Either 'unordered' or 'topological'. A topologically
1379
            sorted stream has compression parents strictly before their
1380
            children.
1381
        :param include_delta_closure: If True then the closure across any
1382
            compression parents will be included (in the opaque data).
1383
        :return: An iterator of ContentFactory objects, each of which is only
1384
            valid until the iterator is advanced.
1385
        """
3350.6.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
        # keys might be a generator
1387
        keys = set(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1388
        if not keys:
1389
            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.
1390
        if not self._index.has_graph:
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1391
            # Cannot sort when no graph has been stored.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1392
            ordering = 'unordered'
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1393
1394
        remaining_keys = keys
1395
        while True:
1396
            try:
1397
                keys = set(remaining_keys)
1398
                for content_factory in self._get_remaining_record_stream(keys,
1399
                                            ordering, include_delta_closure):
1400
                    remaining_keys.discard(content_factory.key)
1401
                    yield content_factory
1402
                return
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1403
            except errors.RetryWithNewPacks as e:
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1404
                self._access.reload_or_raise(e)
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1405
1406
    def _get_remaining_record_stream(self, keys, ordering,
1407
                                     include_delta_closure):
3789.2.4 by John Arbash Meinel
Add a multiple-record test, though it isn't quite what we want for the readv tests.
1408
        """This function is the 'retry' portion for get_record_stream."""
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1409
        if include_delta_closure:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1410
            positions = self._get_components_positions(keys, allow_missing=True)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1411
        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.
1412
            build_details = self._index.get_build_details(keys)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1413
            # map from key to
1414
            # (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.
1415
            positions = dict((key, self._build_details_to_components(details))
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1416
                for key, details in viewitems(build_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.
1417
        absent_keys = keys.difference(set(positions))
1418
        # There may be more absent keys : if we're missing the basis component
1419
        # and are trying to include the delta closure.
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1420
        # XXX: We should not ever need to examine remote sources because we do
1421
        # not permit deltas across versioned files boundaries.
3350.6.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
        if include_delta_closure:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1423
            needed_from_fallback = set()
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1424
            # Build up reconstructable_keys dict.  key:True in this dict means
1425
            # the key can be reconstructed.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1426
            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.
1427
            for key in keys:
1428
                # the delta chain
1429
                try:
1430
                    chain = [key, positions[key][2]]
1431
                except KeyError:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1432
                    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.
1433
                    continue
1434
                result = True
1435
                while chain[-1] is not None:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1436
                    if chain[-1] in reconstructable_keys:
1437
                        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.
1438
                        break
1439
                    else:
1440
                        try:
1441
                            chain.append(positions[chain[-1]][2])
1442
                        except KeyError:
1443
                            # missing basis component
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1444
                            needed_from_fallback.add(chain[-1])
1445
                            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.
1446
                            break
1447
                for chain_key in chain[:-1]:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1448
                    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.
1449
                if not result:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1450
                    needed_from_fallback.add(key)
1451
        # Double index lookups here : need a unified api ?
3350.8.14 by Robert Collins
Review feedback.
1452
        global_map, parent_maps = self._get_parent_map_with_sources(keys)
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1453
        if ordering in ('topological', 'groupcompress'):
1454
            if ordering == 'topological':
1455
                # Global topological sort
1456
                present_keys = tsort.topo_sort(global_map)
1457
            else:
1458
                present_keys = sort_groupcompress(global_map)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1459
            # Now group by source:
1460
            source_keys = []
1461
            current_source = None
1462
            for key in present_keys:
1463
                for parent_map in parent_maps:
1464
                    if key in parent_map:
1465
                        key_source = parent_map
1466
                        break
1467
                if current_source is not key_source:
1468
                    source_keys.append((key_source, []))
1469
                    current_source = key_source
1470
                source_keys[-1][1].append(key)
1471
        else:
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1472
            if ordering != 'unordered':
1473
                raise AssertionError('valid values for ordering are:'
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1474
                    ' "unordered", "groupcompress" or "topological" not: %r'
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1475
                    % (ordering,))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1476
            # Just group by source; remote sources first.
1477
            present_keys = []
1478
            source_keys = []
1479
            for parent_map in reversed(parent_maps):
1480
                source_keys.append((parent_map, []))
1481
                for key in parent_map:
1482
                    present_keys.append(key)
1483
                    source_keys[-1][1].append(key)
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1484
            # We have been requested to return these records in an order that
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
1485
            # suits us. So we ask the index to give us an optimally sorted
1486
            # order.
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1487
            for source, sub_keys in source_keys:
1488
                if source is parent_maps[0]:
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
1489
                    # Only sort the keys for this VF
1490
                    self._index._sort_keys_by_io(sub_keys, positions)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1491
        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.
1492
        for key in absent_keys:
1493
            yield AbsentContentFactory(key)
1494
        # restrict our view to the keys we can answer.
1495
        # 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.
1496
        # XXX: At that point we need to consider the impact of double reads by
1497
        # 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.
1498
        if include_delta_closure:
1499
            # XXX: get_content_maps performs its own index queries; allow state
1500
            # to be passed in.
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1501
            non_local_keys = needed_from_fallback - absent_keys
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1502
            for keys, non_local_keys in self._group_keys_for_io(present_keys,
1503
                                                                non_local_keys,
1504
                                                                positions):
1505
                generator = _VFContentMapGenerator(self, keys, non_local_keys,
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
1506
                                                   global_map,
1507
                                                   ordering=ordering)
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1508
                for record in generator.get_record_stream():
1509
                    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.
1510
        else:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1511
            for source, keys in source_keys:
1512
                if source is parent_maps[0]:
1513
                    # this KnitVersionedFiles
1514
                    records = [(key, positions[key][1]) for key in keys]
4082.1.1 by Andrew Bennetts
Use _read_records_iter_unchecked in _get_remaining_record_stream.
1515
                    for key, raw_data in self._read_records_iter_unchecked(records):
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1516
                        (record_details, index_memo, _) = positions[key]
1517
                        yield KnitContentFactory(key, global_map[key],
4082.1.1 by Andrew Bennetts
Use _read_records_iter_unchecked in _get_remaining_record_stream.
1518
                            record_details, None, raw_data, self._factory.annotated, None)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1519
                else:
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1520
                    vf = self._immediate_fallback_vfs[parent_maps.index(source) - 1]
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1521
                    for record in vf.get_record_stream(keys, ordering,
1522
                        include_delta_closure):
1523
                        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.
1524
1525
    def get_sha1s(self, keys):
1526
        """See VersionedFiles.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1527
        missing = set(keys)
1528
        record_map = self._get_record_map(missing, allow_missing=True)
1529
        result = {}
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1530
        for key, details in viewitems(record_map):
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1531
            if key not in missing:
1532
                continue
1533
            # record entry 2 is the 'digest'.
1534
            result[key] = details[2]
1535
        missing.difference_update(set(result))
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1536
        for source in self._immediate_fallback_vfs:
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1537
            if not missing:
1538
                break
1539
            new_result = source.get_sha1s(missing)
1540
            result.update(new_result)
1541
            missing.difference_update(set(new_result))
1542
        return result
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1543
5195.3.27 by Parth Malwankar
code cleanup and comments.
1544
    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.
1545
        """Insert a record stream into this container.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1546
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1547
        :param stream: A stream of records to insert.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1548
        :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.
1549
        :seealso VersionedFiles.get_record_stream:
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1550
        """
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1551
        def get_adapter(adapter_key):
1552
            try:
1553
                return adapters[adapter_key]
1554
            except KeyError:
1555
                adapter_factory = adapter_registry.get(adapter_key)
1556
                adapter = adapter_factory(self)
1557
                adapters[adapter_key] = adapter
1558
                return adapter
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1559
        delta_types = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1560
        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.
1561
            # 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.
1562
            annotated = "annotated-"
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1563
            convertibles = []
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1564
        else:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1565
            # 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.
1566
            annotated = ""
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1567
            convertibles = {"knit-annotated-ft-gz"}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1568
            if self._max_delta_chain:
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1569
                delta_types.add("knit-annotated-delta-gz")
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1570
                convertibles.add("knit-annotated-delta-gz")
3350.3.22 by Robert Collins
Review feedback.
1571
        # 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.
1572
        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.
1573
        if self._max_delta_chain:
1574
            native_types.add("knit-%sdelta-gz" % annotated)
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1575
            delta_types.add("knit-%sdelta-gz" % annotated)
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1576
        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.
1577
        knit_types = native_types.union(convertibles)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1578
        adapters = {}
3350.3.22 by Robert Collins
Review feedback.
1579
        # 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.
1580
        # basis parent is missing. We don't buffer all because generating
1581
        # annotations may require access to some of the new records. However we
1582
        # can't generate annotations from new deltas until their basis parent
1583
        # is present anyway, so we get away with not needing an index that
3350.3.22 by Robert Collins
Review feedback.
1584
        # includes the new keys.
3830.3.15 by Martin Pool
Check against all parents when deciding whether to store a fulltext in a stacked repository
1585
        #
1586
        # See <http://launchpad.net/bugs/300177> about ordering of compression
1587
        # parents in the records - to be conservative, we insist that all
1588
        # parents must be present to avoid expanding to a fulltext.
1589
        #
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1590
        # key = basis_parent, value = index entry to add
4009.3.7 by Andrew Bennetts
Most tests passing.
1591
        buffered_index_entries = {}
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1592
        for record in stream:
4082.1.3 by Andrew Bennetts
Add knit header paranoia to insert_record_stream to replace the paranoia removed from get_record_stream.
1593
            kind = record.storage_kind
1594
            if kind.startswith('knit-') and kind.endswith('-gz'):
1595
                # Check that the ID in the header of the raw knit bytes matches
1596
                # the record metadata.
1597
                raw_data = record._raw_record
1598
                df, rec = self._parse_record_header(record.key, raw_data)
1599
                df.close()
4052.1.2 by Robert Collins
Review feedback - fix flushing buffered records in knit's insert_record_stream.
1600
            buffered = 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.
1601
            parents = record.parents
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1602
            if record.storage_kind in delta_types:
1603
                # TODO: eventually the record itself should track
1604
                #       compression_parent
1605
                compression_parent = parents[0]
1606
            else:
1607
                compression_parent = None
3350.3.15 by Robert Collins
Update the insert_record_stream contract to error if an absent record is provided.
1608
            # Raise an error when a record is missing.
1609
            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.
1610
                raise RevisionNotPresent([record.key], self)
3830.3.15 by Martin Pool
Check against all parents when deciding whether to store a fulltext in a stacked repository
1611
            elif ((record.storage_kind in knit_types)
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1612
                  and (compression_parent is None
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1613
                       or not self._immediate_fallback_vfs
6619.3.1 by Jelmer Vernooij
Apply 2to3 has_key fix.
1614
                       or compression_parent in self._index
1615
                       or compression_parent not in self)):
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
1616
                # we can insert the knit record literally if either it has no
1617
                # compression parent OR we already have its basis in this kvf
1618
                # OR the basis is not present even in the fallbacks.  In the
1619
                # last case it will either turn up later in the stream and all
1620
                # will be well, or it won't turn up at all and we'll raise an
1621
                # error at the end.
3830.3.13 by Martin Pool
review cleanups to insert_record_stream
1622
                #
6619.3.8 by Jelmer Vernooij
Cope with has_key -> contains rename.
1623
                # TODO: self.__contains__ is somewhat redundant with
1624
                # self._index.__contains__; we really want something that directly
3830.3.13 by Martin Pool
review cleanups to insert_record_stream
1625
                # asks if it's only present in the fallbacks. -- mbp 20081119
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1626
                if record.storage_kind not in native_types:
1627
                    try:
1628
                        adapter_key = (record.storage_kind, "knit-delta-gz")
1629
                        adapter = get_adapter(adapter_key)
1630
                    except KeyError:
1631
                        adapter_key = (record.storage_kind, "knit-ft-gz")
1632
                        adapter = get_adapter(adapter_key)
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
1633
                    bytes = adapter.get_bytes(record)
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1634
                else:
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
1635
                    # It's a knit record, it has a _raw_record field (even if
1636
                    # it was reconstituted from a network stream).
1637
                    bytes = record._raw_record
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1638
                options = [record._build_details[0]]
1639
                if record._build_details[1]:
1640
                    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.
1641
                # Just blat it across.
1642
                # Note: This does end up adding data on duplicate keys. As
1643
                # modern repositories use atomic insertions this should not
1644
                # lead to excessive growth in the event of interrupted fetches.
1645
                # 'knit' repositories may suffer excessive growth, but as a
1646
                # deprecated format this is tolerable. It can be fixed if
1647
                # needed by in the kndx index support raising on a duplicate
1648
                # 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.
1649
                access_memo = self._access.add_raw_records(
1650
                    [(record.key, len(bytes))], bytes)[0]
1651
                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.
1652
                if 'fulltext' not in options:
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1653
                    # Not a fulltext, so we need to make sure the compression
1654
                    # parent will also be present.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1655
                    # Note that pack backed knits don't need to buffer here
1656
                    # because they buffer all writes to the transaction level,
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1657
                    # 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.
1658
                    # the query here has sufficient cost to show up in
1659
                    # profiling we should do that.
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1660
                    #
3830.3.7 by Martin Pool
KnitVersionedFiles.insert_record_stream checks that compression parents are in the same kvf, not in a fallback
1661
                    # They're required to be physically in this
1662
                    # KnitVersionedFiles, not in a fallback.
6619.3.1 by Jelmer Vernooij
Apply 2to3 has_key fix.
1663
                    if compression_parent not in self._index:
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1664
                        pending = buffered_index_entries.setdefault(
1665
                            compression_parent, [])
1666
                        pending.append(index_entry)
4009.3.9 by Andrew Bennetts
Remove some XXXs.
1667
                        buffered = True
1668
                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.
1669
                    self._index.add_records([index_entry])
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1670
            elif record.storage_kind == 'chunked':
1671
                self.add_lines(record.key, parents,
1672
                    osutils.chunks_to_lines(record.get_bytes_as('chunked')))
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1673
            else:
4005.3.8 by Robert Collins
Handle record streams where a fulltext is obtainable from a record but not the storage_kind.
1674
                # Not suitable for direct insertion as a
3849.3.2 by Andrew Bennetts
Expand a comment inside insert_record_stream slightly.
1675
                # delta, either because it's not the right format, or this
1676
                # KnitVersionedFiles doesn't permit deltas (_max_delta_chain ==
1677
                # 0) or because it depends on a base only present in the
1678
                # fallback kvfs.
4187.3.6 by Andrew Bennetts
Move the flush in KnitVersionedFiles.insert_record_stream so that it covers the add_lines call of the fallback case, not just the adapter.get_bytes.
1679
                self._access.flush()
4005.3.8 by Robert Collins
Handle record streams where a fulltext is obtainable from a record but not the storage_kind.
1680
                try:
1681
                    # Try getting a fulltext directly from the record.
1682
                    bytes = record.get_bytes_as('fulltext')
1683
                except errors.UnavailableRepresentation:
1684
                    adapter_key = record.storage_kind, 'fulltext'
1685
                    adapter = get_adapter(adapter_key)
1686
                    bytes = adapter.get_bytes(record)
1687
                lines = split_lines(bytes)
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1688
                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.
1689
                    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.
1690
                except errors.RevisionAlreadyPresent:
1691
                    pass
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1692
            # Add any records whose basis parent is now available.
4052.1.2 by Robert Collins
Review feedback - fix flushing buffered records in knit's insert_record_stream.
1693
            if not buffered:
1694
                added_keys = [record.key]
1695
                while added_keys:
1696
                    key = added_keys.pop(0)
1697
                    if key in buffered_index_entries:
1698
                        index_entries = buffered_index_entries[key]
1699
                        self._index.add_records(index_entries)
1700
                        added_keys.extend(
1701
                            [index_entry[0] for index_entry in index_entries])
1702
                        del buffered_index_entries[key]
4009.3.8 by Andrew Bennetts
Fix test failure.
1703
        if buffered_index_entries:
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1704
            # There were index entries buffered at the end of the stream,
1705
            # So these need to be added (if the index supports holding such
1706
            # entries for later insertion)
4634.84.1 by Andrew Bennetts
Pass all buffered_index_entries together so that records that are buffered because their parent is buffered are not mistaken as having a missing parent.
1707
            all_entries = []
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1708
            for key in buffered_index_entries:
1709
                index_entries = buffered_index_entries[key]
4634.84.1 by Andrew Bennetts
Pass all buffered_index_entries together so that records that are buffered because their parent is buffered are not mistaken as having a missing parent.
1710
                all_entries.extend(index_entries)
4634.84.2 by Andrew Bennetts
Add test.
1711
            self._index.add_records(
1712
                all_entries, missing_compression_parents=True)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
1713
1714
    def get_missing_compression_parent_keys(self):
4009.3.3 by Andrew Bennetts
Add docstrings.
1715
        """Return an iterable of keys of missing compression parents.
1716
1717
        Check this after calling insert_record_stream to find out if there are
1718
        any missing compression parents.  If there are, the records that
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1719
        depend on them are not able to be inserted safely. For atomic
1720
        KnitVersionedFiles built on packs, the transaction should be aborted or
1721
        suspended - commit will fail at this point. Nonatomic knits will error
1722
        earlier because they have no staging area to put pending entries into.
4009.3.3 by Andrew Bennetts
Add docstrings.
1723
        """
4009.3.7 by Andrew Bennetts
Most tests passing.
1724
        return self._index.get_missing_compression_parents()
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1725
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1726
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1727
        """Iterate over the lines in the versioned files from keys.
1728
1729
        This may return lines from other keys. Each item the returned
1730
        iterator yields is a tuple of a line and a text version that that line
1731
        is present in (not introduced in).
1732
1733
        Ordering of results is in whatever order is most suitable for the
1734
        underlying storage format.
1735
1736
        If a progress bar is supplied, it may be used to indicate progress.
1737
        The caller is responsible for cleaning up progress bars (because this
1738
        is an iterator).
1739
1740
        NOTES:
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1741
         * Lines are normalised by the underlying store: they will all have \\n
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1742
           terminators.
1743
         * Lines are returned in arbitrary order.
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1744
         * If a requested key did not change any lines (or didn't have any
1745
           lines), it may not be mentioned at all in the result.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1746
4110.2.10 by Martin Pool
Tweak iter_lines progress messages
1747
        :param pb: Progress bar supplied by caller.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1748
        :return: An iterator over (line, key).
1749
        """
1750
        if pb is None:
4961.2.2 by Martin Pool
Change some dummy progress bars to be real tasks
1751
            pb = ui.ui_factory.nested_progress_bar()
3350.6.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
        keys = set(keys)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1753
        total = len(keys)
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1754
        done = False
1755
        while not done:
1756
            try:
1757
                # we don't care about inclusions, the caller cares.
1758
                # but we need to setup a list of records to visit.
1759
                # we need key, position, length
1760
                key_records = []
1761
                build_details = self._index.get_build_details(keys)
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1762
                for key, details in viewitems(build_details):
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1763
                    if key in keys:
1764
                        key_records.append((key, details[0]))
1765
                records_iter = enumerate(self._read_records_iter(key_records))
1766
                for (key_idx, (key, data, sha_value)) in records_iter:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1767
                    pb.update(gettext('Walking content'), key_idx, total)
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1768
                    compression_parent = build_details[key][1]
1769
                    if compression_parent is None:
1770
                        # fulltext
1771
                        line_iterator = self._factory.get_fulltext_content(data)
1772
                    else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1773
                        # Delta
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1774
                        line_iterator = self._factory.get_linedelta_content(data)
1775
                    # Now that we are yielding the data for this key, remove it
1776
                    # from the list
1777
                    keys.remove(key)
1778
                    # XXX: It might be more efficient to yield (key,
1779
                    # line_iterator) in the future. However for now, this is a
1780
                    # simpler change to integrate into the rest of the
1781
                    # codebase. RBC 20071110
1782
                    for line in line_iterator:
1783
                        yield line, key
1784
                done = True
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1785
            except errors.RetryWithNewPacks as e:
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1786
                self._access.reload_or_raise(e)
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1787
        # If there are still keys we've not yet found, we look in the fallback
1788
        # vfs, and hope to find them there.  Note that if the keys are found
1789
        # but had no changes or no content, the fallback may not return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1790
        # anything.
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1791
        if keys and not self._immediate_fallback_vfs:
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1792
            # XXX: strictly the second parameter is meant to be the file id
1793
            # but it's not easily accessible here.
1794
            raise RevisionNotPresent(keys, repr(self))
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1795
        for source in self._immediate_fallback_vfs:
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1796
            if not keys:
1797
                break
1798
            source_keys = set()
1799
            for line, key in source.iter_lines_added_or_present_in_keys(keys):
1800
                source_keys.add(key)
1801
                yield line, key
1802
            keys.difference_update(source_keys)
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
1803
        pb.update(gettext('Walking content'), total, total)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1804
1805
    def _make_line_delta(self, delta_seq, new_content):
1806
        """Generate a line delta from delta_seq and new_content."""
1807
        diff_hunks = []
1808
        for op in delta_seq.get_opcodes():
1809
            if op[0] == 'equal':
1810
                continue
1811
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1812
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1813
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1814
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1815
                           delta=None, annotated=None,
1816
                           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.
1817
        """Merge annotations for content and generate deltas.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1818
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1819
        This is done by comparing the annotations based on changes to the text
1820
        and generating a delta on the resulting full texts. If annotations are
1821
        not being created then a simple delta is created.
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
1822
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1823
        if left_matching_blocks is not None:
1824
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
1825
        else:
1826
            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.
1827
        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.
1828
            for parent_key in parents:
1829
                merge_content = self._get_content(parent_key, parent_texts)
1830
                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
1831
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1832
                else:
1833
                    seq = patiencediff.PatienceSequenceMatcher(
1834
                        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.
1835
                for i, j, n in seq.get_matching_blocks():
1836
                    if n == 0:
1837
                        continue
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
1838
                    # this copies (origin, text) pairs across to the new
1839
                    # content for any line that matches the last-checked
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1840
                    # 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.
1841
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1842
            # XXX: Robert says the following block is a workaround for a
1843
            # 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.
1844
            if content._lines and content._lines[-1][1][-1] != '\n':
1845
                # The copied annotation was from a line without a trailing EOL,
1846
                # reinstate one for the content object, to ensure correct
1847
                # serialization.
1848
                line = content._lines[-1][1] + '\n'
1849
                content._lines[-1] = (content._lines[-1][0], line)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1850
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1851
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1852
                reference_content = self._get_content(parents[0], parent_texts)
1853
                new_texts = content.text()
1854
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
1855
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
1856
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1857
            return self._make_line_delta(delta_seq, content)
1858
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1859
    def _parse_record(self, version_id, data):
1860
        """Parse an original format knit record.
1861
1862
        These have the last element of the key only present in the stored data.
1863
        """
1864
        rec, record_contents = self._parse_record_unchecked(data)
1865
        self._check_header_version(rec, version_id)
1866
        return record_contents, rec[3]
1867
1868
    def _parse_record_header(self, key, raw_data):
1869
        """Parse a record header for consistency.
1870
1871
        :return: the header and the decompressor stream.
1872
                 as (stream, header_record)
1873
        """
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1874
        df = gzip.GzipFile(mode='rb', fileobj=BytesIO(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.
1875
        try:
1876
            # Current serialise
1877
            rec = self._check_header(key, df.readline())
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1878
        except Exception as e:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1879
            raise KnitCorrupt(self,
1880
                              "While reading {%s} got %s(%s)"
1881
                              % (key, e.__class__.__name__, str(e)))
1882
        return df, rec
1883
1884
    def _parse_record_unchecked(self, data):
1885
        # profiling notes:
1886
        # 4168 calls in 2880 217 internal
1887
        # 4168 calls to _parse_record_header in 2121
1888
        # 4168 calls to readlines in 330
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1889
        df = gzip.GzipFile(mode='rb', fileobj=BytesIO(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.
1890
        try:
1891
            record_contents = df.readlines()
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
1892
        except Exception as e:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1893
            raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
1894
                (data, e.__class__.__name__, str(e)))
1895
        header = record_contents.pop(0)
1896
        rec = self._split_header(header)
1897
        last_line = record_contents.pop()
1898
        if len(record_contents) != int(rec[2]):
1899
            raise KnitCorrupt(self,
1900
                              'incorrect number of lines %s != %s'
1901
                              ' for version {%s} %s'
1902
                              % (len(record_contents), int(rec[2]),
1903
                                 rec[1], record_contents))
1904
        if last_line != 'end %s\n' % rec[1]:
1905
            raise KnitCorrupt(self,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1906
                              'unexpected version end line %r, wanted %r'
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1907
                              % (last_line, rec[1]))
1908
        df.close()
1909
        return rec, record_contents
1910
1911
    def _read_records_iter(self, records):
1912
        """Read text records from data file and yield result.
1913
1914
        The result will be returned in whatever is the fastest to read.
1915
        Not by the order requested. Also, multiple requests for the same
1916
        record will only yield 1 response.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1917
3350.6.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
        :param records: A list of (key, access_memo) entries
1919
        :return: Yields (key, contents, digest) in the order
1920
                 read, not the order requested
1921
        """
1922
        if not records:
1923
            return
1924
1925
        # XXX: This smells wrong, IO may not be getting ordered right.
1926
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1927
        if not needed_records:
1928
            return
1929
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1930
        # The transport optimizes the fetching as well
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1931
        # (ie, reads continuous ranges.)
1932
        raw_data = self._access.get_raw_records(
1933
            [index_memo for key, index_memo in needed_records])
1934
6631.2.2 by Martin
Run 2to3 itertools fixer and refactor
1935
        for (key, index_memo), data in zip(needed_records, 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.
1936
            content, digest = self._parse_record(key[-1], data)
1937
            yield key, content, digest
1938
1939
    def _read_records_iter_raw(self, records):
1940
        """Read text records from data file and yield raw data.
1941
1942
        This unpacks enough of the text record to validate the id is
1943
        as expected but thats all.
1944
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1945
        Each item the iterator yields is (key, bytes,
1946
            expected_sha1_of_full_text).
1947
        """
1948
        for key, data in self._read_records_iter_unchecked(records):
1949
            # validate the header (note that we can only use the suffix in
1950
            # current knit records).
1951
            df, rec = self._parse_record_header(key, data)
1952
            df.close()
1953
            yield key, data, rec[3]
1954
1955
    def _read_records_iter_unchecked(self, records):
1956
        """Read text records from data file and yield raw data.
1957
1958
        No validation is done.
1959
1960
        Yields tuples of (key, 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.
1961
        """
1962
        # setup an iterator of the external records:
1963
        # uses readv so nice and fast we hope.
1964
        if len(records):
1965
            # grab the disk data needed.
1966
            needed_offsets = [index_memo for key, index_memo
1967
                                           in records]
1968
            raw_records = self._access.get_raw_records(needed_offsets)
1969
1970
        for key, index_memo in records:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1971
            data = next(raw_records)
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1972
            yield key, 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.
1973
1974
    def _record_to_data(self, key, digest, lines, dense_lines=None):
1975
        """Convert key, digest, lines into a raw data block.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1976
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1977
        :param key: The key of the record. Currently keys are always serialised
1978
            using just the trailing component.
1979
        :param dense_lines: The bytes of lines but in a denser form. For
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1980
            instance, if lines is a list of 1000 bytestrings each ending in
1981
            \\n, dense_lines may be a list with one line in it, containing all
1982
            the 1000's lines and their \\n's. Using dense_lines if it is
1983
            already known is a win because the string join to create bytes in
1984
            this function spends less time resizing the final string.
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
1985
        :return: (len, a BytesIO instance with the raw data ready to read.)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1986
        """
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1987
        chunks = ["version %s %d %s\n" % (key[-1], len(lines), digest)]
1988
        chunks.extend(dense_lines or lines)
1989
        chunks.append("end %s\n" % key[-1])
1990
        for chunk in chunks:
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
1991
            if not isinstance(chunk, str):
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1992
                raise AssertionError(
1993
                    'data must be plain bytes was %s' % type(chunk))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1994
        if lines and lines[-1][-1] != '\n':
1995
            raise ValueError('corrupt lines value %r' % lines)
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1996
        compressed_bytes = tuned_gzip.chunks_to_gzip(chunks)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1997
        return len(compressed_bytes), compressed_bytes
1998
1999
    def _split_header(self, line):
2000
        rec = line.split()
2001
        if len(rec) != 4:
2002
            raise KnitCorrupt(self,
2003
                              'unexpected number of elements in record header')
2004
        return rec
2005
2006
    def keys(self):
2007
        """See VersionedFiles.keys."""
2008
        if 'evil' in debug.debug_flags:
2009
            trace.mutter_callsite(2, "keys scales with size of history")
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
2010
        sources = [self._index] + self._immediate_fallback_vfs
3350.8.4 by Robert Collins
Vf.keys() stacking support.
2011
        result = set()
2012
        for source in sources:
2013
            result.update(source.keys())
2014
        return result
2015
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2016
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2017
class _ContentMapGenerator(object):
2018
    """Generate texts or expose raw deltas for a set of texts."""
2019
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2020
    def __init__(self, ordering='unordered'):
2021
        self._ordering = ordering
2022
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2023
    def _get_content(self, key):
2024
        """Get the content object for key."""
4005.3.7 by Robert Collins
Review feedback.
2025
        # Note that _get_content is only called when the _ContentMapGenerator
2026
        # has been constructed with just one key requested for reconstruction.
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2027
        if key in self.nonlocal_keys:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2028
            record = next(self.get_record_stream())
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2029
            # Create a content object on the fly
2030
            lines = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
2031
            return PlainKnitContent(lines, record.key)
2032
        else:
2033
            # local keys we can ask for directly
2034
            return self._get_one_work(key)
2035
2036
    def get_record_stream(self):
2037
        """Get a record stream for the keys requested during __init__."""
2038
        for record in self._work():
2039
            yield record
2040
2041
    def _work(self):
2042
        """Produce maps of text and KnitContents as dicts.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2043
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2044
        :return: (text_map, content_map) where text_map contains the texts for
2045
            the requested versions and content_map contains the KnitContents.
2046
        """
2047
        # NB: By definition we never need to read remote sources unless texts
2048
        # are requested from them: we don't delta across stores - and we
2049
        # explicitly do not want to to prevent data loss situations.
2050
        if self.global_map is None:
2051
            self.global_map = self.vf.get_parent_map(self.keys)
2052
        nonlocal_keys = self.nonlocal_keys
2053
2054
        missing_keys = set(nonlocal_keys)
2055
        # Read from remote versioned file instances and provide to our caller.
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
2056
        for source in self.vf._immediate_fallback_vfs:
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2057
            if not missing_keys:
2058
                break
2059
            # Loop over fallback repositories asking them for texts - ignore
2060
            # any missing from a particular fallback.
2061
            for record in source.get_record_stream(missing_keys,
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2062
                self._ordering, True):
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2063
                if record.storage_kind == 'absent':
2064
                    # Not in thie particular stream, may be in one of the
2065
                    # other fallback vfs objects.
2066
                    continue
2067
                missing_keys.remove(record.key)
2068
                yield record
2069
4454.2.1 by John Arbash Meinel
Don't populate self._raw_record_map in _work, it was done in __init__
2070
        if self._raw_record_map is None:
2071
            raise AssertionError('_raw_record_map should have been filled')
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2072
        first = True
2073
        for key in self.keys:
2074
            if key in self.nonlocal_keys:
2075
                continue
2076
            yield LazyKnitContentFactory(key, self.global_map[key], self, first)
2077
            first = False
2078
2079
    def _get_one_work(self, requested_key):
2080
        # Now, if we have calculated everything already, just return the
2081
        # desired text.
2082
        if requested_key in self._contents_map:
2083
            return self._contents_map[requested_key]
4005.3.7 by Robert Collins
Review feedback.
2084
        # To simplify things, parse everything at once - code that wants one text
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2085
        # probably wants them all.
2086
        # FUTURE: This function could be improved for the 'extract many' case
2087
        # by tracking each component and only doing the copy when the number of
2088
        # children than need to apply delta's to it is > 1 or it is part of the
2089
        # final output.
2090
        multiple_versions = len(self.keys) != 1
2091
        if self._record_map is None:
2092
            self._record_map = self.vf._raw_map_to_record_map(
2093
                self._raw_record_map)
2094
        record_map = self._record_map
2095
        # raw_record_map is key:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2096
        # Have read and parsed records at this point.
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2097
        for key in self.keys:
2098
            if key in self.nonlocal_keys:
2099
                # already handled
2100
                continue
2101
            components = []
2102
            cursor = key
2103
            while cursor is not None:
2104
                try:
2105
                    record, record_details, digest, next = record_map[cursor]
2106
                except KeyError:
2107
                    raise RevisionNotPresent(cursor, self)
2108
                components.append((cursor, record, record_details, digest))
2109
                cursor = next
2110
                if cursor in self._contents_map:
2111
                    # no need to plan further back
2112
                    components.append((cursor, None, None, None))
2113
                    break
2114
2115
            content = None
2116
            for (component_id, record, record_details,
2117
                 digest) in reversed(components):
2118
                if component_id in self._contents_map:
2119
                    content = self._contents_map[component_id]
2120
                else:
2121
                    content, delta = self._factory.parse_record(key[-1],
2122
                        record, record_details, content,
2123
                        copy_base_content=multiple_versions)
2124
                    if multiple_versions:
2125
                        self._contents_map[component_id] = content
2126
2127
            # digest here is the digest from the last applied component.
2128
            text = content.text()
2129
            actual_sha = sha_strings(text)
2130
            if actual_sha != digest:
2131
                raise SHA1KnitCorrupt(self, actual_sha, digest, key, text)
2132
        if multiple_versions:
2133
            return self._contents_map[requested_key]
2134
        else:
2135
            return content
2136
2137
    def _wire_bytes(self):
2138
        """Get the bytes to put on the wire for 'key'.
2139
2140
        The first collection of bytes asked for returns the serialised
2141
        raw_record_map and the additional details (key, parent) for key.
2142
        Subsequent calls return just the additional details (key, parent).
2143
        The wire storage_kind given for the first key is 'knit-delta-closure',
2144
        For subsequent keys it is 'knit-delta-closure-ref'.
2145
2146
        :param key: A key from the content generator.
2147
        :return: Bytes to put on the wire.
2148
        """
2149
        lines = []
2150
        # kind marker for dispatch on the far side,
2151
        lines.append('knit-delta-closure')
2152
        # Annotated or not
2153
        if self.vf._factory.annotated:
2154
            lines.append('annotated')
2155
        else:
2156
            lines.append('')
2157
        # then the list of keys
2158
        lines.append('\t'.join(['\x00'.join(key) for key in self.keys
2159
            if key not in self.nonlocal_keys]))
2160
        # then the _raw_record_map in serialised form:
2161
        map_byte_list = []
2162
        # for each item in the map:
2163
        # 1 line with key
2164
        # 1 line with parents if the key is to be yielded (None: for None, '' for ())
2165
        # one line with method
2166
        # one line with noeol
2167
        # one line with next ('' for None)
2168
        # one line with byte count of the record bytes
2169
        # the record bytes
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
2170
        for key, (record_bytes, (method, noeol), next) in viewitems(
2171
                self._raw_record_map):
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2172
            key_bytes = '\x00'.join(key)
2173
            parents = self.global_map.get(key, None)
2174
            if parents is None:
2175
                parent_bytes = 'None:'
2176
            else:
2177
                parent_bytes = '\t'.join('\x00'.join(key) for key in parents)
2178
            method_bytes = method
2179
            if noeol:
2180
                noeol_bytes = "T"
2181
            else:
2182
                noeol_bytes = "F"
2183
            if next:
2184
                next_bytes = '\x00'.join(next)
2185
            else:
2186
                next_bytes = ''
2187
            map_byte_list.append('%s\n%s\n%s\n%s\n%s\n%d\n%s' % (
2188
                key_bytes, parent_bytes, method_bytes, noeol_bytes, next_bytes,
2189
                len(record_bytes), record_bytes))
2190
        map_bytes = ''.join(map_byte_list)
2191
        lines.append(map_bytes)
2192
        bytes = '\n'.join(lines)
2193
        return bytes
2194
2195
2196
class _VFContentMapGenerator(_ContentMapGenerator):
2197
    """Content map generator reading from a VersionedFiles object."""
2198
2199
    def __init__(self, versioned_files, keys, nonlocal_keys=None,
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2200
        global_map=None, raw_record_map=None, ordering='unordered'):
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2201
        """Create a _ContentMapGenerator.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2202
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2203
        :param versioned_files: The versioned files that the texts are being
2204
            extracted from.
2205
        :param keys: The keys to produce content maps for.
2206
        :param nonlocal_keys: An iterable of keys(possibly intersecting keys)
2207
            which are known to not be in this knit, but rather in one of the
2208
            fallback knits.
2209
        :param global_map: The result of get_parent_map(keys) (or a supermap).
2210
            This is required if get_record_stream() is to be used.
2211
        :param raw_record_map: A unparsed raw record map to use for answering
2212
            contents.
2213
        """
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2214
        _ContentMapGenerator.__init__(self, ordering=ordering)
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2215
        # The vf to source data from
2216
        self.vf = versioned_files
2217
        # The keys desired
2218
        self.keys = list(keys)
2219
        # Keys known to be in fallback vfs objects
2220
        if nonlocal_keys is None:
2221
            self.nonlocal_keys = set()
2222
        else:
2223
            self.nonlocal_keys = frozenset(nonlocal_keys)
2224
        # Parents data for keys to be returned in get_record_stream
2225
        self.global_map = global_map
2226
        # The chunked lists for self.keys in text form
2227
        self._text_map = {}
2228
        # A cache of KnitContent objects used in extracting texts.
2229
        self._contents_map = {}
2230
        # All the knit records needed to assemble the requested keys as full
2231
        # texts.
2232
        self._record_map = None
2233
        if raw_record_map is None:
2234
            self._raw_record_map = self.vf._get_record_map_unparsed(keys,
2235
                allow_missing=True)
2236
        else:
2237
            self._raw_record_map = raw_record_map
2238
        # the factory for parsing records
2239
        self._factory = self.vf._factory
2240
2241
2242
class _NetworkContentMapGenerator(_ContentMapGenerator):
2243
    """Content map generator sourced from a network stream."""
2244
2245
    def __init__(self, bytes, line_end):
2246
        """Construct a _NetworkContentMapGenerator from a bytes block."""
2247
        self._bytes = bytes
2248
        self.global_map = {}
2249
        self._raw_record_map = {}
2250
        self._contents_map = {}
2251
        self._record_map = None
2252
        self.nonlocal_keys = []
2253
        # Get access to record parsing facilities
2254
        self.vf = KnitVersionedFiles(None, None)
2255
        start = line_end
2256
        # Annotated or not
2257
        line_end = bytes.find('\n', start)
2258
        line = bytes[start:line_end]
2259
        start = line_end + 1
2260
        if line == 'annotated':
2261
            self._factory = KnitAnnotateFactory()
2262
        else:
2263
            self._factory = KnitPlainFactory()
2264
        # list of keys to emit in get_record_stream
2265
        line_end = bytes.find('\n', start)
2266
        line = bytes[start:line_end]
2267
        start = line_end + 1
2268
        self.keys = [
2269
            tuple(segment.split('\x00')) for segment in line.split('\t')
2270
            if segment]
2271
        # now a loop until the end. XXX: It would be nice if this was just a
2272
        # bunch of the same records as get_record_stream(..., False) gives, but
2273
        # there is a decent sized gap stopping that at the moment.
2274
        end = len(bytes)
2275
        while start < end:
2276
            # 1 line with key
2277
            line_end = bytes.find('\n', start)
2278
            key = tuple(bytes[start:line_end].split('\x00'))
2279
            start = line_end + 1
2280
            # 1 line with parents (None: for None, '' for ())
2281
            line_end = bytes.find('\n', start)
2282
            line = bytes[start:line_end]
2283
            if line == 'None:':
2284
                parents = None
2285
            else:
2286
                parents = tuple(
2287
                    [tuple(segment.split('\x00')) for segment in line.split('\t')
2288
                     if segment])
2289
            self.global_map[key] = parents
2290
            start = line_end + 1
2291
            # one line with method
2292
            line_end = bytes.find('\n', start)
2293
            line = bytes[start:line_end]
2294
            method = line
2295
            start = line_end + 1
2296
            # one line with noeol
2297
            line_end = bytes.find('\n', start)
2298
            line = bytes[start:line_end]
2299
            noeol = line == "T"
2300
            start = line_end + 1
2301
            # one line with next ('' for None)
2302
            line_end = bytes.find('\n', start)
2303
            line = bytes[start:line_end]
2304
            if not line:
2305
                next = None
2306
            else:
2307
                next = tuple(bytes[start:line_end].split('\x00'))
2308
            start = line_end + 1
2309
            # one line with byte count of the record bytes
2310
            line_end = bytes.find('\n', start)
2311
            line = bytes[start:line_end]
2312
            count = int(line)
2313
            start = line_end + 1
2314
            # the record bytes
2315
            record_bytes = bytes[start:start+count]
2316
            start = start + count
2317
            # put it in the map
2318
            self._raw_record_map[key] = (record_bytes, (method, noeol), next)
2319
2320
    def get_record_stream(self):
2321
        """Get a record stream for for keys requested by the bytestream."""
2322
        first = True
2323
        for key in self.keys:
2324
            yield LazyKnitContentFactory(key, self.global_map[key], self, first)
2325
            first = False
2326
2327
    def _wire_bytes(self):
2328
        return self._bytes
2329
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
class _KndxIndex(object):
2332
    """Manages knit index files
2333
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2334
    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.
2335
    fast lookups of revision information.  The cursor of the index
2336
    file is always pointing to the end, making it easy to append
2337
    entries.
2338
2339
    _cache is a cache for fast mapping from version id to a Index
2340
    object.
2341
2342
    _history is a cache for fast mapping from indexes to version ids.
2343
2344
    The index data format is dictionary compressed when it comes to
2345
    parent references; a index entry may only have parents that with a
2346
    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.
2347
2348
    Duplicate entries may be written to the index for a single version id
2349
    if this is done then the latter one completely replaces the former:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2350
    this allows updates to correct version and parent information.
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.
2351
    Note that the two entries may share the delta, and that successive
2352
    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.
2353
2354
    The index file on disc contains a header, followed by one line per knit
2355
    record. The same revision can be present in an index file more than once.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2356
    The first occurrence gets assigned a sequence number starting from 0.
2357
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2358
    The format of a single line is
2359
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
2360
    REVISION_ID is a utf8-encoded revision id
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2361
    FLAGS is a comma separated list of flags about the record. Values include
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2362
        no-eol, line-delta, fulltext.
2363
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
4775.1.1 by Martin Pool
Remove several 'the the' typos
2364
        that the compressed data starts at.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2365
    LENGTH is the ascii representation of the length of the data file.
2366
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
2367
        REVISION_ID.
2368
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
2369
        revision id already in the knit that is a parent of REVISION_ID.
2370
    The ' :' marker is the end of record marker.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2371
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2372
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2373
    when a write is interrupted to the index file, it will result in a line
2374
    that does not end in ' :'. If the ' :' is not present at the end of a line,
2375
    or at the end of the file, then the record that is missing it will be
2376
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2377
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2378
    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.
2379
    to ensure that records always start on new lines even if the last write was
2380
    interrupted. As a result its normal for the last line in the index to be
2381
    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
2382
2383
    :ivar _kndx_cache: dict from prefix to the old state of KnitIndex objects,
2384
        where prefix is e.g. the (fileid,) for .texts instances or () for
2385
        constant-mapped things like .revisions, and the old state is
2386
        tuple(history_vector, cache_dict).  This is used to prevent having an
2387
        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.
2388
    """
2389
1666.1.6 by Robert Collins
Make knit the default format.
2390
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2391
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2392
    def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
2393
        """Create a _KndxIndex on transport using mapper."""
2394
        self._transport = transport
2395
        self._mapper = mapper
2396
        self._get_scope = get_scope
2397
        self._allow_writes = allow_writes
2398
        self._is_locked = is_locked
2399
        self._reset_cache()
2400
        self.has_graph = True
2401
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2402
    def add_records(self, records, random_id=False, missing_compression_parents=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.
2403
        """Add multiple records to the index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2404
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2405
        :param records: a list of tuples:
2406
                         (key, options, access_memo, parents).
2407
        :param random_id: If True the ids being added were randomly generated
2408
            and no check for existence will be performed.
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2409
        :param missing_compression_parents: If True the records being added are
2410
            only compressed against texts already in the index (or inside
2411
            records). If False the records all refer to unavailable texts (or
2412
            texts inside records) as compression 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.
2413
        """
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2414
        if missing_compression_parents:
2415
            # It might be nice to get the edge of the records. But keys isn't
2416
            # _wrong_.
2417
            keys = sorted(record[0] for record in records)
2418
            raise errors.RevisionNotPresent(keys, 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.
2419
        paths = {}
2420
        for record in records:
2421
            key = record[0]
2422
            prefix = key[:-1]
2423
            path = self._mapper.map(key) + '.kndx'
2424
            path_keys = paths.setdefault(path, (prefix, []))
2425
            path_keys[1].append(record)
2426
        for path in sorted(paths):
2427
            prefix, path_keys = paths[path]
2428
            self._load_prefixes([prefix])
2429
            lines = []
2430
            orig_history = self._kndx_cache[prefix][1][:]
2431
            orig_cache = self._kndx_cache[prefix][0].copy()
2432
2433
            try:
2434
                for key, options, (_, pos, size), parents in path_keys:
2435
                    if parents is None:
2436
                        # kndx indices cannot be parentless.
2437
                        parents = ()
2438
                    line = "\n%s %s %s %s %s :" % (
2439
                        key[-1], ','.join(options), pos, size,
2440
                        self._dictionary_compress(parents))
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
2441
                    if not isinstance(line, str):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2442
                        raise AssertionError(
2443
                            'data must be utf8 was %s' % type(line))
2444
                    lines.append(line)
2445
                    self._cache_key(key, options, pos, size, parents)
2446
                if len(orig_history):
2447
                    self._transport.append_bytes(path, ''.join(lines))
2448
                else:
2449
                    self._init_index(path, lines)
2450
            except:
2451
                # If any problems happen, restore the original values and re-raise
2452
                self._kndx_cache[prefix] = (orig_cache, orig_history)
2453
                raise
2454
4011.5.7 by Andrew Bennetts
Remove leading underscore from _scan_unvalidate_index, explicitly NotImplementedError it for _KndxIndex.
2455
    def scan_unvalidated_index(self, graph_index):
2456
        """See _KnitGraphIndex.scan_unvalidated_index."""
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2457
        # Because kndx files do not support atomic insertion via separate index
2458
        # files, they do not support this method.
4011.5.7 by Andrew Bennetts
Remove leading underscore from _scan_unvalidate_index, explicitly NotImplementedError it for _KndxIndex.
2459
        raise NotImplementedError(self.scan_unvalidated_index)
2460
2461
    def get_missing_compression_parents(self):
2462
        """See _KnitGraphIndex.get_missing_compression_parents."""
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2463
        # Because kndx files do not support atomic insertion via separate index
2464
        # files, they do not support this method.
2465
        raise NotImplementedError(self.get_missing_compression_parents)
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2466
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2467
    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.
2468
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2469
2470
        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.
2471
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
2472
         indexes).
2473
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2474
        prefix = key[:-1]
2475
        version_id = key[-1]
2476
        # last-element only for compatibilty with the C load_data.
2477
        parents = tuple(parent[-1] for parent in parent_keys)
2478
        for parent in parent_keys:
2479
            if parent[:-1] != prefix:
2480
                raise ValueError("mismatched prefixes for %r, %r" % (
2481
                    key, parent_keys))
2482
        cache, history = self._kndx_cache[prefix]
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
2483
        # only want the _history index to reference the 1st index entry
2484
        # 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.
2485
        if version_id not in cache:
2486
            index = len(history)
2487
            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
2488
        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.
2489
            index = cache[version_id][5]
2490
        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
2491
                                   options,
2492
                                   pos,
2493
                                   size,
2494
                                   parents,
2495
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2496
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2497
    def check_header(self, fp):
2498
        line = fp.readline()
2499
        if line == '':
2500
            # An empty file can actually be treated as though the file doesn't
2501
            # exist yet.
2502
            raise errors.NoSuchFile(self)
2503
        if line != self.HEADER:
2504
            raise KnitHeaderError(badline=line, filename=self)
2505
2506
    def _check_read(self):
2507
        if not self._is_locked():
2508
            raise errors.ObjectNotLocked(self)
2509
        if self._get_scope() != self._scope:
2510
            self._reset_cache()
2511
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
2512
    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.
2513
        """Assert if not writes are permitted."""
2514
        if not self._is_locked():
2515
            raise errors.ObjectNotLocked(self)
3316.2.5 by Robert Collins
Review feedback.
2516
        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.
2517
            self._reset_cache()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
2518
        if self._mode != 'w':
2519
            raise errors.ReadOnlyObjectDirtiedError(self)
2520
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2521
    def get_build_details(self, keys):
2522
        """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.
2523
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2524
        Ghosts are omitted from the result.
2525
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2526
        :param keys: An iterable of keys.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2527
        :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.
2528
            record_details).
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2529
            index_memo
2530
                opaque structure to pass to read_records to extract the raw
2531
                data
2532
            compression_parent
2533
                Content that this record is built upon, may be None
2534
            parents
2535
                Logical parents of this node
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2536
            record_details
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2537
                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,
2538
                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.
2539
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2540
        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.
2541
        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.
2542
        for key in keys:
2543
            if key not in parent_map:
2544
                continue # Ghost
2545
            method = self.get_method(key)
2546
            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.
2547
            if method == 'fulltext':
2548
                compression_parent = None
2549
            else:
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2550
                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.
2551
            noeol = 'no-eol' in self.get_options(key)
2552
            index_memo = self.get_position(key)
2553
            result[key] = (index_memo, compression_parent,
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2554
                                  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.
2555
        return result
2556
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2557
    def get_method(self, key):
2558
        """Return compression method of specified key."""
2559
        options = self.get_options(key)
2560
        if 'fulltext' in options:
2561
            return 'fulltext'
2562
        elif 'line-delta' in options:
2563
            return 'line-delta'
2564
        else:
2565
            raise errors.KnitIndexUnknownMethod(self, options)
2566
2567
    def get_options(self, key):
2568
        """Return a list representing options.
2569
2570
        e.g. ['foo', 'bar']
2571
        """
2572
        prefix, suffix = self._split_key(key)
2573
        self._load_prefixes([prefix])
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
2574
        try:
2575
            return self._kndx_cache[prefix][0][suffix][1]
2576
        except KeyError:
2577
            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.
2578
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
2579
    def find_ancestry(self, keys):
2580
        """See CombinedGraphIndex.find_ancestry()"""
2581
        prefixes = set(key[:-1] for key in keys)
2582
        self._load_prefixes(prefixes)
2583
        result = {}
2584
        parent_map = {}
2585
        missing_keys = set()
2586
        pending_keys = list(keys)
2587
        # This assumes that keys will not reference parents in a different
2588
        # prefix, which is accurate so far.
2589
        while pending_keys:
2590
            key = pending_keys.pop()
2591
            if key in parent_map:
2592
                continue
2593
            prefix = key[:-1]
2594
            try:
2595
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2596
            except KeyError:
2597
                missing_keys.add(key)
2598
            else:
2599
                parent_keys = tuple([prefix + (suffix,)
2600
                                     for suffix in suffix_parents])
2601
                parent_map[key] = parent_keys
2602
                pending_keys.extend([p for p in parent_keys
2603
                                        if p not in parent_map])
2604
        return parent_map, missing_keys
2605
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2606
    def get_parent_map(self, keys):
2607
        """Get a map of the parents of keys.
2608
2609
        :param keys: The keys to look up parents for.
2610
        :return: A mapping from keys to parents. Absent keys are absent from
2611
            the mapping.
2612
        """
2613
        # Parse what we need to up front, this potentially trades off I/O
2614
        # locality (.kndx and .knit in the same block group for the same file
2615
        # id) for less checking in inner loops.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2616
        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.
2617
        self._load_prefixes(prefixes)
2618
        result = {}
2619
        for key in keys:
2620
            prefix = key[:-1]
2621
            try:
2622
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2623
            except KeyError:
2624
                pass
2625
            else:
2626
                result[key] = tuple(prefix + (suffix,) for
2627
                    suffix in suffix_parents)
2628
        return result
2629
2630
    def get_position(self, key):
2631
        """Return details needed to access the version.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2632
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2633
        :return: a tuple (key, data position, size) to hand to the access
2634
            logic to get the record.
2635
        """
2636
        prefix, suffix = self._split_key(key)
2637
        self._load_prefixes([prefix])
2638
        entry = self._kndx_cache[prefix][0][suffix]
2639
        return key, entry[2], entry[3]
2640
6619.3.8 by Jelmer Vernooij
Cope with has_key -> contains rename.
2641
    __contains__ = _mod_index._has_key_from_parent_map
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2642
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2643
    def _init_index(self, path, extra_lines=[]):
2644
        """Initialize an index."""
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
2645
        sio = BytesIO()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2646
        sio.write(self.HEADER)
2647
        sio.writelines(extra_lines)
2648
        sio.seek(0)
2649
        self._transport.put_file_non_atomic(path, sio,
2650
                            create_parent_dir=True)
2651
                           # self._create_parent_dir)
2652
                           # mode=self._file_mode,
2653
                           # dir_mode=self._dir_mode)
2654
2655
    def keys(self):
2656
        """Get all the keys in the collection.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2657
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2658
        The keys are not ordered.
2659
        """
2660
        result = set()
2661
        # Identify all key prefixes.
2662
        # XXX: A bit hacky, needs polish.
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
2663
        if isinstance(self._mapper, ConstantMapper):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2664
            prefixes = [()]
2665
        else:
2666
            relpaths = set()
2667
            for quoted_relpath in self._transport.iter_files_recursive():
2668
                path, ext = os.path.splitext(quoted_relpath)
2669
                relpaths.add(path)
2670
            prefixes = [self._mapper.unmap(path) for path in relpaths]
2671
        self._load_prefixes(prefixes)
2672
        for prefix in prefixes:
2673
            for suffix in self._kndx_cache[prefix][1]:
2674
                result.add(prefix + (suffix,))
2675
        return result
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2676
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2677
    def _load_prefixes(self, prefixes):
2678
        """Load the indices for prefixes."""
2679
        self._check_read()
2680
        for prefix in prefixes:
2681
            if prefix not in self._kndx_cache:
2682
                # the load_data interface writes to these variables.
2683
                self._cache = {}
2684
                self._history = []
2685
                self._filename = prefix
2686
                try:
2687
                    path = self._mapper.map(prefix) + '.kndx'
2688
                    fp = self._transport.get(path)
2689
                    try:
2690
                        # _load_data may raise NoSuchFile if the target knit is
2691
                        # completely empty.
2692
                        _load_data(self, fp)
2693
                    finally:
2694
                        fp.close()
2695
                    self._kndx_cache[prefix] = (self._cache, self._history)
2696
                    del self._cache
2697
                    del self._filename
2698
                    del self._history
2699
                except NoSuchFile:
2700
                    self._kndx_cache[prefix] = ({}, [])
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
2701
                    if isinstance(self._mapper, ConstantMapper):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2702
                        # preserve behaviour for revisions.kndx etc.
2703
                        self._init_index(path)
2704
                    del self._cache
2705
                    del self._filename
2706
                    del self._history
2707
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2708
    missing_keys = _mod_index._missing_keys_from_parent_map
2709
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2710
    def _partition_keys(self, keys):
2711
        """Turn keys into a dict of prefix:suffix_list."""
2712
        result = {}
2713
        for key in keys:
2714
            prefix_keys = result.setdefault(key[:-1], [])
2715
            prefix_keys.append(key[-1])
2716
        return result
2717
2718
    def _dictionary_compress(self, keys):
2719
        """Dictionary compress keys.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2720
3350.6.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
        :param keys: The keys to generate references to.
2722
        :return: A string representation of keys. keys which are present are
2723
            dictionary compressed, and others are emitted as fulltext with a
2724
            '.' prefix.
2725
        """
2726
        if not keys:
2727
            return ''
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2728
        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.
2729
        prefix = keys[0][:-1]
2730
        cache = self._kndx_cache[prefix][0]
2731
        for key in keys:
2732
            if key[:-1] != prefix:
2733
                # kndx indices cannot refer across partitioned storage.
2734
                raise ValueError("mismatched prefixes for %r" % keys)
2735
            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
2736
                # -- 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.
2737
                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
2738
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2739
            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.
2740
                result_list.append('.' + key[-1])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2741
        return ' '.join(result_list)
2742
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2743
    def _reset_cache(self):
2744
        # Possibly this should be a LRU cache. A dictionary from key_prefix to
2745
        # (cache_dict, history_vector) for parsed kndx files.
2746
        self._kndx_cache = {}
2747
        self._scope = self._get_scope()
2748
        allow_writes = self._allow_writes()
2749
        if allow_writes:
2750
            self._mode = 'w'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2751
        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.
2752
            self._mode = 'r'
2753
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2754
    def _sort_keys_by_io(self, keys, positions):
2755
        """Figure out an optimal order to read the records for the given keys.
2756
2757
        Sort keys, grouped by index and sorted by position.
2758
2759
        :param keys: A list of keys whose records we want to read. This will be
2760
            sorted 'in-place'.
2761
        :param positions: A dict, such as the one returned by
2762
            _get_components_positions()
2763
        :return: None
2764
        """
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2765
        def get_sort_key(key):
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2766
            index_memo = positions[key][1]
2767
            # Group by prefix and position. index_memo[0] is the key, so it is
2768
            # (file_id, revision_id) and we don't want to sort on revision_id,
2769
            # index_memo[1] is the position, and index_memo[2] is the size,
2770
            # which doesn't matter for the sort
2771
            return index_memo[0][:-1], index_memo[1]
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2772
        return keys.sort(key=get_sort_key)
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2773
4039.3.5 by John Arbash Meinel
Add direct tests for _get_total_build_size.
2774
    _get_total_build_size = _get_total_build_size
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
2775
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2776
    def _split_key(self, key):
2777
        """Split key into a prefix and suffix."""
2778
        return key[:-1], key[-1]
2779
2780
2781
class _KnitGraphIndex(object):
2782
    """A KnitVersionedFiles index layered on GraphIndex."""
2783
2784
    def __init__(self, graph_index, is_locked, deltas=False, parents=True,
4634.29.3 by Andrew Bennetts
Simplify further.
2785
        add_callback=None, track_external_parent_refs=False):
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.
2786
        """Construct a KnitGraphIndex on a graph_index.
2787
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2788
        :param graph_index: An implementation of breezy.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.
2789
        :param is_locked: A callback to check whether the object should answer
2790
            queries.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2791
        :param deltas: Allow delta-compressed records.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2792
        :param parents: If True, record knits parents, if not do not 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.
2793
            parents.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2794
        :param add_callback: If not None, allow additions to the index and call
2795
            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.
2796
            [(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.
2797
        :param is_locked: A callback, returns True if the index is locked and
2798
            thus usable.
4257.4.11 by Andrew Bennetts
Polish the patch.
2799
        :param track_external_parent_refs: If True, record all external parent
2800
            references parents from added records.  These can be retrieved
2801
            later by calling get_missing_parents().
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.
2802
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2803
        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.
2804
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2805
        self._deltas = deltas
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2806
        self._parents = parents
2807
        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.
2808
            # XXX: TODO: Delta tree and parent graph should be conceptually
2809
            # separate.
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2810
            raise KnitCorrupt(self, "Cannot do delta compression without "
2811
                "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.
2812
        self.has_graph = parents
2813
        self._is_locked = is_locked
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2814
        self._missing_compression_parents = set()
4257.4.11 by Andrew Bennetts
Polish the patch.
2815
        if track_external_parent_refs:
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2816
            self._key_dependencies = _KeyRefs()
4257.4.10 by Andrew Bennetts
Observe new revisions in _KnitGraphIndex.add_record rather than iterating all the uncommitted packs' indices.
2817
        else:
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2818
            self._key_dependencies = 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.
2819
3517.4.13 by Martin Pool
Add repr methods
2820
    def __repr__(self):
2821
        return "%s(%r)" % (self.__class__.__name__, self._graph_index)
2822
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2823
    def add_records(self, records, random_id=False,
2824
        missing_compression_parents=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.
2825
        """Add multiple records to the index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2826
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2827
        This function does not insert data into the Immutable GraphIndex
2828
        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.
2829
        the caller and checks that it is safe to insert then calls
2830
        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.
2831
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2832
        :param records: a list of tuples:
2833
                         (key, options, access_memo, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2834
        :param random_id: If True the ids being added were randomly generated
2835
            and no check for existence will be performed.
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2836
        :param missing_compression_parents: If True the records being added are
2837
            only compressed against texts already in the index (or inside
2838
            records). If False the records all refer to unavailable texts (or
2839
            texts inside records) as compression parents.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2840
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2841
        if not self._add_callback:
2842
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2843
        # we hope there are no repositories with inconsistent parentage
2844
        # anymore.
2845
2846
        keys = {}
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2847
        compression_parents = set()
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2848
        key_dependencies = self._key_dependencies
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2849
        for (key, options, access_memo, parents) in records:
2850
            if self._parents:
2851
                parents = tuple(parents)
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2852
                if key_dependencies is not None:
2853
                    key_dependencies.add_references(key, parents)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2854
            index, pos, size = access_memo
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2855
            if 'no-eol' in options:
2856
                value = 'N'
2857
            else:
2858
                value = ' '
2859
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2860
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2861
                if 'line-delta' in options:
2862
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2863
            if self._parents:
2864
                if self._deltas:
2865
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2866
                        node_refs = (parents, (parents[0],))
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2867
                        if missing_compression_parents:
2868
                            compression_parents.add(parents[0])
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2869
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2870
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2871
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2872
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2873
            else:
2874
                if parents:
2875
                    raise KnitCorrupt(self, "attempt to add node with parents "
2876
                        "in parentless index.")
2877
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2878
            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.
2879
        # check for dups
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2880
        if not random_id:
2881
            present_nodes = self._get_entries(keys)
2882
            for (index, key, value, node_refs) in present_nodes:
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
2883
                parents = node_refs[:1]
2884
                # Sometimes these are passed as a list rather than a tuple
2885
                passed = static_tuple.as_tuples(keys[key])
4789.28.4 by John Arbash Meinel
Fix a small typo
2886
                passed_parents = passed[1][:1]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2887
                if (value[0] != keys[key][0][0] or
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
2888
                    parents != passed_parents):
2889
                    node_refs = static_tuple.as_tuples(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.
2890
                    raise KnitCorrupt(self, "inconsistent details in add_records"
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
2891
                        ": %s %s" % ((value, node_refs), passed))
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2892
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2893
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2894
        if self._parents:
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
2895
            for key, (value, node_refs) in viewitems(keys):
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2896
                result.append((key, value, node_refs))
2897
        else:
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
2898
            for key, (value, node_refs) in viewitems(keys):
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2899
                result.append((key, value))
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2900
        self._add_callback(result)
2901
        if missing_compression_parents:
2902
            # This may appear to be incorrect (it does not check for
2903
            # compression parents that are in the existing graph index),
2904
            # but such records won't have been buffered, so this is
2905
            # actually correct: every entry when
2906
            # missing_compression_parents==True either has a missing parent, or
2907
            # a parent that is one of the keys in records.
2908
            compression_parents.difference_update(keys)
2909
            self._missing_compression_parents.update(compression_parents)
2910
        # Adding records may have satisfied missing compression parents.
4009.3.7 by Andrew Bennetts
Most tests passing.
2911
        self._missing_compression_parents.difference_update(keys)
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2912
4011.5.7 by Andrew Bennetts
Remove leading underscore from _scan_unvalidate_index, explicitly NotImplementedError it for _KndxIndex.
2913
    def scan_unvalidated_index(self, graph_index):
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2914
        """Inform this _KnitGraphIndex that there is an unvalidated index.
2915
2916
        This allows this _KnitGraphIndex to keep track of any missing
2917
        compression parents we may want to have filled in to make those
2918
        indices valid.
2919
2920
        :param graph_index: A GraphIndex
2921
        """
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2922
        if self._deltas:
2923
            new_missing = graph_index.external_references(ref_list_num=1)
2924
            new_missing.difference_update(self.get_parent_map(new_missing))
2925
            self._missing_compression_parents.update(new_missing)
4634.29.3 by Andrew Bennetts
Simplify further.
2926
        if self._key_dependencies is not None:
2927
            # Add parent refs from graph_index (and discard parent refs that
2928
            # the graph_index has).
2929
            for node in graph_index.iter_all_entries():
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2930
                self._key_dependencies.add_references(node[1], node[3][0])
4009.3.7 by Andrew Bennetts
Most tests passing.
2931
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2932
    def get_missing_compression_parents(self):
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2933
        """Return the keys of missing compression parents.
2934
2935
        Missing compression parents occur when a record stream was missing
2936
        basis texts, or a index was scanned that had missing basis texts.
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2937
        """
2938
        return frozenset(self._missing_compression_parents)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2939
4257.4.11 by Andrew Bennetts
Polish the patch.
2940
    def get_missing_parents(self):
2941
        """Return the keys of missing parents."""
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
2942
        # If updating this, you should also update
2943
        # groupcompress._GCGraphIndex.get_missing_parents
4257.4.11 by Andrew Bennetts
Polish the patch.
2944
        # We may have false positives, so filter those out.
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2945
        self._key_dependencies.satisfy_refs_for_keys(
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2946
            self.get_parent_map(self._key_dependencies.get_unsatisfied_refs()))
2947
        return frozenset(self._key_dependencies.get_unsatisfied_refs())
4257.4.11 by Andrew Bennetts
Polish the patch.
2948
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2949
    def _check_read(self):
2950
        """raise if reads are not permitted."""
2951
        if not self._is_locked():
2952
            raise errors.ObjectNotLocked(self)
2953
2954
    def _check_write_ok(self):
2955
        """Assert if writes are not permitted."""
2956
        if not self._is_locked():
2957
            raise errors.ObjectNotLocked(self)
2958
2959
    def _compression_parent(self, an_entry):
2960
        # return the key that an_entry is compressed against, or None
2961
        # Grab the second parent list (as deltas implies parents currently)
2962
        compression_parents = an_entry[3][1]
2963
        if not compression_parents:
2964
            return None
2965
        if len(compression_parents) != 1:
2966
            raise AssertionError(
2967
                "Too many compression parents: %r" % compression_parents)
2968
        return compression_parents[0]
2969
2970
    def get_build_details(self, keys):
2971
        """Get the method, index_memo and compression parent for version_ids.
2972
2973
        Ghosts are omitted from the result.
2974
2975
        :param keys: An iterable of keys.
2976
        :return: A dict of key:
2977
            (index_memo, compression_parent, parents, record_details).
2978
            index_memo
2979
                opaque structure to pass to read_records to extract the raw
2980
                data
2981
            compression_parent
2982
                Content that this record is built upon, may be None
2983
            parents
2984
                Logical parents of this node
2985
            record_details
2986
                extra information about the content which needs to be passed to
2987
                Factory.parse_record
2988
        """
2989
        self._check_read()
2990
        result = {}
2991
        entries = self._get_entries(keys, False)
2992
        for entry in entries:
2993
            key = entry[1]
2994
            if not self._parents:
2995
                parents = ()
2996
            else:
2997
                parents = entry[3][0]
2998
            if not self._deltas:
2999
                compression_parent_key = None
3000
            else:
3001
                compression_parent_key = self._compression_parent(entry)
3002
            noeol = (entry[2][0] == 'N')
3003
            if compression_parent_key:
3004
                method = 'line-delta'
3005
            else:
3006
                method = 'fulltext'
3007
            result[key] = (self._node_to_position(entry),
3008
                                  compression_parent_key, parents,
3009
                                  (method, noeol))
3010
        return result
3011
3012
    def _get_entries(self, keys, check_present=False):
3013
        """Get the entries for keys.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3014
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3015
        :param keys: An iterable of index key tuples.
3016
        """
3017
        keys = set(keys)
3018
        found_keys = set()
3019
        if self._parents:
3020
            for node in self._graph_index.iter_entries(keys):
3021
                yield node
3022
                found_keys.add(node[1])
3023
        else:
3024
            # adapt parentless index to the rest of the code.
3025
            for node in self._graph_index.iter_entries(keys):
3026
                yield node[0], node[1], node[2], ()
3027
                found_keys.add(node[1])
3028
        if check_present:
3029
            missing_keys = keys.difference(found_keys)
3030
            if missing_keys:
3031
                raise RevisionNotPresent(missing_keys.pop(), self)
3032
3033
    def get_method(self, key):
3034
        """Return compression method of specified key."""
3035
        return self._get_method(self._get_node(key))
3036
3037
    def _get_method(self, node):
3038
        if not self._deltas:
3039
            return 'fulltext'
3040
        if self._compression_parent(node):
3041
            return 'line-delta'
3042
        else:
3043
            return 'fulltext'
3044
3045
    def _get_node(self, key):
3046
        try:
3047
            return list(self._get_entries([key]))[0]
3048
        except IndexError:
3049
            raise RevisionNotPresent(key, self)
3050
3051
    def get_options(self, key):
3052
        """Return a list representing options.
3053
3054
        e.g. ['foo', 'bar']
3055
        """
3056
        node = self._get_node(key)
3057
        options = [self._get_method(node)]
3058
        if node[2][0] == 'N':
3059
            options.append('no-eol')
3060
        return options
3061
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
3062
    def find_ancestry(self, keys):
3063
        """See CombinedGraphIndex.find_ancestry()"""
3064
        return self._graph_index.find_ancestry(keys, 0)
3065
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3066
    def get_parent_map(self, keys):
3067
        """Get a map of the parents of keys.
3068
3069
        :param keys: The keys to look up parents for.
3070
        :return: A mapping from keys to parents. Absent keys are absent from
3071
            the mapping.
3072
        """
3073
        self._check_read()
3074
        nodes = self._get_entries(keys)
3075
        result = {}
3076
        if self._parents:
3077
            for node in nodes:
3078
                result[node[1]] = node[3][0]
3079
        else:
3080
            for node in nodes:
3081
                result[node[1]] = None
3082
        return result
3083
3084
    def get_position(self, key):
3085
        """Return details needed to access the version.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3086
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3087
        :return: a tuple (index, data position, size) to hand to the access
3088
            logic to get the record.
3089
        """
3090
        node = self._get_node(key)
3091
        return self._node_to_position(node)
3092
6619.3.8 by Jelmer Vernooij
Cope with has_key -> contains rename.
3093
    __contains__ = _mod_index._has_key_from_parent_map
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
3094
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3095
    def keys(self):
3096
        """Get all the keys in the collection.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3097
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3098
        The keys are not ordered.
3099
        """
3100
        self._check_read()
3101
        return [node[1] for node in self._graph_index.iter_all_entries()]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3102
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
3103
    missing_keys = _mod_index._missing_keys_from_parent_map
3104
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3105
    def _node_to_position(self, node):
3106
        """Convert an index value to position details."""
3107
        bits = node[2][1:].split(' ')
3108
        return node[0], int(bits[0]), int(bits[1])
3109
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
3110
    def _sort_keys_by_io(self, keys, positions):
3111
        """Figure out an optimal order to read the records for the given keys.
3112
3113
        Sort keys, grouped by index and sorted by position.
3114
3115
        :param keys: A list of keys whose records we want to read. This will be
3116
            sorted 'in-place'.
3117
        :param positions: A dict, such as the one returned by
3118
            _get_components_positions()
3119
        :return: None
3120
        """
3121
        def get_index_memo(key):
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
3122
            # index_memo is at offset [1]. It is made up of (GraphIndex,
3123
            # position, size). GI is an object, which will be unique for each
3124
            # pack file. This causes us to group by pack file, then sort by
3125
            # position. Size doesn't matter, but it isn't worth breaking up the
3126
            # tuple.
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
3127
            return positions[key][1]
3128
        return keys.sort(key=get_index_memo)
3129
4039.3.5 by John Arbash Meinel
Add direct tests for _get_total_build_size.
3130
    _get_total_build_size = _get_total_build_size
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
3131
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3132
3133
class _KnitKeyAccess(object):
3134
    """Access to records in .knit files."""
3135
3136
    def __init__(self, transport, mapper):
3137
        """Create a _KnitKeyAccess with transport and mapper.
3138
3139
        :param transport: The transport the access object is rooted at.
3140
        :param mapper: The mapper used to map keys to .knit files.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3141
        """
3142
        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.
3143
        self._mapper = mapper
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3144
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3145
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3146
        """Add raw knit bytes to a storage area.
3147
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3148
        The data is spooled to the container writer in one bytes-record per
3149
        raw data item.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3150
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3151
        :param sizes: An iterable of tuples containing the key and size of each
3152
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3153
        :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.
3154
        :return: A list of memos to retrieve the record later. Each memo is an
3155
            opaque index memo. For _KnitKeyAccess the memo is (key, pos,
3156
            length), where the key is the record key.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3157
        """
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
3158
        if not isinstance(raw_data, str):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3159
            raise AssertionError(
3160
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3161
        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.
3162
        offset = 0
3163
        # TODO: This can be tuned for writing to sftp and other servers where
3164
        # append() is relatively expensive by grouping the writes to each key
3165
        # prefix.
3166
        for key, size in key_sizes:
3167
            path = self._mapper.map(key)
3168
            try:
3169
                base = self._transport.append_bytes(path + '.knit',
3170
                    raw_data[offset:offset+size])
3171
            except errors.NoSuchFile:
3172
                self._transport.mkdir(osutils.dirname(path))
3173
                base = self._transport.append_bytes(path + '.knit',
3174
                    raw_data[offset:offset+size])
3175
            # if base == 0:
3176
            # chmod.
3177
            offset += size
3178
            result.append((key, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3179
        return result
3180
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
3181
    def flush(self):
4187.3.4 by Andrew Bennetts
Better docstrings and comments.
3182
        """Flush pending writes on this access object.
3183
        
3184
        For .knit files this is a no-op.
3185
        """
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
3186
        pass
3187
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3188
    def get_raw_records(self, memos_for_retrieval):
3189
        """Get the raw bytes for a records.
3190
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3191
        :param memos_for_retrieval: An iterable containing the access memo for
3192
            retrieving the bytes.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3193
        :return: An iterator over the bytes of the records.
3194
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3195
        # first pass, group into same-index request to minimise readv's issued.
3196
        request_lists = []
3197
        current_prefix = None
3198
        for (key, offset, length) in memos_for_retrieval:
3199
            if current_prefix == key[:-1]:
3200
                current_list.append((offset, length))
3201
            else:
3202
                if current_prefix is not None:
3203
                    request_lists.append((current_prefix, current_list))
3204
                current_prefix = key[:-1]
3205
                current_list = [(offset, length)]
3206
        # handle the last entry
3207
        if current_prefix is not None:
3208
            request_lists.append((current_prefix, current_list))
3209
        for prefix, read_vector in request_lists:
3210
            path = self._mapper.map(prefix) + '.knit'
3211
            for pos, data in self._transport.readv(path, read_vector):
3212
                yield data
3213
3214
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
3215
def annotate_knit(knit, revision_id):
3216
    """Annotate a knit with no cached annotations.
3217
3218
    This implementation is for knits with no cached annotations.
3219
    It will work for knits with cached annotations, but this is not
3220
    recommended.
3221
    """
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
3222
    annotator = _KnitAnnotator(knit)
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3223
    return iter(annotator.annotate_flat(revision_id))
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
3224
3225
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3226
class _KnitAnnotator(annotate.Annotator):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
3227
    """Build up the annotations for a text."""
3228
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3229
    def __init__(self, vf):
3230
        annotate.Annotator.__init__(self, vf)
3231
3232
        # TODO: handle Nodes which cannot be extracted
3233
        # self._ghosts = set()
3234
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3235
        # Map from (key, parent_key) => matching_blocks, should be 'use once'
3236
        self._matching_blocks = {}
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3237
3238
        # KnitContent objects
3239
        self._content_objects = {}
3240
        # The number of children that depend on this fulltext content object
3241
        self._num_compression_children = {}
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3242
        # Delta records that need their compression parent before they can be
3243
        # expanded
3244
        self._pending_deltas = {}
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3245
        # Fulltext records that are waiting for their parents fulltexts before
3246
        # they can be yielded for annotation
3247
        self._pending_annotation = {}
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
3248
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3249
        self._all_build_details = {}
3250
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3251
    def _get_build_graph(self, key):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3252
        """Get the graphs for building texts and annotations.
3253
3254
        The data you need for creating a full text may be different than the
3255
        data you need to annotate that text. (At a minimum, you need both
3256
        parents to create an annotation, but only need 1 parent to generate the
3257
        fulltext.)
3258
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3259
        :return: A list of (key, index_memo) records, suitable for
4371.2.1 by Vincent Ladeuil
Start fixing annotate for gc.
3260
            passing to read_records_iter to start reading in the raw data from
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3261
            the pack file.
3262
        """
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
3263
        pending = {key}
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3264
        records = []
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3265
        ann_keys = set()
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3266
        self._num_needed_children[key] = 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3267
        while pending:
3268
            # get all pending nodes
3269
            this_iteration = pending
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3270
            build_details = self._vf._index.get_build_details(this_iteration)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3271
            self._all_build_details.update(build_details)
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3272
            # new_nodes = self._vf._index._get_entries(this_iteration)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3273
            pending = set()
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
3274
            for key, details in viewitems(build_details):
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3275
                (index_memo, compression_parent, parent_keys,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
3276
                 record_details) = details
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3277
                self._parent_map[key] = parent_keys
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
3278
                self._heads_provider = 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.
3279
                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.
3280
                # Do we actually need to check _annotated_lines?
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3281
                pending.update([p for p in parent_keys
3282
                                   if p not in self._all_build_details])
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3283
                if parent_keys:
3284
                    for parent_key in parent_keys:
3285
                        if parent_key in self._num_needed_children:
3286
                            self._num_needed_children[parent_key] += 1
3287
                        else:
3288
                            self._num_needed_children[parent_key] = 1
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3289
                if compression_parent:
3290
                    if compression_parent in self._num_compression_children:
3291
                        self._num_compression_children[compression_parent] += 1
3292
                    else:
3293
                        self._num_compression_children[compression_parent] = 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3294
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
3295
            missing_versions = this_iteration.difference(build_details)
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3296
            if missing_versions:
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3297
                for key in missing_versions:
3298
                    if key in self._parent_map and key in self._text_cache:
3299
                        # We already have this text ready, we just need to
3300
                        # yield it later so we get it annotated
3301
                        ann_keys.add(key)
3302
                        parent_keys = self._parent_map[key]
3303
                        for parent_key in parent_keys:
3304
                            if parent_key in self._num_needed_children:
3305
                                self._num_needed_children[parent_key] += 1
3306
                            else:
3307
                                self._num_needed_children[parent_key] = 1
3308
                        pending.update([p for p in parent_keys
3309
                                           if p not in self._all_build_details])
3310
                    else:
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
3311
                        raise errors.RevisionNotPresent(key, self._vf)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3312
        # Generally we will want to read the records in reverse order, because
3313
        # we find the parent nodes after the children
3314
        records.reverse()
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3315
        return records, ann_keys
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3316
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3317
    def _get_needed_texts(self, key, pb=None):
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
3318
        # if True or len(self._vf._immediate_fallback_vfs) > 0:
3319
        if len(self._vf._immediate_fallback_vfs) > 0:
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3320
            # If we have fallbacks, go to the generic path
4454.3.43 by John Arbash Meinel
Initial implementation of a Pyrex annotator.
3321
            for v in annotate.Annotator._get_needed_texts(self, key, pb=pb):
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3322
                yield v
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3323
            return
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3324
        while True:
3325
            try:
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3326
                records, ann_keys = self._get_build_graph(key)
4454.3.59 by John Arbash Meinel
Track down why the annotate retry code was failing.
3327
                for idx, (sub_key, text, num_lines) in enumerate(
4454.3.42 by John Arbash Meinel
Make use of the passed in progress bar.
3328
                                                self._extract_texts(records)):
3329
                    if pb is not None:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
3330
                        pb.update(gettext('annotating'), idx, len(records))
4454.3.59 by John Arbash Meinel
Track down why the annotate retry code was failing.
3331
                    yield sub_key, text, num_lines
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3332
                for sub_key in ann_keys:
3333
                    text = self._text_cache[sub_key]
3334
                    num_lines = len(text) # bad assumption
3335
                    yield sub_key, text, num_lines
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3336
                return
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
3337
            except errors.RetryWithNewPacks as e:
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3338
                self._vf._access.reload_or_raise(e)
3339
                # The cached build_details are no longer valid
3340
                self._all_build_details.clear()
3341
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3342
    def _cache_delta_blocks(self, key, compression_parent, delta, lines):
3343
        parent_lines = self._text_cache[compression_parent]
3344
        blocks = list(KnitContent.get_line_delta_blocks(delta, parent_lines, lines))
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3345
        self._matching_blocks[(key, compression_parent)] = blocks
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3346
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3347
    def _expand_record(self, key, parent_keys, compression_parent, record,
3348
                       record_details):
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3349
        delta = None
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3350
        if compression_parent:
3351
            if compression_parent not in self._content_objects:
3352
                # Waiting for the parent
3353
                self._pending_deltas.setdefault(compression_parent, []).append(
3354
                    (key, parent_keys, record, record_details))
3355
                return None
3356
            # We have the basis parent, so expand the delta
4454.3.33 by John Arbash Meinel
Change the _expand_record code to pop out old content objects.
3357
            num = self._num_compression_children[compression_parent]
3358
            num -= 1
3359
            if num == 0:
3360
                base_content = self._content_objects.pop(compression_parent)
3361
                self._num_compression_children.pop(compression_parent)
3362
            else:
3363
                self._num_compression_children[compression_parent] = num
3364
                base_content = self._content_objects[compression_parent]
4454.3.35 by John Arbash Meinel
Figure out why we don't want to copy_base_content=False.
3365
            # It is tempting to want to copy_base_content=False for the last
3366
            # child object. However, whenever noeol=False,
3367
            # self._text_cache[parent_key] is content._lines. So mutating it
3368
            # gives very bad results.
4454.3.36 by John Arbash Meinel
Only cache the content objects that we will reuse.
3369
            # The alternative is to copy the lines into text cache, but then we
3370
            # are copying anyway, so just do it here.
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3371
            content, delta = self._vf._factory.parse_record(
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3372
                key, record, record_details, base_content,
3373
                copy_base_content=True)
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3374
        else:
3375
            # Fulltext record
3376
            content, _ = self._vf._factory.parse_record(
3377
                key, record, record_details, None)
4454.3.36 by John Arbash Meinel
Only cache the content objects that we will reuse.
3378
        if self._num_compression_children.get(key, 0) > 0:
3379
            self._content_objects[key] = content
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3380
        lines = content.text()
3381
        self._text_cache[key] = lines
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3382
        if delta is not None:
3383
            self._cache_delta_blocks(key, compression_parent, delta, lines)
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3384
        return lines
3385
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3386
    def _get_parent_annotations_and_matches(self, key, text, parent_key):
3387
        """Get the list of annotations for the parent, and the matching lines.
3388
3389
        :param text: The opaque value given by _get_needed_texts
3390
        :param parent_key: The key for the parent text
3391
        :return: (parent_annotations, matching_blocks)
3392
            parent_annotations is a list as long as the number of lines in
3393
                parent
3394
            matching_blocks is a list of (parent_idx, text_idx, len) tuples
3395
                indicating which lines match between the two texts
3396
        """
3397
        block_key = (key, parent_key)
3398
        if block_key in self._matching_blocks:
3399
            blocks = self._matching_blocks.pop(block_key)
3400
            parent_annotations = self._annotations_cache[parent_key]
3401
            return parent_annotations, blocks
4454.3.43 by John Arbash Meinel
Initial implementation of a Pyrex annotator.
3402
        return annotate.Annotator._get_parent_annotations_and_matches(self,
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3403
            key, text, parent_key)
3404
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3405
    def _process_pending(self, key):
3406
        """The content for 'key' was just processed.
3407
3408
        Determine if there is any more pending work to be processed.
3409
        """
3410
        to_return = []
4454.3.31 by John Arbash Meinel
Change the processing lines to now handle fallbacks properly.
3411
        if key in self._pending_deltas:
3412
            compression_parent = key
3413
            children = self._pending_deltas.pop(key)
3414
            for child_key, parent_keys, record, record_details in children:
3415
                lines = self._expand_record(child_key, parent_keys,
3416
                                            compression_parent,
3417
                                            record, record_details)
3418
                if self._check_ready_for_annotations(child_key, parent_keys):
3419
                    to_return.append(child_key)
3420
        # Also check any children that are waiting for this parent to be
3421
        # annotation ready
3422
        if key in self._pending_annotation:
3423
            children = self._pending_annotation.pop(key)
3424
            to_return.extend([c for c, p_keys in children
3425
                              if self._check_ready_for_annotations(c, p_keys)])
3426
        return to_return
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3427
3428
    def _check_ready_for_annotations(self, key, parent_keys):
3429
        """return true if this text is ready to be yielded.
3430
3431
        Otherwise, this will return False, and queue the text into
3432
        self._pending_annotation
3433
        """
3434
        for parent_key in parent_keys:
3435
            if parent_key not in self._annotations_cache:
3436
                # still waiting on at least one parent text, so queue it up
3437
                # Note that if there are multiple parents, we need to wait
3438
                # for all of them.
3439
                self._pending_annotation.setdefault(parent_key,
3440
                    []).append((key, parent_keys))
3441
                return False
3442
        return True
3443
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3444
    def _extract_texts(self, records):
3445
        """Extract the various texts needed based on records"""
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3446
        # 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.
3447
        # However, process what we can, and put off to the side things that
3448
        # still need parents, cleaning them up when those parents are
3449
        # processed.
4454.3.29 by John Arbash Meinel
Some code comments about what needs to happen.
3450
        # Basic data flow:
3451
        #   1) As 'records' are read, see if we can expand these records into
3452
        #      Content objects (and thus lines)
3453
        #   2) If a given line-delta is waiting on its compression parent, it
3454
        #      gets queued up into self._pending_deltas, otherwise we expand
3455
        #      it, and put it into self._text_cache and self._content_objects
3456
        #   3) If we expanded the text, we will then check to see if all
3457
        #      parents have also been processed. If so, this text gets yielded,
3458
        #      else this record gets set aside into pending_annotation
3459
        #   4) Further, if we expanded the text in (2), we will then check to
3460
        #      see if there are any children in self._pending_deltas waiting to
3461
        #      also be processed. If so, we go back to (2) for those
3462
        #   5) Further again, if we yielded the text, we can then check if that
3463
        #      'unlocks' any of the texts in pending_annotations, which should
3464
        #      then get yielded as well
3465
        # Note that both steps 4 and 5 are 'recursive' in that unlocking one
3466
        # compression child could unlock yet another, and yielding a fulltext
3467
        # will also 'unlock' the children that are waiting on that annotation.
3468
        # (Though also, unlocking 1 parent's fulltext, does not unlock a child
3469
        # if other parents are also waiting.)
3470
        # We want to yield content before expanding child content objects, so
3471
        # that we know when we can re-use the content lines, and the annotation
3472
        # code can know when it can stop caching fulltexts, as well.
3473
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3474
        # Children that are missing their compression parent
3475
        pending_deltas = {}
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3476
        for (key, record, digest) in self._vf._read_records_iter(records):
3477
            # ghosts?
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3478
            details = self._all_build_details[key]
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3479
            (_, compression_parent, parent_keys, record_details) = details
3480
            lines = self._expand_record(key, parent_keys, compression_parent,
3481
                                        record, record_details)
3482
            if lines is None:
3483
                # Pending delta should be queued up
3484
                continue
3485
            # At this point, we may be able to yield this content, if all
3486
            # parents are also finished
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3487
            yield_this_text = self._check_ready_for_annotations(key,
3488
                                                                parent_keys)
4454.3.29 by John Arbash Meinel
Some code comments about what needs to happen.
3489
            if yield_this_text:
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3490
                # All parents present
3491
                yield key, lines, len(lines)
4454.3.31 by John Arbash Meinel
Change the processing lines to now handle fallbacks properly.
3492
            to_process = self._process_pending(key)
3493
            while to_process:
3494
                this_process = to_process
3495
                to_process = []
3496
                for key in this_process:
3497
                    lines = self._text_cache[key]
3498
                    yield key, lines, len(lines)
3499
                    to_process.extend(self._process_pending(key))
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
3500
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
3501
try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
3502
    from ._knit_load_data_pyx import _load_data_c as _load_data
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
3503
except ImportError as e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
3504
    osutils.failed_to_load_extension(e)
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
3505
    from ._knit_load_data_py import _load_data_py as _load_data