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