/brz/remove-bazaar

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