~bzr-pqm/bzr/bzr.dev

3830.3.20 by John Arbash Meinel
Minor PEP8 and copyright updates.
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
2
#
3
# Authors:
4
#   Johan Rydberg <jrydberg@gnu.org>
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
10
#
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
11
# This program is distributed in the hope that it will be useful,
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
15
#
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
19
20
"""Versioned text file storage api."""
21
3350.8.2 by Robert Collins
stacked get_parent_map.
22
from copy import copy
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
23
from cStringIO import StringIO
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
24
import os
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
25
import struct
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
26
from zlib import adler32
27
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
3224.5.20 by Andrew Bennetts
Remove or lazyify a couple more imports.
30
import urllib
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
31
32
from bzrlib import (
33
    errors,
3735.32.18 by John Arbash Meinel
We now support generating a network stream.
34
    groupcompress,
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
35
    index,
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.
36
    knit,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
37
    osutils,
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
38
    multiparent,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
39
    tsort,
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
40
    revision,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
41
    ui,
42
    )
4379.3.3 by Gary van der Merwe
Rename and add doc string for StackedParentsProvider.
43
from bzrlib.graph import DictParentsProvider, Graph, StackedParentsProvider
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
44
from bzrlib.transport.memory import MemoryTransport
45
""")
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
46
from bzrlib.inter import InterObject
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
47
from bzrlib.registry import Registry
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
48
from bzrlib.symbol_versioning import *
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
49
from bzrlib.textmerge import TextMerge
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
50
from bzrlib import bencode
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.
51
52
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
53
adapter_registry = Registry()
54
adapter_registry.register_lazy(('knit-delta-gz', 'fulltext'), 'bzrlib.knit',
55
    'DeltaPlainToFullText')
56
adapter_registry.register_lazy(('knit-ft-gz', 'fulltext'), 'bzrlib.knit',
57
    'FTPlainToFullText')
58
adapter_registry.register_lazy(('knit-annotated-delta-gz', 'knit-delta-gz'),
59
    'bzrlib.knit', 'DeltaAnnotatedToUnannotated')
60
adapter_registry.register_lazy(('knit-annotated-delta-gz', 'fulltext'),
61
    'bzrlib.knit', 'DeltaAnnotatedToFullText')
62
adapter_registry.register_lazy(('knit-annotated-ft-gz', 'knit-ft-gz'),
63
    'bzrlib.knit', 'FTAnnotatedToUnannotated')
64
adapter_registry.register_lazy(('knit-annotated-ft-gz', 'fulltext'),
65
    'bzrlib.knit', 'FTAnnotatedToFullText')
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
66
# adapter_registry.register_lazy(('knit-annotated-ft-gz', 'chunked'),
67
#     'bzrlib.knit', 'FTAnnotatedToChunked')
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
68
69
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
70
class ContentFactory(object):
71
    """Abstract interface for insertion and retrieval from a VersionedFile.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
72
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
73
    :ivar sha1: None, or the sha1 of the content fulltext.
74
    :ivar storage_kind: The native storage kind of this factory. One of
75
        'mpdiff', 'knit-annotated-ft', 'knit-annotated-delta', 'knit-ft',
76
        'knit-delta', 'fulltext', 'knit-annotated-ft-gz',
77
        'knit-annotated-delta-gz', 'knit-ft-gz', 'knit-delta-gz'.
78
    :ivar key: The key of this content. Each key is a tuple with a single
79
        string in it.
80
    :ivar parents: A tuple of parent keys for self.key. If the object has
