/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005, 2006 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
18
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
20
"""Versioned text file storage api."""
21
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
22
from cStringIO import StringIO
23
import urllib
24
from zlib import adler32
25
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
28
29
from bzrlib import (
30
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
31
    osutils,
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
32
    multiparent,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
33
    tsort,
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
34
    revision,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
35
    ui,
36
    )
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
37
from bzrlib.graph import Graph
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
38
from bzrlib.transport.memory import MemoryTransport
39
""")
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.
40
from bzrlib.inter import InterObject
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
41
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.
42
from bzrlib.symbol_versioning import *
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
43
from bzrlib.textmerge import TextMerge
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.
44
45
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
46
adapter_registry = Registry()
47
adapter_registry.register_lazy(('knit-delta-gz', 'fulltext'), 'bzrlib.knit',
48
    'DeltaPlainToFullText')
49
adapter_registry.register_lazy(('knit-ft-gz', 'fulltext'), 'bzrlib.knit',
50
    'FTPlainToFullText')
51
adapter_registry.register_lazy(('knit-annotated-delta-gz', 'knit-delta-gz'),
52
    'bzrlib.knit', 'DeltaAnnotatedToUnannotated')
53
adapter_registry.register_lazy(('knit-annotated-delta-gz', 'fulltext'),
54
    'bzrlib.knit', 'DeltaAnnotatedToFullText')
55
adapter_registry.register_lazy(('knit-annotated-ft-gz', 'knit-ft-gz'),
56
    'bzrlib.knit', 'FTAnnotatedToUnannotated')
57
adapter_registry.register_lazy(('knit-annotated-ft-gz', 'fulltext'),
58
    'bzrlib.knit', 'FTAnnotatedToFullText')
59
60
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
61
class ContentFactory(object):
62
    """Abstract interface for insertion and retrieval from a VersionedFile.
63
    
64
    :ivar sha1: None, or the sha1 of the content fulltext.
65
    :ivar storage_kind: The native storage kind of this factory. One of
66
        'mpdiff', 'knit-annotated-ft', 'knit-annotated-delta', 'knit-ft',
67
        'knit-delta', 'fulltext', 'knit-annotated-ft-gz',
68
        'knit-annotated-delta-gz', 'knit-ft-gz', 'knit-delta-gz'.
69
    :ivar key: The key of this content. Each key is a tuple with a single
70
        string in it.
71
    :ivar parents: A tuple of parent keys for self.key. If the object has
72
        no parent information, None (as opposed to () for an empty list of
73
        parents).
74
        """
75
76
    def __init__(self):
77
        """Create a ContentFactory."""
78
        self.sha1 = None
79
        self.storage_kind = None
80
        self.key = None
81
        self.parents = None
82
83
3350.3.12 by Robert Collins
Generate streams with absent records.
84
class AbsentContentFactory(object):
85
    """A placeholder content factory for unavailable texts.
86
    
87
    :ivar sha1: None.
88
    :ivar storage_kind: 'absent'.
89
    :ivar key: The key of this content. Each key is a tuple with a single
90
        string in it.
91
    :ivar parents: None.
92
    """
93
94
    def __init__(self, key):
95
        """Create a ContentFactory."""
96
        self.sha1 = None
97
        self.storage_kind = 'absent'
98
        self.key = key
99
        self.parents = None
100
101
3350.3.14 by Robert Collins
Deprecate VersionedFile.join.
102
def filter_absent(record_stream):
103
    """Adapt a record stream to remove absent records."""
104
    for record in record_stream:
105
        if record.storage_kind != 'absent':
106
            yield record
107
108
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
109
class VersionedFile(object):
110
    """Versioned text file storage.
111
    
112
    A versioned file manages versions of line-based text files,
113
    keeping track of the originating version for each line.
114
115
    To clients the "lines" of the file are represented as a list of
116
    strings. These strings will typically have terminal newline
117
    characters, but this is not required.  In particular files commonly
118
    do not have a newline at the end of the file.
119
120
    Texts are identified by a version-id string.
121
    """
122
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
123
    @staticmethod
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
124
    def check_not_reserved_id(version_id):
125
        revision.check_not_reserved_id(version_id)
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
126
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
127
    def copy_to(self, name, transport):
128
        """Copy this versioned file to name on transport."""
129
        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
130
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
131
    def get_record_stream(self, versions, ordering, include_delta_closure):
132
        """Get a stream of records for versions.
133
134
        :param versions: The versions to include. Each version is a tuple
135
            (version,).
136
        :param ordering: Either 'unordered' or 'topological'. A topologically
137
            sorted stream has compression parents strictly before their
138
            children.
139
        :param include_delta_closure: If True then the closure across any