81
        no parent information, None (as opposed to () for an empty list of
82
        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.
83
    """
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
84
85
    def __init__(self):
86
        """Create a ContentFactory."""
87
        self.sha1 = None
88
        self.storage_kind = None
89
        self.key = None
90
        self.parents = None
91
92
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
93
class ChunkedContentFactory(ContentFactory):
94
    """Static data content factory.
95
96
    This takes a 'chunked' list of strings. The only requirement on 'chunked' is
97
    that ''.join(lines) becomes a valid fulltext. A tuple of a single string
98
    satisfies this, as does a list of lines.
99
100
    :ivar sha1: None, or the sha1 of the content fulltext.
101
    :ivar storage_kind: The native storage kind of this factory. Always
3890.2.2 by John Arbash Meinel
Change the signature to report the storage kind as 'chunked'
102
        'chunked'
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
103
    :ivar key: The key of this content. Each key is a tuple with a single
104
        string in it.
105
    :ivar parents: A tuple of parent keys for self.key. If the object has
106
        no parent information, None (as opposed to () for an empty list of
107
        parents).
108
     """
109
110
    def __init__(self, key, parents, sha1, chunks):
111
        """Create a ContentFactory."""
112
        self.sha1 = sha1
3890.2.2 by John Arbash Meinel
Change the signature to report the storage kind as 'chunked'
113
        self.storage_kind = 'chunked'
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
114
        self.key = key
115
        self.parents = parents
116
        self._chunks = chunks
117
118
    def get_bytes_as(self, storage_kind):
119
        if storage_kind == 'chunked':
120
            return self._chunks
121
        elif storage_kind == 'fulltext':
122
            return ''.join(self._chunks)
123
        raise errors.UnavailableRepresentation(self.key, storage_kind,
124
            self.storage_kind)
125
126
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
127
class FulltextContentFactory(ContentFactory):
128
    """Static data content factory.
129
130
    This takes a fulltext when created and just returns that during
131
    get_bytes_as('fulltext').
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
132
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
133
    :ivar sha1: None, or the sha1 of the content fulltext.
134
    :ivar storage_kind: The native storage kind of this factory. Always
135
        'fulltext'.
136
    :ivar key: The key of this content. Each key is a tuple with a single
137
        string in it.
138
    :ivar parents: A tuple of parent keys for self.key. If the object has
139
        no parent information, None (as opposed to () for an empty list of
140
        parents).
141
     """
142
143
    def __init__(self, key, parents, sha1, text):
144
        """Create a ContentFactory."""
145
        self.sha1 = sha1
146
        self.storage_kind = 'fulltext'
147
        self.key = key
148
        self.parents = parents
149
        self._text = text
150
151
    def get_bytes_as(self, storage_kind):
152
        if storage_kind == self.storage_kind:
153
            return self._text
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
154
        elif storage_kind == 'chunked':
3976.2.1 by Robert Collins
Use a list not a tuple for chunks returned from FullTextContentFactory objects, because otherwise code tries to assign to tuples.
155
            return [self._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.
156
        raise errors.UnavailableRepresentation(self.key, storage_kind,
157
            self.storage_kind)
158
159
160
class AbsentContentFactory(ContentFactory):
3350.3.12 by Robert Collins
Generate streams with absent records.
161
    """A placeholder content factory for unavailable texts.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
162
3350.3.12 by Robert Collins
Generate streams with absent records.
163
    :ivar sha1: None.
164
    :ivar storage_kind: 'absent'.
165
    :ivar key: The key of this content. Each key is a tuple with a single
166
        string in it.
167
    :ivar parents: None.
168
    """
169
170
    def __init__(self, key):
171
        """Create a ContentFactory."""
172
        self.sha1 = None
173
        self.storage_kind = 'absent'
174
        self.key = key
175
        self.parents = None
176
177
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
178
class AdapterFactory(ContentFactory):
179
    """A content factory to adapt between key prefix's."""
180
181
    def __init__(self, key, parents, adapted):
182
        """Create an adapter factory instance."""
183
        self.key = key
184
        self.parents = parents
185
        self._adapted = adapted
186
187
    def __getattr__(self, attr):
188
        """Return a member from the adapted object."""
189
        if attr in ('key', 'parents'):
190
            return self.__dict__[attr]
191
        else:
192
            return getattr(self._adapted, attr)
193
194
3350.3.14 by Robert Collins
Deprecate VersionedFile.join.
195
def filter_absent(record_stream):
196
    """Adapt a record stream to remove absent records."""
197
    for record in record_stream:
198
        if record.storage_kind != 'absent':
199
            yield record
200
201
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
202
class VersionedFile(object):
203
    """Versioned text file storage.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
204
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
205
    A versioned file manages versions of line-based text files,
206
    keeping track of the originating version for each line.
207
208
    To clients the "lines" of the file are represented as a list of
209
    strings. These strings will typically have terminal newline
210
    characters, but this is not required.  In particular files commonly
211
    do not have a newline at the end of the file.
212
213
    Texts are identified by a version-id string.
214
    """
215
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
216
    @staticmethod
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
217
    def check_not_reserved_id(version_id):
218
        revision.check_not_reserved_id(version_id)
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
219
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
220
    def copy_to(self, name, transport):
221
        """Copy this versioned file to name on transport."""
222
        raise NotImplementedError(self.copy_to)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
223
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
224
    def get_record_stream(self, versions, ordering, include_delta_closure):
225
        """Get a stream of records for versions.
226
227
        :param versions: The versions to include. Each version is a tuple
228
            (version,).
229
        :param ordering: Either 'unordered' or 'topological'. A topologically
230
            sorted stream has compression parents strictly before their
231
            children.
232
        :param include_delta_closure: If True then the closure across any
3350.3.22 by Robert Collins
Review feedback.
233
            compression parents will be included (in the data content of the
234
            stream, not in the emitted records). This guarantees that
235
            'fulltext' can be used successfully on every record.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
236
        :return: An iterator of ContentFactory objects, each of which is only
237
            valid until the iterator is advanced.
238
        """
239
        raise NotImplementedError(self.get_record_stream)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
240
241
    def has_version(self, version_id):
242
        """Returns whether version is present."""
243
        raise NotImplementedError(self.has_version)
244
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
245
    def insert_record_stream(self, stream):
246
        """Insert a record stream into this versioned file.
247
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
248
        :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.
249
        :return: None
250
        :seealso VersionedFile.get_record_stream:
251
        """
252
        raise NotImplementedError
253
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
254
    def add_lines(self, version_id, parents, lines, parent_texts=None,
2805.6.7 by Robert Collins
Review feedback.
255
        left_matching_blocks=None, nostore_sha=None, random_id=False,
256
        check_content=True):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
257
        """Add a single text on top of the versioned file.
258
259
        Must raise RevisionAlreadyPresent if the new version is
260
        already present in file history.
261
262
        Must raise RevisionNotPresent if any of the given parents are
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
263
        not present in file history.
2805.6.3 by Robert Collins
* The ``VersionedFile`` interface no longer protects against misuse when
264
265
        :param lines: A list of lines. Each line must be a bytestring. And all
266
            of them except the last must be terminated with \n and contain no
267
            other \n's. The last line may either contain no \n's or a single
268
            terminated \n. If the lines list does meet this constraint the add
269
            routine may error or may succeed - but you will be unable to read
270
            the data back accurately. (Checking the lines have been split
2805.6.7 by Robert Collins
Review feedback.
271
            correctly is expensive and extremely unlikely to catch bugs so it
272
            is not done at runtime unless check_content is True.)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
273
        :param parent_texts: An optional dictionary containing the opaque
2805.6.3 by Robert Collins
* The ``VersionedFile`` interface no longer protects against misuse when
274
            representations of some or all of the parents of version_id to
275
            allow delta optimisations.  VERY IMPORTANT: the texts must be those
276
            returned by add_lines or data corruption can be caused.
2520.4.148 by Aaron Bentley
Updates from review
277
        :param left_matching_blocks: a hint about which areas are common
278
            between the text and its left-hand-parent.  The format is
279
            the SequenceMatcher.get_matching_blocks format.
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
280
        :param nostore_sha: Raise ExistingContent and do not add the lines to
281
            the versioned file if the digest of the lines matches this.
2805.6.4 by Robert Collins
Don't check for existing versions when adding texts with random revision ids.
282
        :param random_id: If True a random id has been selected rather than
283
            an id determined by some deterministic process such as a converter
284
            from a foreign VCS. When True the backend may choose not to check
285
            for uniqueness of the resulting key within the versioned file, so
286
            this should only be done when the result is expected to be unique
287
            anyway.
2805.6.7 by Robert Collins
Review feedback.
288
        :param check_content: If True, the lines supplied are verified to be
289
            bytestrings that are correctly formed lines.
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
290
        :return: The text sha1, the number of bytes in the text, and an opaque
291
                 representation of the inserted version which can be provided
292
                 back to future add_lines calls in the parent_texts dictionary.
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
293
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
294
        self._check_write_ok()
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
295
        return self._add_lines(version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
296
            left_matching_blocks, nostore_sha, random_id, check_content)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
297
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
298
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
299
        left_matching_blocks, nostore_sha, random_id, check_content):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
300
        """Helper to do the class specific add_lines."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
301
        raise NotImplementedError(self.add_lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
302
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
303
    def add_lines_with_ghosts(self, version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
304
        parent_texts=None, nostore_sha=None, random_id=False,
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
305
        check_content=True, left_matching_blocks=None):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
306
        """Add lines to the versioned file, allowing ghosts to be present.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
307
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
308
        This takes the same parameters as add_lines and returns the same.
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
309
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
310
        self._check_write_ok()
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
311
        return self._add_lines_with_ghosts(version_id, parents, lines,
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
312
            parent_texts, nostore_sha, random_id, check_content, left_matching_blocks)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
313
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
314
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts,
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
315
        nostore_sha, random_id, check_content, left_matching_blocks):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
316
        """Helper to do class specific add_lines_with_ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
317
        raise NotImplementedError(self.add_lines_with_ghosts)
318
1563.2.19 by Robert Collins
stub out a check for knits.
319
    def check(self, progress_bar=None):
320
        """Check the versioned file for integrity."""
321
        raise NotImplementedError(self.check)
322
1666.1.6 by Robert Collins
Make knit the default format.
323
    def _check_lines_not_unicode(self, lines):
324
        """Check that lines being added to a versioned file are not unicode."""
325
        for line in lines:
326
            if line.__class__ is not str:
327
                raise errors.BzrBadParameterUnicode("lines")
328
329
    def _check_lines_are_lines(self, lines):
330
        """Check that the lines really are full lines without inline EOL."""
331
        for line in lines:
332
            if '\n' in line[:-1]:
333
                raise errors.BzrBadParameterContainsNewline("lines")
334
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
335
    def get_format_signature(self):
336
        """Get a text description of the data encoding in this file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
337
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
338
        :since: 0.90
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
339
        """
340
        raise NotImplementedError(self.get_format_signature)
341
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
342
    def make_mpdiffs(self, version_ids):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
343
        """Create multiparent diffs for specified versions."""
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
344
        knit_versions = set()
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
345
        knit_versions.update(version_ids)
346
        parent_map = self.get_parent_map(version_ids)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
347
        for version_id in version_ids:
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
348
            try:
349
                knit_versions.update(parent_map[version_id])
350
            except KeyError:
3453.3.1 by Daniel Fischer
Raise the right exception in make_mpdiffs (bug #235687)
351
                raise errors.RevisionNotPresent(version_id, self)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
352
        # We need to filter out ghosts, because we can't diff against them.
353
        knit_versions = set(self.get_parent_map(knit_versions).keys())
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
354
        lines = dict(zip(knit_versions,
355
            self._get_lf_split_line_list(knit_versions)))
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
356
        diffs = []
357
        for version_id in version_ids:
358
            target = lines[version_id]
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
359
            try:
360
                parents = [lines[p] for p in parent_map[version_id] if p in
361
                    knit_versions]
362
            except KeyError:
3453.3.2 by John Arbash Meinel
Add a test case for the first loop, unable to find a way to trigger the second loop
363
                # I don't know how this could ever trigger.
364
                # parent_map[version_id] was already triggered in the previous
365
                # for loop, and lines[p] has the 'if p in knit_versions' check,
366
                # so we again won't have a KeyError.
3453.3.1 by Daniel Fischer
Raise the right exception in make_mpdiffs (bug #235687)
367
                raise errors.RevisionNotPresent(version_id, self)
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
368
            if len(parents) > 0:
369
                left_parent_blocks = self._extract_blocks(version_id,
370
                                                          parents[0], target)
371
            else:
372
                left_parent_blocks = None
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
373
            diffs.append(multiparent.MultiParent.from_lines(target, parents,
374
                         left_parent_blocks))
375
        return diffs
376
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
377
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
378
        return None
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
379
2520.4.61 by Aaron Bentley
Do bulk insertion of records
380
    def add_mpdiffs(self, records):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
381
        """Add mpdiffs to this VersionedFile.
2520.4.126 by Aaron Bentley
Add more docs
382
383
        Records should be iterables of version, parents, expected_sha1,
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
384
        mpdiff. mpdiff should be a MultiParent instance.
2520.4.126 by Aaron Bentley
Add more docs
385
        """
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
386
        # Does this need to call self._check_write_ok()? (IanC 20070919)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
387
        vf_parents = {}
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
388
        mpvf = multiparent.MultiMemoryVersionedFile()
389
        versions = []
390
        for version, parent_ids, expected_sha1, mpdiff in records:
391
            versions.append(version)
392
            mpvf.add_diff(mpdiff, version, parent_ids)
393
        needed_parents = set()
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
394
        for version, parent_ids, expected_sha1, mpdiff in records:
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
395
            needed_parents.update(p for p in parent_ids
396
                                  if not mpvf.has_version(p))
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
397
        present_parents = set(self.get_parent_map(needed_parents).keys())
398
        for parent_id, lines in zip(present_parents,
399
                                 self._get_lf_split_line_list(present_parents)):
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
400
            mpvf.add_version(lines, parent_id, [])
401
        for (version, parent_ids, expected_sha1, mpdiff), lines in\
402
            zip(records, mpvf.get_line_list(versions)):
403
            if len(parent_ids) == 1:
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
404
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
405
                    mpvf.get_diff(parent_ids[0]).num_lines()))
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
406
            else:
407
                left_matching_blocks = None
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
408
            try:
409
                _, _, version_text = self.add_lines_with_ghosts(version,
410
                    parent_ids, lines, vf_parents,
411
                    left_matching_blocks=left_matching_blocks)
412
            except NotImplementedError:
413
                # The vf can't handle ghosts, so add lines normally, which will
414
                # (reasonably) fail if there are ghosts in the data.
415
                _, _, version_text = self.add_lines(version,
416
                    parent_ids, lines, vf_parents,
417
                    left_matching_blocks=left_matching_blocks)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
418
            vf_parents[version] = version_text
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
419
        sha1s = self.get_sha1s(versions)
420
        for version, parent_ids, expected_sha1, mpdiff in records:
421
            if expected_sha1 != sha1s[version]:
2520.4.71 by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
422
                raise errors.VersionedFileInvalidChecksum(version)
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
423
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
424
    def get_text(self, version_id):
425
        """Return version contents as a text string.
426
427
        Raises RevisionNotPresent if version is not present in
428
        file history.
429
        """
430
        return ''.join(self.get_lines(version_id))
431
    get_string = get_text
432
1756.2.1 by Aaron Bentley
Implement get_texts
433
    def get_texts(self, version_ids):
434
        """Return the texts of listed versions as a list of strings.
435
436
        Raises RevisionNotPresent if version is not present in
437
        file history.
438
        """
439
        return [''.join(self.get_lines(v)) for v in version_ids]
440
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
441
    def get_lines(self, version_id):
442
        """Return version contents as a sequence of lines.
443
444
        Raises RevisionNotPresent if version is not present in
445
        file history.
446
        """
447
        raise NotImplementedError(self.get_lines)
448
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
449
    def _get_lf_split_line_list(self, version_ids):
450
        return [StringIO(t).readlines() for t in self.get_texts(version_ids)]
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
451
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
452
    def get_ancestry(self, version_ids, topo_sorted=True):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
453
        """Return a list of all ancestors of given version(s). This
454
        will not include the null revision.
455
2490.2.32 by Aaron Bentley
Merge of not-sorting-ancestry branch
456
        This list will not be topologically sorted if topo_sorted=False is
457
        passed.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
458
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
459
        Must raise RevisionNotPresent if any of the given versions are
460
        not present in file history."""
461
        if isinstance(version_ids, basestring):
462
            version_ids = [version_ids]
463
        raise NotImplementedError(self.get_ancestry)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
464
1594.2.8 by Robert Collins
add ghost aware apis to knits.
465
    def get_ancestry_with_ghosts(self, version_ids):
466
        """Return a list of all ancestors of given version(s). This
467
        will not include the null revision.
468
469
        Must raise RevisionNotPresent if any of the given versions are
470
        not present in file history.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
471
1594.2.8 by Robert Collins
add ghost aware apis to knits.
472
        Ghosts that are known about will be included in ancestry list,
473
        but are not explicitly marked.
474
        """
475
        raise NotImplementedError(self.get_ancestry_with_ghosts)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
476
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
477
    def get_parent_map(self, version_ids):
478
        """Get a map of the parents of version_ids.
479
480
        :param version_ids: The version ids to look up parents for.
481
        :return: A mapping from version id to parents.
482
        """
483
        raise NotImplementedError(self.get_parent_map)
484
1594.2.8 by Robert Collins
add ghost aware apis to knits.
485
    def get_parents_with_ghosts(self, version_id):
486
        """Return version names for parents of version_id.
487
488
        Will raise RevisionNotPresent if version_id is not present
489
        in the history.
490
491
        Ghosts that are known about will be included in the parent list,
492
        but are not explicitly marked.
493
        """
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
494
        try:
495
            return list(self.get_parent_map([version_id])[version_id])
496
        except KeyError:
497
            raise errors.RevisionNotPresent(version_id, self)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
498
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
499
    def annotate(self, version_id):
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
500
        """Return a list of (version-id, line) tuples for version_id.
501
502
        :raise RevisionNotPresent: If the given version is
503
        not present in file history.
504
        """
505
        raise NotImplementedError(self.annotate)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
506
2975.3.2 by Robert Collins
Review feedback - document the API change and improve readability in pack's _do_copy_nodes.
507
    def iter_lines_added_or_present_in_versions(self, version_ids=None,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
508
                                                pb=None):
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
509
        """Iterate over the lines in the versioned file from version_ids.
510
2975.3.2 by Robert Collins
Review feedback - document the API change and improve readability in pack's _do_copy_nodes.
511
        This may return lines from other versions. Each item the returned
512
        iterator yields is a tuple of a line and a text version that that line
513
        is present in (not introduced in).
514
515
        Ordering of results is in whatever order is most suitable for the
516
        underlying storage format.
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
517
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
518
        If a progress bar is supplied, it may be used to indicate progress.
519
        The caller is responsible for cleaning up progress bars (because this
520
        is an iterator).
521
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
522
        NOTES: Lines are normalised: they will all have \n terminators.
523
               Lines are returned in arbitrary order.
2975.3.2 by Robert Collins
Review feedback - document the API change and improve readability in pack's _do_copy_nodes.
524
525
        :return: An iterator over (line, version_id).
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
526
        """
527
        raise NotImplementedError(self.iter_lines_added_or_present_in_versions)
528
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
529
    def plan_merge(self, ver_a, ver_b):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
530
        """Return pseudo-annotation indicating how the two versions merge.
531
532
        This is computed between versions a and b and their common
533
        base.
534
535
        Weave lines present in none of them are skipped entirely.
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
536
537
        Legend:
538
        killed-base Dead in base revision
539
        killed-both Killed in each revision
540
        killed-a    Killed in a
541
        killed-b    Killed in b
542
        unchanged   Alive in both a and b (possibly created in both)
543
        new-a       Created in a
544
        new-b       Created in b
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
545
        ghost-a     Killed in a, unborn in b
1664.2.5 by Aaron Bentley
Update plan-merge legend
546
        ghost-b     Killed in b, unborn in a
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
547
        irrelevant  Not in either revision
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
548
        """
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
549
        raise NotImplementedError(VersionedFile.plan_merge)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
550
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
551
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,
1551.6.14 by Aaron Bentley
Tweaks from merge review
552
                    b_marker=TextMerge.B_MARKER):
1551.6.12 by Aaron Bentley
Indicate conflicts from merge_lines, insead of guessing
553
        return PlanWeaveMerge(plan, a_marker, b_marker).merge_lines()[0]
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
554
1664.2.7 by Aaron Bentley
Merge bzr.dev
555
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
556
class RecordingVersionedFilesDecorator(object):
557
    """A minimal versioned files that records calls made on it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
558
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
559
    Only enough methods have been added to support tests using it to date.
560
561
    :ivar calls: A list of the calls made; can be reset at any time by
562
        assigning [] to it.
563
    """
564
565
    def __init__(self, backing_vf):
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
566
        """Create a RecordingVersionedFilesDecorator decorating backing_vf.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
567
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
568
        :param backing_vf: The versioned file to answer all methods.
569
        """
570
        self._backing_vf = backing_vf
571
        self.calls = []
572
3350.8.2 by Robert Collins
stacked get_parent_map.
573
    def add_lines(self, key, parents, lines, parent_texts=None,
574
        left_matching_blocks=None, nostore_sha=None, random_id=False,
575
        check_content=True):
576
        self.calls.append(("add_lines", key, parents, lines, parent_texts,
577
            left_matching_blocks, nostore_sha, random_id, check_content))
578
        return self._backing_vf.add_lines(key, parents, lines, parent_texts,
579
            left_matching_blocks, nostore_sha, random_id, check_content)
580
3517.4.19 by Martin Pool
Update test for knit.check() to expect it to recurse into fallback vfs
581
    def check(self):
582
        self._backing_vf.check()
583
3350.8.2 by Robert Collins
stacked get_parent_map.
584
    def get_parent_map(self, keys):
585
        self.calls.append(("get_parent_map", copy(keys)))
586
        return self._backing_vf.get_parent_map(keys)
587
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
588
    def get_record_stream(self, keys, sort_order, include_delta_closure):
3350.8.7 by Robert Collins
get_record_stream for fulltexts working (but note extreme memory use!).
589
        self.calls.append(("get_record_stream", list(keys), sort_order,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
590
            include_delta_closure))
591
        return self._backing_vf.get_record_stream(keys, sort_order,
592
            include_delta_closure)
593
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
594
    def get_sha1s(self, keys):
595
        self.calls.append(("get_sha1s", copy(keys)))
596
        return self._backing_vf.get_sha1s(keys)
597
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
598
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
599
        self.calls.append(("iter_lines_added_or_present_in_keys", copy(keys)))
3350.8.14 by Robert Collins
Review feedback.
600
        return self._backing_vf.iter_lines_added_or_present_in_keys(keys, pb=pb)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
601
3350.8.4 by Robert Collins
Vf.keys() stacking support.
602
    def keys(self):
603
        self.calls.append(("keys",))
604
        return self._backing_vf.keys()
605
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
606
3871.4.1 by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order
607
class OrderingVersionedFilesDecorator(RecordingVersionedFilesDecorator):
608
    """A VF that records calls, and returns keys in specific order.
609
610
    :ivar calls: A list of the calls made; can be reset at any time by
611
        assigning [] to it.
612
    """
613
614
    def __init__(self, backing_vf, key_priority):
615
        """Create a RecordingVersionedFilesDecorator decorating backing_vf.
616
617
        :param backing_vf: The versioned file to answer all methods.
618
        :param key_priority: A dictionary defining what order keys should be
619
            returned from an 'unordered' get_record_stream request.
620
            Keys with lower priority are returned first, keys not present in
621
            the map get an implicit priority of 0, and are returned in
622
            lexicographical order.
623
        """
624
        RecordingVersionedFilesDecorator.__init__(self, backing_vf)
625
        self._key_priority = key_priority
626
627
    def get_record_stream(self, keys, sort_order, include_delta_closure):
628
        self.calls.append(("get_record_stream", list(keys), sort_order,
629
            include_delta_closure))
630
        if sort_order == 'unordered':
631
            def sort_key(key):
632
                return (self._key_priority.get(key, 0), key)
633
            # Use a defined order by asking for the keys one-by-one from the
634
            # backing_vf
635
            for key in sorted(keys, key=sort_key):
636
                for record in self._backing_vf.get_record_stream([key],
637
                                'unordered', include_delta_closure):
638
                    yield record
639
        else:
640
            for record in self._backing_vf.get_record_stream(keys, sort_order,
641
                            include_delta_closure):
642
                yield record
643
644
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
645
class KeyMapper(object):
3350.6.10 by Martin Pool
VersionedFiles review cleanups
646
    """KeyMappers map between keys and underlying partitioned storage."""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
647
648
    def map(self, key):
649
        """Map key to an underlying storage identifier.
650
651
        :param key: A key tuple e.g. ('file-id', 'revision-id').
652
        :return: An underlying storage identifier, specific to the partitioning
653
            mechanism.
654
        """
655
        raise NotImplementedError(self.map)
656
657
    def unmap(self, partition_id):
658
        """Map a partitioned storage id back to a key prefix.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
659
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
660
        :param partition_id: The underlying partition id.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
661
        :return: As much of a key (or prefix) as is derivable from the partition
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
662
            id.
663
        """
664
        raise NotImplementedError(self.unmap)
665
666
667
class ConstantMapper(KeyMapper):
668
    """A key mapper that maps to a constant result."""
669
670
    def __init__(self, result):
671
        """Create a ConstantMapper which will return result for all maps."""
672
        self._result = result
673
674
    def map(self, key):
675
        """See KeyMapper.map()."""
676
        return self._result
677
678
679
class URLEscapeMapper(KeyMapper):
680
    """Base class for use with transport backed storage.
681
682
    This provides a map and unmap wrapper that respectively url escape and
683
    unescape their outputs and inputs.
684
    """
685
686
    def map(self, key):
687
        """See KeyMapper.map()."""
688
        return urllib.quote(self._map(key))
689
690
    def unmap(self, partition_id):
691
        """See KeyMapper.unmap()."""
692
        return self._unmap(urllib.unquote(partition_id))
693
694
695
class PrefixMapper(URLEscapeMapper):
696
    """A key mapper that extracts the first component of a key.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
697
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
698
    This mapper is for use with a transport based backend.
699
    """
700
701
    def _map(self, key):
702
        """See KeyMapper.map()."""
703
        return key[0]
704
705
    def _unmap(self, partition_id):
706
        """See KeyMapper.unmap()."""
707
        return (partition_id,)
708
709
710
class HashPrefixMapper(URLEscapeMapper):
711
    """A key mapper that combines the first component of a key with a hash.
712
713
    This mapper is for use with a transport based backend.
714
    """
715
716
    def _map(self, key):
717
        """See KeyMapper.map()."""
718
        prefix = self._escape(key[0])
719
        return "%02x/%s" % (adler32(prefix) & 0xff, prefix)
720
721
    def _escape(self, prefix):
722
        """No escaping needed here."""
723
        return prefix
724
725
    def _unmap(self, partition_id):
726
        """See KeyMapper.unmap()."""
727
        return (self._unescape(osutils.basename(partition_id)),)
728
729
    def _unescape(self, basename):
730
        """No unescaping needed for HashPrefixMapper."""
731
        return basename
732
733
734
class HashEscapedPrefixMapper(HashPrefixMapper):
735
    """Combines the escaped first component of a key with a hash.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
736
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
737
    This mapper is for use with a transport based backend.
738
    """
739
740
    _safe = "abcdefghijklmnopqrstuvwxyz0123456789-_@,."
741
742
    def _escape(self, prefix):
743
        """Turn a key element into a filesystem safe string.
744
745
        This is similar to a plain urllib.quote, except
746
        it uses specific safe characters, so that it doesn't
747
        have to translate a lot of valid file ids.
748
        """
749
        # @ does not get escaped. This is because it is a valid
750
        # filesystem character we use all the time, and it looks
751
        # a lot better than seeing %40 all the time.
752
        r = [((c in self._safe) and c or ('%%%02x' % ord(c)))
753
             for c in prefix]
754
        return ''.join(r)
755
756
    def _unescape(self, basename):
757
        """Escaped names are easily unescaped by urlutils."""
758
        return urllib.unquote(basename)
759
760
761
def make_versioned_files_factory(versioned_file_factory, mapper):
762
    """Create a ThunkedVersionedFiles factory.
763
764
    This will create a callable which when called creates a
765
    ThunkedVersionedFiles on a transport, using mapper to access individual
766
    versioned files, and versioned_file_factory to create each individual file.
767
    """
768
    def factory(transport):
769
        return ThunkedVersionedFiles(transport, versioned_file_factory, mapper,
770
            lambda:True)
771
    return factory
772
773
774
class VersionedFiles(object):
775
    """Storage for many versioned files.
776
777
    This object allows a single keyspace for accessing the history graph and
778
    contents of named bytestrings.
779
780
    Currently no implementation allows the graph of different key prefixes to
781
    intersect, but the API does allow such implementations in the future.
3350.6.7 by Robert Collins
Review feedback, making things more clear, adding documentation on what is used where.
782
783
    The keyspace is expressed via simple tuples. Any instance of VersionedFiles
784
    may have a different length key-size, but that size will be constant for
785
    all texts added to or retrieved from it. For instance, bzrlib uses
786
    instances with a key-size of 2 for storing user files in a repository, with
787
    the first element the fileid, and the second the version of that file.
788
789
    The use of tuples allows a single code base to support several different
790
    uses with only the mapping logic changing from instance to instance.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
791
    """
792
793
    def add_lines(self, key, parents, lines, parent_texts=None,
794
        left_matching_blocks=None, nostore_sha=None, random_id=False,
795
        check_content=True):
796
        """Add a text to the store.
797
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
798
        :param key: The key tuple of the text to add. If the last element is
799
            None, a CHK string will be generated during the addition.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
800
        :param parents: The parents key tuples of the text to add.
801
        :param lines: A list of lines. Each line must be a bytestring. And all
802
            of them except the last must be terminated with \n and contain no
803
            other \n's. The last line may either contain no \n's or a single
804
            terminating \n. If the lines list does meet this constraint the add
805
            routine may error or may succeed - but you will be unable to read
806
            the data back accurately. (Checking the lines have been split
807
            correctly is expensive and extremely unlikely to catch bugs so it
808
            is not done at runtime unless check_content is True.)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
809
        :param parent_texts: An optional dictionary containing the opaque
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
810
            representations of some or all of the parents of version_id to
811
            allow delta optimisations.  VERY IMPORTANT: the texts must be those
812
            returned by add_lines or data corruption can be caused.
813
        :param left_matching_blocks: a hint about which areas are common
814
            between the text and its left-hand-parent.  The format is
815
            the SequenceMatcher.get_matching_blocks format.
816
        :param nostore_sha: Raise ExistingContent and do not add the lines to
817
            the versioned file if the digest of the lines matches this.
818
        :param random_id: If True a random id has been selected rather than
819
            an id determined by some deterministic process such as a converter
820
            from a foreign VCS. When True the backend may choose not to check
821
            for uniqueness of the resulting key within the versioned file, so
822
            this should only be done when the result is expected to be unique
823
            anyway.
824
        :param check_content: If True, the lines supplied are verified to be
825
            bytestrings that are correctly formed lines.
826
        :return: The text sha1, the number of bytes in the text, and an opaque
827
                 representation of the inserted version which can be provided
828
                 back to future add_lines calls in the parent_texts dictionary.
829
        """
830
        raise NotImplementedError(self.add_lines)
831
832
    def add_mpdiffs(self, records):
833
        """Add mpdiffs to this VersionedFile.
834
835
        Records should be iterables of version, parents, expected_sha1,
836
        mpdiff. mpdiff should be a MultiParent instance.
837
        """
838
        vf_parents = {}
839
        mpvf = multiparent.MultiMemoryVersionedFile()
840
        versions = []
841
        for version, parent_ids, expected_sha1, mpdiff in records:
842
            versions.append(version)
843
            mpvf.add_diff(mpdiff, version, parent_ids)
844
        needed_parents = set()
845
        for version, parent_ids, expected_sha1, mpdiff in records:
846
            needed_parents.update(p for p in parent_ids
847
                                  if not mpvf.has_version(p))
848
        # It seems likely that adding all the present parents as fulltexts can
849
        # easily exhaust memory.
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
850
        chunks_to_lines = osutils.chunks_to_lines
3350.8.11 by Robert Collins
Stacked add_mpdiffs.
851
        for record in self.get_record_stream(needed_parents, 'unordered',
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
852
            True):
3350.8.11 by Robert Collins
Stacked add_mpdiffs.
853
            if record.storage_kind == 'absent':
854
                continue
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
855
            mpvf.add_version(chunks_to_lines(record.get_bytes_as('chunked')),
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
856
                record.key, [])
857
        for (key, parent_keys, expected_sha1, mpdiff), lines in\
858
            zip(records, mpvf.get_line_list(versions)):
859
            if len(parent_keys) == 1:
860
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
861
                    mpvf.get_diff(parent_keys[0]).num_lines()))
862
            else:
863
                left_matching_blocks = None
864
            version_sha1, _, version_text = self.add_lines(key,
865
                parent_keys, lines, vf_parents,
866
                left_matching_blocks=left_matching_blocks)
867
            if version_sha1 != expected_sha1:
868
                raise errors.VersionedFileInvalidChecksum(version)
869
            vf_parents[key] = version_text
870
871
    def annotate(self, key):
872
        """Return a list of (version-key, line) tuples for the text of key.
873
874
        :raise RevisionNotPresent: If the key is not present.
875
        """
876
        raise NotImplementedError(self.annotate)
877
878
    def check(self, progress_bar=None):
879
        """Check this object for integrity."""
880
        raise NotImplementedError(self.check)
881
882
    @staticmethod
883
    def check_not_reserved_id(version_id):
884
        revision.check_not_reserved_id(version_id)
885
886
    def _check_lines_not_unicode(self, lines):
887
        """Check that lines being added to a versioned file are not unicode."""
888
        for line in lines:
889
            if line.__class__ is not str:
890
                raise errors.BzrBadParameterUnicode("lines")
891
892
    def _check_lines_are_lines(self, lines):
893
        """Check that the lines really are full lines without inline EOL."""
894
        for line in lines:
895
            if '\n' in line[:-1]:
896
                raise errors.BzrBadParameterContainsNewline("lines")
897
898
    def get_parent_map(self, keys):
899
        """Get a map of the parents of keys.
900
901
        :param keys: The keys to look up parents for.
902
        :return: A mapping from keys to parents. Absent keys are absent from
903
            the mapping.
904
        """
905
        raise NotImplementedError(self.get_parent_map)
906
907
    def get_record_stream(self, keys, ordering, include_delta_closure):
908
        """Get a stream of records for keys.
909
910
        :param keys: The keys to include.
911
        :param ordering: Either 'unordered' or 'topological'. A topologically
912
            sorted stream has compression parents strictly before their
913
            children.
914
        :param include_delta_closure: If True then the closure across any
915
            compression parents will be included (in the opaque data).
916
        :return: An iterator of ContentFactory objects, each of which is only
917
            valid until the iterator is advanced.
918
        """
919
        raise NotImplementedError(self.get_record_stream)
920
921
    def get_sha1s(self, keys):
922
        """Get the sha1's of the texts for the given keys.
923
924
        :param keys: The names of the keys to lookup
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
925
        :return: a dict from key to sha1 digest. Keys of texts which are not
3350.8.14 by Robert Collins
Review feedback.
926
            present in the store are not present in the returned
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
927
            dictionary.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
928
        """