140
            compression parents will be included (in the opaque data).
141
        :return: An iterator of ContentFactory objects, each of which is only
142
            valid until the iterator is advanced.
143
        """
144
        raise NotImplementedError(self.get_record_stream)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
145
146
    def has_version(self, version_id):
147
        """Returns whether version is present."""
148
        raise NotImplementedError(self.has_version)
149
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
150
    def insert_record_stream(self, stream):
151
        """Insert a record stream into this versioned file.
152
153
        :param stream: A stream of records to insert. 
154
        :return: None
155
        :seealso VersionedFile.get_record_stream:
156
        """
157
        raise NotImplementedError
158
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
159
    def add_lines(self, version_id, parents, lines, parent_texts=None,
2805.6.7 by Robert Collins
Review feedback.
160
        left_matching_blocks=None, nostore_sha=None, random_id=False,
161
        check_content=True):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
162
        """Add a single text on top of the versioned file.
163
164
        Must raise RevisionAlreadyPresent if the new version is
165
        already present in file history.
166
167
        Must raise RevisionNotPresent if any of the given parents are
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
168
        not present in file history.
2805.6.3 by Robert Collins
* The ``VersionedFile`` interface no longer protects against misuse when
169
170
        :param lines: A list of lines. Each line must be a bytestring. And all
171
            of them except the last must be terminated with \n and contain no
172
            other \n's. The last line may either contain no \n's or a single
173
            terminated \n. If the lines list does meet this constraint the add
174
            routine may error or may succeed - but you will be unable to read
175
            the data back accurately. (Checking the lines have been split
2805.6.7 by Robert Collins
Review feedback.
176
            correctly is expensive and extremely unlikely to catch bugs so it
177
            is not done at runtime unless check_content is True.)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
178
        :param parent_texts: An optional dictionary containing the opaque 
2805.6.3 by Robert Collins
* The ``VersionedFile`` interface no longer protects against misuse when
179
            representations of some or all of the parents of version_id to
180
            allow delta optimisations.  VERY IMPORTANT: the texts must be those
181
            returned by add_lines or data corruption can be caused.
2520.4.148 by Aaron Bentley
Updates from review
182
        :param left_matching_blocks: a hint about which areas are common
183
            between the text and its left-hand-parent.  The format is
184
            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.
185
        :param nostore_sha: Raise ExistingContent and do not add the lines to
186
            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.
187
        :param random_id: If True a random id has been selected rather than
188
            an id determined by some deterministic process such as a converter
189
            from a foreign VCS. When True the backend may choose not to check
190
            for uniqueness of the resulting key within the versioned file, so
191
            this should only be done when the result is expected to be unique
192
            anyway.
2805.6.7 by Robert Collins
Review feedback.
193
        :param check_content: If True, the lines supplied are verified to be
194
            bytestrings that are correctly formed lines.
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
195
        :return: The text sha1, the number of bytes in the text, and an opaque
196
                 representation of the inserted version which can be provided
197
                 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.
198
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
199
        self._check_write_ok()
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
200
        return self._add_lines(version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
201
            left_matching_blocks, nostore_sha, random_id, check_content)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
202
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
203
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
204
        left_matching_blocks, nostore_sha, random_id, check_content):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
205
        """Helper to do the class specific add_lines."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
206
        raise NotImplementedError(self.add_lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
207
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
208
    def add_lines_with_ghosts(self, version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
209
        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.
210
        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.
211
        """Add lines to the versioned file, allowing ghosts to be present.
212
        
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
213
        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.
214
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
215
        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.
216
        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.
217
            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.
218
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
219
    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.
220
        nostore_sha, random_id, check_content, left_matching_blocks):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
221
        """Helper to do class specific add_lines_with_ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
222
        raise NotImplementedError(self.add_lines_with_ghosts)
223
1563.2.19 by Robert Collins
stub out a check for knits.
224
    def check(self, progress_bar=None):
225
        """Check the versioned file for integrity."""
226
        raise NotImplementedError(self.check)
227
1666.1.6 by Robert Collins
Make knit the default format.
228
    def _check_lines_not_unicode(self, lines):
229
        """Check that lines being added to a versioned file are not unicode."""
230
        for line in lines:
231
            if line.__class__ is not str:
232
                raise errors.BzrBadParameterUnicode("lines")
233
234
    def _check_lines_are_lines(self, lines):
235
        """Check that the lines really are full lines without inline EOL."""
236
        for line in lines:
237
            if '\n' in line[:-1]:
238
                raise errors.BzrBadParameterContainsNewline("lines")
239
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
240
    def get_format_signature(self):
241
        """Get a text description of the data encoding in this file.