929
        raise NotImplementedError(self.get_sha1s)
930
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
931
    has_key = index._has_key_from_parent_map
932
4009.3.3 by Andrew Bennetts
Add docstrings.
933
    def get_missing_compression_parent_keys(self):
934
        """Return an iterable of keys of missing compression parents.
935
936
        Check this after calling insert_record_stream to find out if there are
937
        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.
938
        depend on them are not able to be inserted safely. The precise
939
        behaviour depends on the concrete VersionedFiles class in use.
940
941
        Classes that do not support this will raise NotImplementedError.
4009.3.3 by Andrew Bennetts
Add docstrings.
942
        """
943
        raise NotImplementedError(self.get_missing_compression_parent_keys)
944
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
945
    def insert_record_stream(self, stream):
946
        """Insert a record stream into this container.
947
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
948
        :param stream: A stream of records to insert.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
949
        :return: None
950
        :seealso VersionedFile.get_record_stream:
951
        """
952
        raise NotImplementedError
953
954
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
955
        """Iterate over the lines in the versioned files from keys.
956
957
        This may return lines from other keys. Each item the returned
958
        iterator yields is a tuple of a line and a text version that that line
959
        is present in (not introduced in).
960
961
        Ordering of results is in whatever order is most suitable for the
962
        underlying storage format.
963
964
        If a progress bar is supplied, it may be used to indicate progress.
965
        The caller is responsible for cleaning up progress bars (because this
966
        is an iterator).
967
968
        NOTES:
969
         * Lines are normalised by the underlying store: they will all have \n
970
           terminators.
971
         * Lines are returned in arbitrary order.
972
973
        :return: An iterator over (line, key).
974
        """
975
        raise NotImplementedError(self.iter_lines_added_or_present_in_keys)
976
977
    def keys(self):
978
        """Return a iterable of the keys for all the contained texts."""
979
        raise NotImplementedError(self.keys)
980
981
    def make_mpdiffs(self, keys):
982
        """Create multiparent diffs for specified keys."""
983
        keys_order = tuple(keys)
984
        keys = frozenset(keys)
985
        knit_keys = set(keys)
986
        parent_map = self.get_parent_map(keys)
987
        for parent_keys in parent_map.itervalues():
988
            if parent_keys:
989
                knit_keys.update(parent_keys)
990
        missing_keys = keys - set(parent_map)
991
        if missing_keys:
3530.3.2 by Robert Collins
Handling frozen set inputs in mpdiff generation when a key is missing
992
            raise errors.RevisionNotPresent(list(missing_keys)[0], 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.
993
        # We need to filter out ghosts, because we can't diff against them.
994
        maybe_ghosts = knit_keys - keys
995
        ghosts = maybe_ghosts - set(self.get_parent_map(maybe_ghosts))
996
        knit_keys.difference_update(ghosts)
997
        lines = {}
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
998
        chunks_to_lines = osutils.chunks_to_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.
999
        for record in self.get_record_stream(knit_keys, 'topological', True):
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1000
            lines[record.key] = chunks_to_lines(record.get_bytes_as('chunked'))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1001
            # line_block_dict = {}
1002
            # for parent, blocks in record.extract_line_blocks():
1003
            #   line_blocks[parent] = blocks
1004
            # line_blocks[record.key] = line_block_dict
1005
        diffs = []
1006
        for key in keys_order:
1007
            target = lines[key]
1008
            parents = parent_map[key] or []
1009
            # Note that filtering knit_keys can lead to a parent difference
1010
            # between the creation and the application of the mpdiff.
1011
            parent_lines = [lines[p] for p in parents if p in knit_keys]
1012
            if len(parent_lines) > 0:
1013
                left_parent_blocks = self._extract_blocks(key, parent_lines[0],
1014
                    target)
1015
            else:
1016
                left_parent_blocks = None
1017
            diffs.append(multiparent.MultiParent.from_lines(target,
1018
                parent_lines, left_parent_blocks))
1019
        return diffs
1020
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
1021
    missing_keys = index._missing_keys_from_parent_map
1022
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1023
    def _extract_blocks(self, version_id, source, target):
1024
        return None
1025
1026
1027
class ThunkedVersionedFiles(VersionedFiles):
1028
    """Storage for many versioned files thunked onto a 'VersionedFile' class.
1029
1030
    This object allows a single keyspace for accessing the history graph and
1031
    contents of named bytestrings.
1032
1033
    Currently no implementation allows the graph of different key prefixes to
1034
    intersect, but the API does allow such implementations in the future.
1035
    """
1036
1037
    def __init__(self, transport, file_factory, mapper, is_locked):
1038
        """Create a ThunkedVersionedFiles."""
1039
        self._transport = transport
1040
        self._file_factory = file_factory
1041
        self._mapper = mapper
1042
        self._is_locked = is_locked
1043
1044
    def add_lines(self, key, parents, lines, parent_texts=None,
1045
        left_matching_blocks=None, nostore_sha=None, random_id=False,
1046
        check_content=True):
1047
        """See VersionedFiles.add_lines()."""
1048
        path = self._mapper.map(key)
1049
        version_id = key[-1]
1050
        parents = [parent[-1] for parent in parents]
1051
        vf = self._get_vf(path)
1052
        try:
1053
            try:
1054
                return vf.add_lines_with_ghosts(version_id, parents, lines,
1055
                    parent_texts=parent_texts,
1056
                    left_matching_blocks=left_matching_blocks,
1057
                    nostore_sha=nostore_sha, random_id=random_id,
1058
                    check_content=check_content)
1059
            except NotImplementedError:
1060
                return vf.add_lines(version_id, parents, lines,
1061
                    parent_texts=parent_texts,
1062
                    left_matching_blocks=left_matching_blocks,
1063
                    nostore_sha=nostore_sha, random_id=random_id,
1064
                    check_content=check_content)
1065
        except errors.NoSuchFile:
1066
            # parent directory may be missing, try again.
1067
            self._transport.mkdir(osutils.dirname(path))
1068
            try:
1069
                return vf.add_lines_with_ghosts(version_id, parents, lines,
1070
                    parent_texts=parent_texts,
1071
                    left_matching_blocks=left_matching_blocks,
1072
                    nostore_sha=nostore_sha, random_id=random_id,
1073
                    check_content=check_content)
1074
            except NotImplementedError:
1075
                return vf.add_lines(version_id, parents, lines,
1076
                    parent_texts=parent_texts,
1077
                    left_matching_blocks=left_matching_blocks,
1078
                    nostore_sha=nostore_sha, random_id=random_id,
1079
                    check_content=check_content)
1080
1081
    def annotate(self, key):
1082
        """Return a list of (version-key, line) tuples for the text of key.
1083
1084
        :raise RevisionNotPresent: If the key is not present.
1085
        """
1086
        prefix = key[:-1]
1087
        path = self._mapper.map(prefix)
1088
        vf = self._get_vf(path)
1089
        origins = vf.annotate(key[-1])
1090
        result = []
1091
        for origin, line in origins:
1092
            result.append((prefix + (origin,), line))
1093
        return result
1094
1095
    def check(self, progress_bar=None):
1096
        """See VersionedFiles.check()."""
1097
        for prefix, vf in self._iter_all_components():
1098
            vf.check()
1099
1100
    def get_parent_map(self, keys):
1101
        """Get a map of the parents of keys.
1102
1103
        :param keys: The keys to look up parents for.
1104
        :return: A mapping from keys to parents. Absent keys are absent from
1105
            the mapping.
1106
        """
1107
        prefixes = self._partition_keys(keys)
1108
        result = {}
1109
        for prefix, suffixes in prefixes.items():
1110
            path = self._mapper.map(prefix)
1111
            vf = self._get_vf(path)
1112
            parent_map = vf.get_parent_map(suffixes)
1113
            for key, parents in parent_map.items():
1114
                result[prefix + (key,)] = tuple(
1115
                    prefix + (parent,) for parent in parents)
1116
        return result
1117
1118
    def _get_vf(self, path):
1119
        if not self._is_locked():
1120
            raise errors.ObjectNotLocked(self)
1121
        return self._file_factory(path, self._transport, create=True,
1122
            get_scope=lambda:None)
1123
1124
    def _partition_keys(self, keys):
1125
        """Turn keys into a dict of prefix:suffix_list."""
1126
        result = {}
1127
        for key in keys:
1128
            prefix_keys = result.setdefault(key[:-1], [])
1129
            prefix_keys.append(key[-1])
1130
        return result
1131
1132
    def _get_all_prefixes(self):
1133
        # Identify all key prefixes.
1134
        # XXX: A bit hacky, needs polish.
1135
        if type(self._mapper) == ConstantMapper:
1136
            paths = [self._mapper.map(())]
1137
            prefixes = [()]
1138
        else:
1139
            relpaths = set()
1140
            for quoted_relpath in self._transport.iter_files_recursive():
1141
                path, ext = os.path.splitext(quoted_relpath)
1142
                relpaths.add(path)
1143
            paths = list(relpaths)
1144
            prefixes = [self._mapper.unmap(path) for path in paths]
1145
        return zip(paths, prefixes)
1146
1147
    def get_record_stream(self, keys, ordering, include_delta_closure):
1148
        """See VersionedFiles.get_record_stream()."""
1149
        # Ordering will be taken care of by each partitioned store; group keys
1150
        # by partition.
1151
        keys = sorted(keys)
1152
        for prefix, suffixes, vf in self._iter_keys_vf(keys):
1153
            suffixes = [(suffix,) for suffix in suffixes]
1154
            for record in vf.get_record_stream(suffixes, ordering,
1155
                include_delta_closure):
1156
                if record.parents is not None:
1157
                    record.parents = tuple(
1158
                        prefix + parent for parent in record.parents)
1159
                record.key = prefix + record.key
1160
                yield record
1161
1162
    def _iter_keys_vf(self, keys):
1163
        prefixes = self._partition_keys(keys)
1164
        sha1s = {}
1165
        for prefix, suffixes in prefixes.items():
1166
            path = self._mapper.map(prefix)
1167
            vf = self._get_vf(path)
1168
            yield prefix, suffixes, vf
1169
1170
    def get_sha1s(self, keys):
1171
        """See VersionedFiles.get_sha1s()."""
1172
        sha1s = {}
1173
        for prefix,suffixes, vf in self._iter_keys_vf(keys):
1174
            vf_sha1s = vf.get_sha1s(suffixes)
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1175
            for suffix, sha1 in vf_sha1s.iteritems():
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1176
                sha1s[prefix + (suffix,)] = sha1
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1177
        return sha1s
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1178
1179
    def insert_record_stream(self, stream):
1180
        """Insert a record stream into this container.
1181
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1182
        :param stream: A stream of records to insert.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1183
        :return: None
1184
        :seealso VersionedFile.get_record_stream:
1185
        """
1186
        for record in stream:
1187
            prefix = record.key[:-1]
1188
            key = record.key[-1:]
1189
            if record.parents is not None:
1190
                parents = [parent[-1:] for parent in record.parents]
1191
            else:
1192
                parents = None
1193
            thunk_record = AdapterFactory(key, parents, record)
1194
            path = self._mapper.map(prefix)
1195
            # Note that this parses the file many times; we can do better but
1196
            # as this only impacts weaves in terms of performance, it is
1197
            # tolerable.
1198
            vf = self._get_vf(path)
1199
            vf.insert_record_stream([thunk_record])
1200
1201
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1202
        """Iterate over the lines in the versioned files from keys.
1203
1204
        This may return lines from other keys. Each item the returned
1205
        iterator yields is a tuple of a line and a text version that that line
1206
        is present in (not introduced in).
1207
1208
        Ordering of results is in whatever order is most suitable for the
1209
        underlying storage format.
1210
1211
        If a progress bar is supplied, it may be used to indicate progress.
1212
        The caller is responsible for cleaning up progress bars (because this
1213
        is an iterator).
1214
1215
        NOTES:
1216
         * Lines are normalised by the underlying store: they will all have \n
1217
           terminators.
1218
         * Lines are returned in arbitrary order.
1219
1220
        :return: An iterator over (line, key).
1221
        """
1222
        for prefix, suffixes, vf in self._iter_keys_vf(keys):
1223
            for line, version in vf.iter_lines_added_or_present_in_versions(suffixes):
1224
                yield line, prefix + (version,)
1225
1226
    def _iter_all_components(self):
1227
        for path, prefix in self._get_all_prefixes():
1228
            yield prefix, self._get_vf(path)
1229
1230
    def keys(self):
1231
        """See VersionedFiles.keys()."""
1232
        result = set()
1233
        for prefix, vf in self._iter_all_components():
1234
            for suffix in vf.versions():
1235
                result.add(prefix + (suffix,))
1236
        return result
1237
1238
1239
class _PlanMergeVersionedFile(VersionedFiles):
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1240
    """A VersionedFile for uncommitted and committed texts.
1241
1242
    It is intended to allow merges to be planned with working tree texts.
3350.6.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
    It implements only the small part of the VersionedFiles interface used by
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1244
    PlanMerge.  It falls back to multiple versionedfiles for data not stored in
1245
    _PlanMergeVersionedFile itself.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1246
1247
    :ivar: fallback_versionedfiles a list of VersionedFiles objects that can be
1248
        queried for missing texts.
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1249
    """
1250
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1251
    def __init__(self, file_id):
1252
        """Create a _PlanMergeVersionedFile.
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1253
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1254
        :param file_id: Used with _PlanMerge code which is not yet fully
1255
            tuple-keyspace aware.
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1256
        """
1257
        self._file_id = file_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.
1258
        # fallback locations
1259
        self.fallback_versionedfiles = []
1260
        # Parents for locally held keys.
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1261
        self._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.
1262
        # line data for locally held keys.
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1263
        self._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.
1264
        # key lookup providers
1265
        self._providers = [DictParentsProvider(self._parents)]
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1266
3062.2.3 by Aaron Bentley
Sync up with bzr.dev API changes
1267
    def plan_merge(self, ver_a, ver_b, base=None):
3062.1.13 by Aaron Bentley
Make _PlanMerge an implementation detail of _PlanMergeVersionedFile
1268
        """See VersionedFile.plan_merge"""
3144.3.7 by Aaron Bentley
Update from review
1269
        from bzrlib.merge import _PlanMerge
3062.2.3 by Aaron Bentley
Sync up with bzr.dev API changes
1270
        if base is 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.
1271
            return _PlanMerge(ver_a, ver_b, self, (self._file_id,)).plan_merge()
1272
        old_plan = list(_PlanMerge(ver_a, base, self, (self._file_id,)).plan_merge())
1273
        new_plan = list(_PlanMerge(ver_a, ver_b, self, (self._file_id,)).plan_merge())
3062.2.3 by Aaron Bentley
Sync up with bzr.dev API changes
1274
        return _PlanMerge._subtract_plans(old_plan, new_plan)
1275
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
1276
    def plan_lca_merge(self, ver_a, ver_b, base=None):
3144.3.7 by Aaron Bentley
Update from review
1277
        from bzrlib.merge import _PlanLCAMerge
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1278
        graph = Graph(self)
1279
        new_plan = _PlanLCAMerge(ver_a, ver_b, self, (self._file_id,), graph).plan_merge()
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
1280
        if base is None:
1281
            return new_plan
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1282
        old_plan = _PlanLCAMerge(ver_a, base, self, (self._file_id,), graph).plan_merge()
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
1283
        return _PlanLCAMerge._subtract_plans(list(old_plan), list(new_plan))
3062.1.13 by Aaron Bentley
Make _PlanMerge an implementation detail of _PlanMergeVersionedFile
1284
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1285
    def add_lines(self, key, parents, lines):
1286
        """See VersionedFiles.add_lines
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1287
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1288
        Lines are added locally, not to fallback versionedfiles.  Also, ghosts
1289
        are permitted.  Only reserved ids are permitted.
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1290
        """
3350.6.8 by Martin Pool
Change stray pdb calls to exceptions
1291
        if type(key) is not tuple:
1292
            raise TypeError(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.
1293
        if not revision.is_reserved_id(key[-1]):
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1294
            raise ValueError('Only reserved ids may be used')
1295
        if parents is None:
1296
            raise ValueError('Parents may not be None')
1297
        if lines is None:
1298
            raise ValueError('Lines may not be 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.
1299
        self._parents[key] = tuple(parents)
1300
        self._lines[key] = lines
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1301
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1302
    def get_record_stream(self, keys, ordering, include_delta_closure):
1303
        pending = set(keys)
1304
        for key in keys:
1305
            if key in self._lines:
1306
                lines = self._lines[key]
1307
                parents = self._parents[key]
1308
                pending.remove(key)
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1309
                yield ChunkedContentFactory(key, parents, None, lines)
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1310
        for versionedfile in self.fallback_versionedfiles:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1311
            for record in versionedfile.get_record_stream(
1312
                pending, 'unordered', True):
1313
                if record.storage_kind == 'absent':
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1314
                    continue
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1315
                else:
1316
                    pending.remove(record.key)
1317
                    yield record
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
1318
            if not pending:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1319
                return
1320
        # report absent entries
1321
        for key in pending:
1322
            yield AbsentContentFactory(key)
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1323
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1324
    def get_parent_map(self, keys):
1325
        """See VersionedFiles.get_parent_map"""
1326
        # We create a new provider because a fallback may have been added.
1327
        # If we make fallbacks private we can update a stack list and avoid
1328
        # object creation thrashing.
3350.6.6 by Robert Collins
Fix test_plan_file_merge
1329
        keys = set(keys)
1330
        result = {}
1331
        if revision.NULL_REVISION in keys:
1332
            keys.remove(revision.NULL_REVISION)
1333
            result[revision.NULL_REVISION] = ()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1334
        self._providers = self._providers[:1] + self.fallback_versionedfiles
3350.6.6 by Robert Collins
Fix test_plan_file_merge
1335
        result.update(
4379.3.3 by Gary van der Merwe
Rename and add doc string for StackedParentsProvider.
1336
            StackedParentsProvider(self._providers).get_parent_map(keys))
3350.6.5 by Robert Collins
Update to bzr.dev.
1337
        for key, parents in result.iteritems():
1338
            if parents == ():
1339
                result[key] = (revision.NULL_REVISION,)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
1340
        return result
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
1341
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
1342
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
1343
class PlanWeaveMerge(TextMerge):
1551.6.13 by Aaron Bentley
Cleanup
1344
    """Weave merge that takes a plan as its input.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1345
1551.6.14 by Aaron Bentley
Tweaks from merge review
1346
    This exists so that VersionedFile.plan_merge is implementable.
1347
    Most callers will want to use WeaveMerge instead.
1551.6.13 by Aaron Bentley
Cleanup
1348
    """
1349
1551.6.14 by Aaron Bentley
Tweaks from merge review
1350
    def __init__(self, plan, a_marker=TextMerge.A_MARKER,
1351
                 b_marker=TextMerge.B_MARKER):
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
1352
        TextMerge.__init__(self, a_marker, b_marker)
1353
        self.plan = plan
1354
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
1355
    def _merge_struct(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1356
        lines_a = []
1357
        lines_b = []
1358
        ch_a = ch_b = False
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
1359
1360
        def outstanding_struct():
1361
            if not lines_a and not lines_b:
1362
                return
1363
            elif ch_a and not ch_b:
1364
                # one-sided change:
1365
                yield(lines_a,)
1366
            elif ch_b and not ch_a:
1367
                yield (lines_b,)
1368
            elif lines_a == lines_b:
1369
                yield(lines_a,)
1370
            else:
1371
                yield (lines_a, lines_b)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1372
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
1373
        # We previously considered either 'unchanged' or 'killed-both' lines
1374
        # to be possible places to resynchronize.  However, assuming agreement
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1375
        # on killed-both lines may be too aggressive. -- mbp 20060324
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
1376
        for state, line in self.plan:
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
1377
            if state == 'unchanged':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1378
                # resync and flush queued conflicts changes if any
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
1379
                for struct in outstanding_struct():
1380
                    yield struct
1551.6.11 by Aaron Bentley
Switched TextMerge_lines to work on a list
1381
                lines_a = []
1382
                lines_b = []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1383
                ch_a = ch_b = False
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1384
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1385
            if state == 'unchanged':
1386
                if line:
1551.6.5 by Aaron Bentley
Got weave merge producing structural output
1387
                    yield ([line],)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1388
            elif state == 'killed-a':
1389
                ch_a = True
1390
                lines_b.append(line)
1391
            elif state == 'killed-b':
1392
                ch_b = True
1393
                lines_a.append(line)
1394
            elif state == 'new-a':
1395
                ch_a = True
1396
                lines_a.append(line)
1397
            elif state == 'new-b':
1398
                ch_b = True
1399
                lines_b.append(line)
3144.3.2 by Aaron Bentley
Get conflict handling working
1400
            elif state == 'conflicted-a':
1401
                ch_b = ch_a = True
1402
                lines_a.append(line)
1403
            elif state == 'conflicted-b':
1404
                ch_b = ch_a = True
1405
                lines_b.append(line)
4312.1.1 by John Arbash Meinel
Add a per-implementation test that deleting lines conflicts with modifying lines.
1406
            elif state == 'killed-both':
1407
                # This counts as a change, even though there is no associated
1408
                # line
1409
                ch_b = ch_a = True
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1410
            else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1411
                if state not in ('irrelevant', 'ghost-a', 'ghost-b',
4312.1.1 by John Arbash Meinel
Add a per-implementation test that deleting lines conflicts with modifying lines.
1412
                        'killed-base'):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1413
                    raise AssertionError(state)
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
1414
        for struct in outstanding_struct():
1415
            yield struct
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
1416
1664.2.14 by Aaron Bentley
spacing fix
1417
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
1418
class WeaveMerge(PlanWeaveMerge):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
1419
    """Weave merge that takes a VersionedFile and two versions as its input."""
1551.6.13 by Aaron Bentley
Cleanup
1420
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1421
    def __init__(self, versionedfile, ver_a, ver_b,
1551.6.14 by Aaron Bentley
Tweaks from merge review
1422
        a_marker=PlanWeaveMerge.A_MARKER, b_marker=PlanWeaveMerge.B_MARKER):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
1423
        plan = versionedfile.plan_merge(ver_a, ver_b)
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
1424
        PlanWeaveMerge.__init__(self, plan, a_marker, b_marker)
1425
1426
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1427
class VirtualVersionedFiles(VersionedFiles):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1428
    """Dummy implementation for VersionedFiles that uses other functions for
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1429
    obtaining fulltexts and parent maps.
1430
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1431
    This is always on the bottom of the stack and uses string keys
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1432
    (rather than tuples) internally.
1433
    """
1434
1435
    def __init__(self, get_parent_map, get_lines):
1436
        """Create a VirtualVersionedFiles.
1437
1438
        :param get_parent_map: Same signature as Repository.get_parent_map.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1439
        :param get_lines: Should return lines for specified key or None if
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1440
                          not available.
1441
        """
1442
        super(VirtualVersionedFiles, self).__init__()
1443
        self._get_parent_map = get_parent_map
1444
        self._get_lines = get_lines
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1445
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1446
    def check(self, progressbar=None):
1447
        """See VersionedFiles.check.
1448
1449
        :note: Always returns True for VirtualVersionedFiles.
1450
        """
1451
        return True
1452
1453
    def add_mpdiffs(self, records):
1454
        """See VersionedFiles.mpdiffs.
1455
1456
        :note: Not implemented for VirtualVersionedFiles.
1457
        """
1458
        raise NotImplementedError(self.add_mpdiffs)
1459
1460
    def get_parent_map(self, keys):
1461
        """See VersionedFiles.get_parent_map."""
3518.1.2 by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian.
1462
        return dict([((k,), tuple([(p,) for p in v]))
1463
            for k,v in self._get_parent_map([k for (k,) in keys]).iteritems()])
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1464
1465
    def get_sha1s(self, keys):
1466
        """See VersionedFiles.get_sha1s."""
1467
        ret = {}
1468
        for (k,) in keys:
1469
            lines = self._get_lines(k)
1470
            if lines is not None:
3518.1.2 by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian.
1471
                if not isinstance(lines, list):
1472
                    raise AssertionError
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1473
                ret[(k,)] = osutils.sha_strings(lines)
1474
        return ret
1475
1476
    def get_record_stream(self, keys, ordering, include_delta_closure):
1477
        """See VersionedFiles.get_record_stream."""
1478
        for (k,) in list(keys):
1479
            lines = self._get_lines(k)
1480
            if lines is not None:
3518.1.2 by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian.
1481
                if not isinstance(lines, list):
1482
                    raise AssertionError
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1483
                yield ChunkedContentFactory((k,), None,
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1484
                        sha1=osutils.sha_strings(lines),
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
1485
                        chunks=lines)
3518.1.1 by Jelmer Vernooij
Add VirtualVersionedFiles class.
1486
            else:
1487
                yield AbsentContentFactory((k,))
1488
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
1489
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1490
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
1491
        for i, (key,) in enumerate(keys):
1492
            if pb is not None:
4110.2.10 by Martin Pool
Tweak iter_lines progress messages
1493
                pb.update("Finding changed lines", i, len(keys))
3949.4.1 by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
1494
            for l in self._get_lines(key):
1495
                yield (l, key)
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.
1496
1497
1498
def network_bytes_to_kind_and_offset(network_bytes):
1499
    """Strip of a record kind from the front of network_bytes.
1500
1501
    :param network_bytes: The bytes of a record.
1502
    :return: A tuple (storage_kind, offset_of_remaining_bytes)
1503
    """
1504
    line_end = network_bytes.find('\n')
1505
    storage_kind = network_bytes[:line_end]
1506
    return storage_kind, line_end + 1
1507
1508
1509
class NetworkRecordStream(object):
1510
    """A record_stream which reconstitures a serialised stream."""
1511
1512
    def __init__(self, bytes_iterator):
1513
        """Create a NetworkRecordStream.
1514
1515
        :param bytes_iterator: An iterator of bytes. Each item in this
1516
            iterator should have been obtained from a record_streams'
1517
            record.get_bytes_as(record.storage_kind) call.
1518
        """
1519
        self._bytes_iterator = bytes_iterator
1520
        self._kind_factory = {'knit-ft-gz':knit.knit_network_to_record,
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
1521
            'knit-delta-gz':knit.knit_network_to_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.
1522
            'knit-annotated-ft-gz':knit.knit_network_to_record,
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
1523
            'knit-annotated-delta-gz':knit.knit_network_to_record,
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.
1524
            'knit-delta-closure':knit.knit_delta_closure_to_records,
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1525
            'fulltext':fulltext_network_to_record,
3735.32.18 by John Arbash Meinel
We now support generating a network stream.
1526
            'groupcompress-block':groupcompress.network_block_to_records,
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.
1527
            }
1528
1529
    def read(self):
1530
        """Read the stream.
1531
1532
        :return: An iterator as per VersionedFiles.get_record_stream().
1533
        """
1534
        for bytes in self._bytes_iterator:
1535
            storage_kind, line_end = network_bytes_to_kind_and_offset(bytes)
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.
1536
            for record in self._kind_factory[storage_kind](
1537
                storage_kind, bytes, line_end):
1538
                yield record
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1539
1540
1541
def fulltext_network_to_record(kind, bytes, line_end):
1542
    """Convert a network fulltext record to record."""
1543
    meta_len, = struct.unpack('!L', bytes[line_end:line_end+4])
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1544
    record_meta = bytes[line_end+4:line_end+4+meta_len]
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1545
    key, parents = bencode.bdecode_as_tuple(record_meta)
1546
    if parents == 'nil':
1547
        parents = None
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1548
    fulltext = bytes[line_end+4+meta_len:]
1549
    return [FulltextContentFactory(key, parents, None, fulltext)]
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1550
1551
1552
def _length_prefix(bytes):
1553
    return struct.pack('!L', len(bytes))
1554
1555
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
1556
def record_to_fulltext_bytes(record):
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
1557
    if record.parents is None:
1558
        parents = 'nil'
1559
    else:
1560
        parents = record.parents
1561
    record_meta = bencode.bencode((record.key, parents))
1562
    record_content = record.get_bytes_as('fulltext')
1563
    return "fulltext\n%s%s%s" % (
1564
        _length_prefix(record_meta), record_meta, record_content)
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1565
1566
1567
def sort_groupcompress(parent_map):
1568
    """Sort and group the keys in parent_map into groupcompress order.
1569
1570
    groupcompress is defined (currently) as reverse-topological order, grouped
1571
    by the key prefix.
1572
1573
    :return: A sorted-list of keys
1574
    """
1575
    # gc-optimal ordering is approximately reverse topological,
1576
    # properly grouped by file-id.
1577
    per_prefix_map = {}
1578
    for item in parent_map.iteritems():
1579
        key = item[0]
1580
        if isinstance(key, str) or len(key) == 1:
1581
            prefix = ''
1582
        else:
1583
            prefix = key[0]
1584
        try:
1585
            per_prefix_map[prefix].append(item)
1586
        except KeyError:
1587
            per_prefix_map[prefix] = [item]
1588
1589
    present_keys = []
1590
    for prefix in sorted(per_prefix_map):
1591
        present_keys.extend(reversed(tsort.topo_sort(per_prefix_map[prefix])))
1592
    return present_keys