242
        
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
243
        :since: 0.90
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
244
        """
245
        raise NotImplementedError(self.get_format_signature)
246
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
247
    def make_mpdiffs(self, version_ids):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
248
        """Create multiparent diffs for specified versions."""
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
249
        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.
250
        knit_versions.update(version_ids)
251
        parent_map = self.get_parent_map(version_ids)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
252
        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.
253
            try:
254
                knit_versions.update(parent_map[version_id])
255
            except KeyError:
256
                raise RevisionNotPresent(version_id, self)
257
        # We need to filter out ghosts, because we can't diff against them.
258
        knit_versions = set(self.get_parent_map(knit_versions).keys())
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
259
        lines = dict(zip(knit_versions,
260
            self._get_lf_split_line_list(knit_versions)))
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
261
        diffs = []
262
        for version_id in version_ids:
263
            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.
264
            try:
265
                parents = [lines[p] for p in parent_map[version_id] if p in
266
                    knit_versions]
267
            except KeyError:
268
                raise RevisionNotPresent(version_id, self)
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
269
            if len(parents) > 0:
270
                left_parent_blocks = self._extract_blocks(version_id,
271
                                                          parents[0], target)
272
            else:
273
                left_parent_blocks = None
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
274
            diffs.append(multiparent.MultiParent.from_lines(target, parents,
275
                         left_parent_blocks))
276
        return diffs
277
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
278
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
279
        return None
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
280
2520.4.61 by Aaron Bentley
Do bulk insertion of records
281
    def add_mpdiffs(self, records):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
282
        """Add mpdiffs to this VersionedFile.
2520.4.126 by Aaron Bentley
Add more docs
283
284
        Records should be iterables of version, parents, expected_sha1,
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
285
        mpdiff. mpdiff should be a MultiParent instance.
2520.4.126 by Aaron Bentley
Add more docs
286
        """
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
287
        # Does this need to call self._check_write_ok()? (IanC 20070919)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
288
        vf_parents = {}
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
289
        mpvf = multiparent.MultiMemoryVersionedFile()
290
        versions = []
291
        for version, parent_ids, expected_sha1, mpdiff in records:
292
            versions.append(version)
293
            mpvf.add_diff(mpdiff, version, parent_ids)
294
        needed_parents = set()
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
295
        for version, parent_ids, expected_sha1, mpdiff in records:
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
296
            needed_parents.update(p for p in parent_ids
297
                                  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.
298
        present_parents = set(self.get_parent_map(needed_parents).keys())
299
        for parent_id, lines in zip(present_parents,
300
                                 self._get_lf_split_line_list(present_parents)):
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
301
            mpvf.add_version(lines, parent_id, [])
302
        for (version, parent_ids, expected_sha1, mpdiff), lines in\
303
            zip(records, mpvf.get_line_list(versions)):
304
            if len(parent_ids) == 1:
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
305
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
306
                    mpvf.get_diff(parent_ids[0]).num_lines()))
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
307
            else:
308
                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.
309
            try:
310
                _, _, version_text = self.add_lines_with_ghosts(version,
311
                    parent_ids, lines, vf_parents,
312
                    left_matching_blocks=left_matching_blocks)
313
            except NotImplementedError:
314
                # The vf can't handle ghosts, so add lines normally, which will
315
                # (reasonably) fail if there are ghosts in the data.
316
                _, _, version_text = self.add_lines(version,
317
                    parent_ids, lines, vf_parents,
318
                    left_matching_blocks=left_matching_blocks)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
319
            vf_parents[version] = version_text
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
320
        for (version, parent_ids, expected_sha1, mpdiff), sha1 in\
321
             zip(records, self.get_sha1s(versions)):
322
            if expected_sha1 != sha1:
2520.4.71 by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
323
                raise errors.VersionedFileInvalidChecksum(version)
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
324
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
325
    def get_sha1s(self, version_ids):
326
        """Get the stored sha1 sums for the given revisions.
327
328
        :param version_ids: The names of the versions to lookup
329
        :return: a list of sha1s in order according to the version_ids
330
        """
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
331
        raise NotImplementedError(self.get_sha1s)
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
332
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
333
    def get_text(self, version_id):
334
        """Return version contents as a text string.
335
336
        Raises RevisionNotPresent if version is not present in
337
        file history.
338
        """
339
        return ''.join(self.get_lines(version_id))
340
    get_string = get_text
341
1756.2.1 by Aaron Bentley
Implement get_texts
342
    def get_texts(self, version_ids):
343
        """Return the texts of listed versions as a list of strings.
344
345
        Raises RevisionNotPresent if version is not present in
346
        file history.
347
        """
348
        return [''.join(self.get_lines(v)) for v in version_ids]
349
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
350
    def get_lines(self, version_id):
351
        """Return version contents as a sequence of lines.
352
353
        Raises RevisionNotPresent if version is not present in
354
        file history.
355
        """
356
        raise NotImplementedError(self.get_lines)
357
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
358
    def _get_lf_split_line_list(self, version_ids):
359
        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
360
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
361
    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.
362
        """Return a list of all ancestors of given version(s). This
363
        will not include the null revision.
364
2490.2.32 by Aaron Bentley
Merge of not-sorting-ancestry branch
365
        This list will not be topologically sorted if topo_sorted=False is
366
        passed.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
367
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
368
        Must raise RevisionNotPresent if any of the given versions are
369
        not present in file history."""
370
        if isinstance(version_ids, basestring):
371
            version_ids = [version_ids]
372
        raise NotImplementedError(self.get_ancestry)
373
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
374
    def get_ancestry_with_ghosts(self, version_ids):
375
        """Return a list of all ancestors of given version(s). This
376
        will not include the null revision.
377
378
        Must raise RevisionNotPresent if any of the given versions are
379
        not present in file history.
380
        
381
        Ghosts that are known about will be included in ancestry list,
382
        but are not explicitly marked.
383
        """
384
        raise NotImplementedError(self.get_ancestry_with_ghosts)
3316.2.7 by Robert Collins
Actually deprecated VersionedFile.get_graph.
385
    
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
386
    def get_parent_map(self, version_ids):
387
        """Get a map of the parents of version_ids.
388
389
        :param version_ids: The version ids to look up parents for.
390
        :return: A mapping from version id to parents.
391
        """
392
        raise NotImplementedError(self.get_parent_map)
393
1594.2.8 by Robert Collins
add ghost aware apis to knits.
394
    def get_parents_with_ghosts(self, version_id):
395
        """Return version names for parents of version_id.
396
397
        Will raise RevisionNotPresent if version_id is not present
398
        in the history.
399
400
        Ghosts that are known about will be included in the parent list,
401
        but are not explicitly marked.
402
        """
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
403
        try:
404
            return list(self.get_parent_map([version_id])[version_id])
405
        except KeyError:
406
            raise errors.RevisionNotPresent(version_id, self)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
407
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
408
    def annotate(self, version_id):
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
409
        """Return a list of (version-id, line) tuples for version_id.
410
411
        :raise RevisionNotPresent: If the given version is
412
        not present in file history.
413
        """
414
        raise NotImplementedError(self.annotate)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
415
3350.3.14 by Robert Collins
Deprecate VersionedFile.join.
416
    @deprecated_method(one_five)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
417
    def join(self, other, pb=None, msg=None, version_ids=None,
418
             ignore_missing=False):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
419
        """Integrate versions from other into this versioned file.
420
421
        If version_ids is None all versions from other should be
422
        incorporated into this versioned file.
423
424
        Must raise RevisionNotPresent if any of the specified versions
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
425
        are not present in the other file's history unless ignore_missing
426
        is supplied in which case they are silently skipped.
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
427
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
428
        self._check_write_ok()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
429
        return InterVersionedFile.get(other, self).join(
430
            pb,
431
            msg,
432
            version_ids,
433
            ignore_missing)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
434
2975.3.2 by Robert Collins
Review feedback - document the API change and improve readability in pack's _do_copy_nodes.
435
    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)
436
                                                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.
437
        """Iterate over the lines in the versioned file from version_ids.
438
2975.3.2 by Robert Collins
Review feedback - document the API change and improve readability in pack's _do_copy_nodes.
439
        This may return lines from other versions. Each item the returned
440
        iterator yields is a tuple of a line and a text version that that line
441
        is present in (not introduced in).
442
443
        Ordering of results is in whatever order is most suitable for the
444
        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.
445
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
446
        If a progress bar is supplied, it may be used to indicate progress.
447
        The caller is responsible for cleaning up progress bars (because this
448
        is an iterator).
449
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
450
        NOTES: Lines are normalised: they will all have \n terminators.
451
               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.
452
453
        :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.
454
        """
455
        raise NotImplementedError(self.iter_lines_added_or_present_in_versions)
456
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
457
    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.
458
        """Return pseudo-annotation indicating how the two versions merge.
459
460
        This is computed between versions a and b and their common
461
        base.
462
463
        Weave lines present in none of them are skipped entirely.
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
464
465
        Legend:
466
        killed-base Dead in base revision
467
        killed-both Killed in each revision
468
        killed-a    Killed in a
469
        killed-b    Killed in b
470
        unchanged   Alive in both a and b (possibly created in both)
471
        new-a       Created in a
472
        new-b       Created in b
1664.2.5 by Aaron Bentley
Update plan-merge legend
473
        ghost-a     Killed in a, unborn in b    
474
        ghost-b     Killed in b, unborn in a
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
475
        irrelevant  Not in either revision
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
476
        """
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
477
        raise NotImplementedError(VersionedFile.plan_merge)
478
        
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
479
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,
1551.6.14 by Aaron Bentley
Tweaks from merge review
480
                    b_marker=TextMerge.B_MARKER):
1551.6.12 by Aaron Bentley
Indicate conflicts from merge_lines, insead of guessing
481
        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
482
1664.2.7 by Aaron Bentley
Merge bzr.dev
483
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
484
class RecordingVersionedFileDecorator(object):
485
    """A minimal versioned file that records calls made on it.
486
    
487
    Only enough methods have been added to support tests using it to date.
488
489
    :ivar calls: A list of the calls made; can be reset at any time by
490
        assigning [] to it.
491
    """
492
493
    def __init__(self, backing_vf):
494
        """Create a RecordingVersionedFileDecorator decorating backing_vf.
495
        
496
        :param backing_vf: The versioned file to answer all methods.
497
        """
498
        self._backing_vf = backing_vf
499
        self.calls = []
500
501
    def get_lines(self, version_ids):
502
        self.calls.append(("get_lines", version_ids))
503
        return self._backing_vf.get_lines(version_ids)
504
505
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
506
class _PlanMergeVersionedFile(object):
507
    """A VersionedFile for uncommitted and committed texts.
508
509
    It is intended to allow merges to be planned with working tree texts.
510
    It implements only the small part of the VersionedFile interface used by
511
    PlanMerge.  It falls back to multiple versionedfiles for data not stored in
512
    _PlanMergeVersionedFile itself.
513
    """
514
515
    def __init__(self, file_id, fallback_versionedfiles=None):
516
        """Constuctor
517
518
        :param file_id: Used when raising exceptions.
519
        :param fallback_versionedfiles: If supplied, the set of fallbacks to
520
            use.  Otherwise, _PlanMergeVersionedFile.fallback_versionedfiles
521
            can be appended to later.
522
        """
523
        self._file_id = file_id
524
        if fallback_versionedfiles is None:
525
            self.fallback_versionedfiles = []
526
        else:
527
            self.fallback_versionedfiles = fallback_versionedfiles
528
        self._parents = {}
529
        self._lines = {}
530
3062.2.3 by Aaron Bentley
Sync up with bzr.dev API changes
531
    def plan_merge(self, ver_a, ver_b, base=None):
3062.1.13 by Aaron Bentley
Make _PlanMerge an implementation detail of _PlanMergeVersionedFile
532
        """See VersionedFile.plan_merge"""
3144.3.7 by Aaron Bentley
Update from review
533
        from bzrlib.merge import _PlanMerge
3062.2.3 by Aaron Bentley
Sync up with bzr.dev API changes
534
        if base is None:
535
            return _PlanMerge(ver_a, ver_b, self).plan_merge()
536
        old_plan = list(_PlanMerge(ver_a, base, self).plan_merge())
537
        new_plan = list(_PlanMerge(ver_a, ver_b, self).plan_merge())
538
        return _PlanMerge._subtract_plans(old_plan, new_plan)
539
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
540
    def plan_lca_merge(self, ver_a, ver_b, base=None):
3144.3.7 by Aaron Bentley
Update from review
541
        from bzrlib.merge import _PlanLCAMerge
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
542
        graph = self._get_graph()
543
        new_plan = _PlanLCAMerge(ver_a, ver_b, self, graph).plan_merge()
544
        if base is None:
545
            return new_plan
546
        old_plan = _PlanLCAMerge(ver_a, base, self, graph).plan_merge()
547
        return _PlanLCAMerge._subtract_plans(list(old_plan), list(new_plan))
3062.1.13 by Aaron Bentley
Make _PlanMerge an implementation detail of _PlanMergeVersionedFile
548
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
549
    def add_lines(self, version_id, parents, lines):
550
        """See VersionedFile.add_lines
551
552
        Lines are added locally, not fallback versionedfiles.  Also, ghosts are
553
        permitted.  Only reserved ids are permitted.
554
        """
555
        if not revision.is_reserved_id(version_id):
556
            raise ValueError('Only reserved ids may be used')
557
        if parents is None:
558
            raise ValueError('Parents may not be None')
559
        if lines is None:
560
            raise ValueError('Lines may not be 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.
561
        self._parents[version_id] = tuple(parents)
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
562
        self._lines[version_id] = lines
563
564
    def get_lines(self, version_id):
565
        """See VersionedFile.get_ancestry"""
566
        lines = self._lines.get(version_id)
567
        if lines is not None:
568
            return lines
569
        for versionedfile in self.fallback_versionedfiles:
570
            try:
571
                return versionedfile.get_lines(version_id)
572
            except errors.RevisionNotPresent:
573
                continue
574
        else:
575
            raise errors.RevisionNotPresent(version_id, self._file_id)
576
3062.1.14 by Aaron Bentley
Use topo_sorted=False with get_ancestry
577
    def get_ancestry(self, version_id, topo_sorted=False):
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
578
        """See VersionedFile.get_ancestry.
579
580
        Note that this implementation assumes that if a VersionedFile can
581
        answer get_ancestry at all, it can give an authoritative answer.  In
582
        fact, ghosts can invalidate this assumption.  But it's good enough
583
        99% of the time, and far cheaper/simpler.
584
585
        Also note that the results of this version are never topologically
586
        sorted, and are a set.
587
        """
3062.1.14 by Aaron Bentley
Use topo_sorted=False with get_ancestry
588
        if topo_sorted:
589
            raise ValueError('This implementation does not provide sorting')
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
590
        parents = self._parents.get(version_id)
591
        if parents is None:
592
            for vf in self.fallback_versionedfiles:
593
                try:
3062.1.14 by Aaron Bentley
Use topo_sorted=False with get_ancestry
594
                    return vf.get_ancestry(version_id, topo_sorted=False)
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
595
                except errors.RevisionNotPresent:
596
                    continue
597
            else:
598
                raise errors.RevisionNotPresent(version_id, self._file_id)
599
        ancestry = set([version_id])
600
        for parent in parents:
3062.1.14 by Aaron Bentley
Use topo_sorted=False with get_ancestry
601
            ancestry.update(self.get_ancestry(parent, topo_sorted=False))
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
602
        return ancestry
603
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.
604
    def get_parent_map(self, version_ids):
605
        """See VersionedFile.get_parent_map"""
606
        result = {}
607
        pending = set(version_ids)
608
        for key in version_ids:
609
            try:
610
                result[key] = self._parents[key]
611
            except KeyError:
612
                pass
613
        pending = pending - set(result.keys())
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
614
        for versionedfile in self.fallback_versionedfiles:
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.
615
            parents = versionedfile.get_parent_map(pending)
616
            result.update(parents)
617
            pending = pending - set(parents.keys())
618
            if not pending:
619
                return result
620
        return result
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
621
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
622
    def _get_graph(self):
3144.3.7 by Aaron Bentley
Update from review
623
        from bzrlib.graph import (
624
            DictParentsProvider,
625
            Graph,
626
            _StackedParentsProvider,
627
            )
628
        from bzrlib.repofmt.knitrepo import _KnitParentsProvider
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
629
        parent_providers = [DictParentsProvider(self._parents)]
630
        for vf in self.fallback_versionedfiles:
631
            parent_providers.append(_KnitParentsProvider(vf))
632
        return Graph(_StackedParentsProvider(parent_providers))
633
3062.1.9 by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile
634
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
635
class PlanWeaveMerge(TextMerge):
1551.6.13 by Aaron Bentley
Cleanup
636
    """Weave merge that takes a plan as its input.
637
    
1551.6.14 by Aaron Bentley
Tweaks from merge review
638
    This exists so that VersionedFile.plan_merge is implementable.
639
    Most callers will want to use WeaveMerge instead.
1551.6.13 by Aaron Bentley
Cleanup
640
    """
641
1551.6.14 by Aaron Bentley
Tweaks from merge review
642
    def __init__(self, plan, a_marker=TextMerge.A_MARKER,
643
                 b_marker=TextMerge.B_MARKER):
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
644
        TextMerge.__init__(self, a_marker, b_marker)
645
        self.plan = plan
646
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
647
    def _merge_struct(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
648
        lines_a = []
649
        lines_b = []
650
        ch_a = ch_b = False
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
651
652
        def outstanding_struct():
653
            if not lines_a and not lines_b:
654
                return
655
            elif ch_a and not ch_b:
656
                # one-sided change:
657
                yield(lines_a,)
658
            elif ch_b and not ch_a:
659
                yield (lines_b,)
660
            elif lines_a == lines_b:
661
                yield(lines_a,)
662
            else:
663
                yield (lines_a, lines_b)
1551.6.13 by Aaron Bentley
Cleanup
664
       
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
665
        # We previously considered either 'unchanged' or 'killed-both' lines
666
        # to be possible places to resynchronize.  However, assuming agreement
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
667
        # on killed-both lines may be too aggressive. -- mbp 20060324
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
668
        for state, line in self.plan:
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
669
            if state == 'unchanged':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
670
                # resync and flush queued conflicts changes if any
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
671
                for struct in outstanding_struct():
672
                    yield struct
1551.6.11 by Aaron Bentley
Switched TextMerge_lines to work on a list
673
                lines_a = []
674
                lines_b = []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
675
                ch_a = ch_b = False
676
                
677
            if state == 'unchanged':
678
                if line:
1551.6.5 by Aaron Bentley
Got weave merge producing structural output
679
                    yield ([line],)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
680
            elif state == 'killed-a':
681
                ch_a = True
682
                lines_b.append(line)
683
            elif state == 'killed-b':
684
                ch_b = True
685
                lines_a.append(line)
686
            elif state == 'new-a':
687
                ch_a = True
688
                lines_a.append(line)
689
            elif state == 'new-b':
690
                ch_b = True
691
                lines_b.append(line)
3144.3.2 by Aaron Bentley
Get conflict handling working
692
            elif state == 'conflicted-a':
693
                ch_b = ch_a = True
694
                lines_a.append(line)
695
            elif state == 'conflicted-b':
696
                ch_b = ch_a = True
697
                lines_b.append(line)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
698
            else:
1551.6.6 by Aaron Bentley
Cleanup
699
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
700
                                 'killed-base', 'killed-both'), state
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
701
        for struct in outstanding_struct():
702
            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.
703
1664.2.14 by Aaron Bentley
spacing fix
704
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
705
class WeaveMerge(PlanWeaveMerge):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
706
    """Weave merge that takes a VersionedFile and two versions as its input."""
1551.6.13 by Aaron Bentley
Cleanup
707
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
708
    def __init__(self, versionedfile, ver_a, ver_b, 
1551.6.14 by Aaron Bentley
Tweaks from merge review
709
        a_marker=PlanWeaveMerge.A_MARKER, b_marker=PlanWeaveMerge.B_MARKER):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
710
        plan = versionedfile.plan_merge(ver_a, ver_b)
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
711
        PlanWeaveMerge.__init__(self, plan, a_marker, b_marker)
712
713
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.
714
class InterVersionedFile(InterObject):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
715
    """This class represents operations taking place between two VersionedFiles.
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.
716
717
    Its instances have methods like join, and contain
718
    references to the source and target versionedfiles these operations can be 
719
    carried out on.
720
721
    Often we will provide convenience methods on 'versionedfile' which carry out
722
    operations with another versionedfile - they will always forward to
723
    InterVersionedFile.get(other).method_name(parameters).
724
    """
725
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
726
    _optimisers = []
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.
727
    """The available optimised InterVersionedFile types."""
728
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
729
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
730
        """Integrate versions from self.source into self.target.
731
732
        If version_ids is None all versions from source should be
733
        incorporated into this versioned file.
734
735
        Must raise RevisionNotPresent if any of the specified versions
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
736
        are not present in the other file's history unless ignore_missing is 
737
        supplied in which case they are silently skipped.
1563.2.13 by Robert Collins
InterVersionedFile implemented.
738
        """
3316.2.1 by Robert Collins
* ``VersionedFile.create_empty`` is removed. This method presupposed a
739
        target = self.target
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
740
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
741
        graph = Graph(self.source)
742
        search = graph._make_breadth_first_searcher(version_ids)
743
        transitive_ids = set()
744
        map(transitive_ids.update, list(search))
745
        parent_map = self.source.get_parent_map(transitive_ids)
746
        order = tsort.topo_sort(parent_map.items())
1563.2.37 by Robert Collins
Merge in nested progress bars
747
        pb = ui.ui_factory.nested_progress_bar()
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
748
        parent_texts = {}
1563.2.37 by Robert Collins
Merge in nested progress bars
749
        try:
1596.2.28 by Robert Collins
more knit profile based tuning.
750
            # TODO for incremental cross-format work:
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
751
            # make a versioned file with the following content:
752
            # all revisions we have been asked to join
753
            # all their ancestors that are *not* in target already.
754
            # the immediate parents of the above two sets, with 
755
            # empty parent lists - these versions are in target already
756
            # and the incorrect version data will be ignored.
757
            # TODO: for all ancestors that are present in target already,
758
            # check them for consistent data, this requires moving sha1 from
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
759
            # 
760
            # TODO: remove parent texts when they are not relevant any more for 
761
            # memory pressure reduction. RBC 20060313
762
            # pb.update('Converting versioned data', 0, len(order))
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
763
            total = len(order)
1563.2.37 by Robert Collins
Merge in nested progress bars
764
            for index, version in enumerate(order):
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
765
                pb.update('Converting versioned data', index, total)
3316.2.1 by Robert Collins
* ``VersionedFile.create_empty`` is removed. This method presupposed a
766
                if version in target:
767
                    continue
2776.1.3 by Robert Collins
Missed bundles in the return value conversion of vf.add_lines.
768
                _, _, parent_text = target.add_lines(version,
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.
769
                                               parent_map[version],
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
770
                                               self.source.get_lines(version),
771
                                               parent_texts=parent_texts)
772
                parent_texts[version] = parent_text
3316.2.1 by Robert Collins
* ``VersionedFile.create_empty`` is removed. This method presupposed a
773
            return total
1563.2.37 by Robert Collins
Merge in nested progress bars
774
        finally:
775
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
776
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
777
    def _get_source_version_ids(self, version_ids, ignore_missing):
778
        """Determine the version ids to be used from self.source.
779
780
        :param version_ids: The caller-supplied version ids to check. (None 
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
781
                            for all). If None is in version_ids, it is stripped.
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
782
        :param ignore_missing: if True, remove missing ids from the version 
783
                               list. If False, raise RevisionNotPresent on
784
                               a missing version id.
785
        :return: A set of version ids.
786
        """
787
        if version_ids is None:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
788
            # None cannot be in source.versions
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
789
            return set(self.source.versions())
790
        else:
791
            if ignore_missing:
792
                return set(self.source.versions()).intersection(set(version_ids))
793
            else:
794
                new_version_ids = set()
795
                for version in version_ids:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
796
                    if version is None:
797
                        continue
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
798
                    if not self.source.has_version(version):
799
                        raise errors.RevisionNotPresent(version, str(self.source))
800
                    else:
801
                        new_version_ids.add(version)
802
                return new_version_ids
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
803
804
805
class KeyMapper(object):
806
    """KeyMappers map between keys and underlying paritioned storage."""
807
808
    def map(self, key):
809
        """Map key to an underlying storage identifier.
810
811
        :param key: A key tuple e.g. ('file-id', 'revision-id').
812
        :return: An underlying storage identifier, specific to the partitioning
813
            mechanism.
814
        """
815
816
    def unmap(self, partition_id):
817
        """Map a partitioned storage id back to a key prefix.
818
        
819
        :param partition_id: The underlying partition id.
820
        :return: As much of a key (or prefix) as is derivable from the parition
821
            id.
822
        """
823
824
825
class ConstantMapper(KeyMapper):
826
    """A key mapper that maps to a constant result."""
827
828
    def __init__(self, result):
829
        """Create a ConstantMapper which will return result for all maps."""
830
        self._result = result
831
832
    def map(self, key):
833
        """See KeyMapper.map()."""
834
        return self._result
835
836
837
class PrefixMapper(KeyMapper):
838
    """A key mapper that extracts the first component of a key."""
839
840
    def map(self, key):
841
        """See KeyMapper.map()."""
842
        return key[0]
843
844
    def unmap(self, partition_id):
845
        """See KeyMapper.unmap()."""
846
        return (partition_id,)
847
848
849
class HashPrefixMapper(KeyMapper):
850
    """A key mapper that combines the first component of a key with a hash."""
851
852
    def map(self, key):
853
        """See KeyMapper.map()."""
854
        prefix = self._escape(key[0])
855
        return "%02x/%s" % (adler32(prefix) & 0xff, prefix)
856
857
    def _escape(self, prefix):
858
        """No escaping needed here."""
859
        return prefix
860
861
    def unmap(self, partition_id):
862
        """See KeyMapper.unmap()."""
863
        return (self._unescape(osutils.basename(partition_id)),)
864
865
    def _unescape(self, basename):
866
        """No unescaping needed for HashPrefixMapper."""
867
        return basename
868
869
870
class HashEscapedPrefixMapper(HashPrefixMapper):
871
    """Combines the escaped first component of a key with a hash."""
872
873
    _safe = "abcdefghijklmnopqrstuvwxyz0123456789-_@,."
874
875
    def _escape(self, prefix):
876
        """Turn a key element into a filesystem safe string.
877
878
        This is similar to a plain urllib.quote, except
879
        it uses specific safe characters, so that it doesn't
880
        have to translate a lot of valid file ids.
881
        """
882
        # @ does not get escaped. This is because it is a valid
883
        # filesystem character we use all the time, and it looks
884
        # a lot better than seeing %40 all the time.
885
        r = [((c in self._safe) and c or ('%%%02x' % ord(c)))
886
             for c in prefix]
887
        return ''.join(r)
888
889
    def _unescape(self, basename):
890
        """Escaped names are unescaped by urlutils."""
891
        return urllib.unquote(basename)