/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
    )
33
from bzrlib.transport.memory import MemoryTransport
34
""")
35
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
36
from cStringIO import StringIO
37
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.
38
from bzrlib.inter import InterObject
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
39
from bzrlib.textmerge import TextMerge
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
40
from bzrlib.symbol_versioning import (deprecated_function,
41
        deprecated_method,
42
        zero_eight,
43
        )
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
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
46
class VersionedFile(object):
47
    """Versioned text file storage.
48
    
49
    A versioned file manages versions of line-based text files,
50
    keeping track of the originating version for each line.
51
52
    To clients the "lines" of the file are represented as a list of
53
    strings. These strings will typically have terminal newline
54
    characters, but this is not required.  In particular files commonly
55
    do not have a newline at the end of the file.
56
57
    Texts are identified by a version-id string.
58
    """
59
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
60
    def __init__(self, access_mode):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
61
        self.finished = False
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
62
        self._access_mode = access_mode
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
63
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
64
    @staticmethod
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
65
    def check_not_reserved_id(version_id):
66
        revision.check_not_reserved_id(version_id)
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
67
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
68
    def copy_to(self, name, transport):
69
        """Copy this versioned file to name on transport."""
70
        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
71
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.
72
    @deprecated_method(zero_eight)
73
    def names(self):
74
        """Return a list of all the versions in this versioned file.
75
76
        Please use versionedfile.versions() now.
77
        """
78
        return self.versions()
79
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
80
    def versions(self):
81
        """Return a unsorted list of versions."""
82
        raise NotImplementedError(self.versions)
83
1594.2.8 by Robert Collins
add ghost aware apis to knits.
84
    def has_ghost(self, version_id):
85
        """Returns whether version is present as a ghost."""
86
        raise NotImplementedError(self.has_ghost)
87
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
88
    def has_version(self, version_id):
89
        """Returns whether version is present."""
90
        raise NotImplementedError(self.has_version)
91
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
92
    def add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):
93
        """Add a text to the versioned file via a pregenerated delta.
94
95
        :param version_id: The version id being added.
96
        :param parents: The parents of the version_id.
97
        :param delta_parent: The parent this delta was created against.
98
        :param sha1: The sha1 of the full text.
99
        :param delta: The delta instructions. See get_delta for details.
100
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
101
        version_id = osutils.safe_revision_id(version_id)
102
        parents = [osutils.safe_revision_id(v) for v in parents]
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
103
        self._check_write_ok()
104
        if self.has_version(version_id):
105
            raise errors.RevisionAlreadyPresent(version_id, self)
106
        return self._add_delta(version_id, parents, delta_parent, sha1, noeol, delta)
107
108
    def _add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):
109
        """Class specific routine to add a delta.
110
111
        This generic version simply applies the delta to the delta_parent and
112
        then inserts it.
113
        """
114
        # strip annotation from delta
115
        new_delta = []
116
        for start, stop, delta_len, delta_lines in delta:
117
            new_delta.append((start, stop, delta_len, [text for origin, text in delta_lines]))
118
        if delta_parent is not None:
119
            parent_full = self.get_lines(delta_parent)
120
        else:
121
            parent_full = []
122
        new_full = self._apply_delta(parent_full, new_delta)
123
        # its impossible to have noeol on an empty file
124
        if noeol and new_full[-1][-1] == '\n':
125
            new_full[-1] = new_full[-1][:-1]
126
        self.add_lines(version_id, parents, new_full)
127
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
128
    def add_lines(self, version_id, parents, lines, parent_texts=None,
129
                  left_matching_blocks=None):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
130
        """Add a single text on top of the versioned file.
131
132
        Must raise RevisionAlreadyPresent if the new version is
133
        already present in file history.
134
135
        Must raise RevisionNotPresent if any of the given parents are
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
136
        not present in file history.
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
137
        :param parent_texts: An optional dictionary containing the opaque 
1616.1.1 by Martin Pool
[merge] robertc
138
             representations of some or all of the parents of 
139
             version_id to allow delta optimisations. 
140
             VERY IMPORTANT: the texts must be those returned
141
             by add_lines or data corruption can be caused.
2520.4.148 by Aaron Bentley
Updates from review
142
        :param left_matching_blocks: a hint about which areas are common
143
            between the text and its left-hand-parent.  The format is
144
            the SequenceMatcher.get_matching_blocks format.
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
145
        :return: An opaque representation of the inserted version which can be
146
                 provided back to future add_lines calls in the parent_texts
147
                 dictionary.
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
148
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
149
        version_id = osutils.safe_revision_id(version_id)
150
        parents = [osutils.safe_revision_id(v) for v in parents]
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
151
        self._check_write_ok()
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
152
        return self._add_lines(version_id, parents, lines, parent_texts,
153
                               left_matching_blocks)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
154
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
155
    def _add_lines(self, version_id, parents, lines, parent_texts,
156
                   left_matching_blocks):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
157
        """Helper to do the class specific add_lines."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
158
        raise NotImplementedError(self.add_lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
159
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
160
    def add_lines_with_ghosts(self, version_id, parents, lines,
161
                              parent_texts=None):
162
        """Add lines to the versioned file, allowing ghosts to be present.
163
        
164
        This takes the same parameters as add_lines.
165
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
166
        version_id = osutils.safe_revision_id(version_id)
167
        parents = [osutils.safe_revision_id(v) for v in parents]
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
168
        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.
169
        return self._add_lines_with_ghosts(version_id, parents, lines,
170
                                           parent_texts)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
171
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
172
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
173
        """Helper to do class specific add_lines_with_ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
174
        raise NotImplementedError(self.add_lines_with_ghosts)
175
1563.2.19 by Robert Collins
stub out a check for knits.
176
    def check(self, progress_bar=None):
177
        """Check the versioned file for integrity."""
178
        raise NotImplementedError(self.check)
179
1666.1.6 by Robert Collins
Make knit the default format.
180
    def _check_lines_not_unicode(self, lines):
181
        """Check that lines being added to a versioned file are not unicode."""
182
        for line in lines:
183
            if line.__class__ is not str:
184
                raise errors.BzrBadParameterUnicode("lines")
185
186
    def _check_lines_are_lines(self, lines):
187
        """Check that the lines really are full lines without inline EOL."""
188
        for line in lines:
189
            if '\n' in line[:-1]:
190
                raise errors.BzrBadParameterContainsNewline("lines")
191
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
192
    def _check_write_ok(self):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
193
        """Is the versioned file marked as 'finished' ? Raise if it is."""
194
        if self.finished:
195
            raise errors.OutSideTransaction()
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
196
        if self._access_mode != 'w':
197
            raise errors.ReadOnlyObjectDirtiedError(self)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
198
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
199
    def enable_cache(self):
200
        """Tell this versioned file that it should cache any data it reads.
201
        
202
        This is advisory, implementations do not have to support caching.
203
        """
204
        pass
205
    
1563.2.7 by Robert Collins
add versioned file clear_cache entry.
206
    def clear_cache(self):
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
207
        """Remove any data cached in the versioned file object.
208
209
        This only needs to be supported if caches are supported
210
        """
211
        pass
1563.2.7 by Robert Collins
add versioned file clear_cache entry.
212
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
213
    def clone_text(self, new_version_id, old_version_id, parents):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
214
        """Add an identical text to old_version_id as new_version_id.
215
216
        Must raise RevisionNotPresent if the old version or any of the
217
        parents are not present in file history.
218
219
        Must raise RevisionAlreadyPresent if the new version is
220
        already present in file history."""
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
221
        new_version_id = osutils.safe_revision_id(new_version_id)
222
        old_version_id = osutils.safe_revision_id(old_version_id)
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
223
        self._check_write_ok()
224
        return self._clone_text(new_version_id, old_version_id, parents)
225
226
    def _clone_text(self, new_version_id, old_version_id, parents):
227
        """Helper function to do the _clone_text work."""
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
228
        raise NotImplementedError(self.clone_text)
229
1563.2.13 by Robert Collins
InterVersionedFile implemented.
230
    def create_empty(self, name, transport, mode=None):
231
        """Create a new versioned file of this exact type.
232
233
        :param name: the file name
234
        :param transport: the transport
235
        :param mode: optional file mode.
236
        """
237
        raise NotImplementedError(self.create_empty)
238
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
239
    def fix_parents(self, version_id, new_parents):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
240
        """Fix the parents list for version.
241
        
242
        This is done by appending a new version to the index
243
        with identical data except for the parents list.
244
        the parents list must be a superset of the current
245
        list.
246
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
247
        version_id = osutils.safe_revision_id(version_id)
248
        new_parents = [osutils.safe_revision_id(p) for p in new_parents]
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
249
        self._check_write_ok()
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
250
        return self._fix_parents(version_id, new_parents)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
251
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
252
    def _fix_parents(self, version_id, new_parents):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
253
        """Helper for fix_parents."""
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
254
        raise NotImplementedError(self.fix_parents)
255
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
256
    def get_delta(self, version):
257
        """Get a delta for constructing version from some other version.
258
        
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
259
        :return: (delta_parent, sha1, noeol, delta)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
260
        Where delta_parent is a version id or None to indicate no parent.
261
        """
262
        raise NotImplementedError(self.get_delta)
263
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
264
    def get_deltas(self, version_ids):
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
265
        """Get multiple deltas at once for constructing versions.
266
        
267
        :return: dict(version_id:(delta_parent, sha1, noeol, delta))
268
        Where delta_parent is a version id or None to indicate no parent, and
269
        version_id is the version_id created by that delta.
270
        """
271
        result = {}
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
272
        for version_id in version_ids:
273
            result[version_id] = self.get_delta(version_id)
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
274
        return result
275
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
276
    def make_mpdiffs(self, version_ids):
2520.4.126 by Aaron Bentley
Add more docs
277
        """Create multiparent diffs for specified versions"""
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
278
        knit_versions = set()
279
        for version_id in version_ids:
280
            knit_versions.add(version_id)
281
            knit_versions.update(self.get_parents(version_id))
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
282
        lines = dict(zip(knit_versions,
283
            self._get_lf_split_line_list(knit_versions)))
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
284
        diffs = []
285
        for version_id in version_ids:
286
            target = lines[version_id]
287
            parents = [lines[p] for p in self.get_parents(version_id)]
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
288
            if len(parents) > 0:
289
                left_parent_blocks = self._extract_blocks(version_id,
290
                                                          parents[0], target)
291
            else:
292
                left_parent_blocks = None
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
293
            diffs.append(multiparent.MultiParent.from_lines(target, parents,
294
                         left_parent_blocks))
295
        return diffs
296
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
297
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
298
        return None
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
299
2520.4.61 by Aaron Bentley
Do bulk insertion of records
300
    def add_mpdiffs(self, records):
2520.4.126 by Aaron Bentley
Add more docs
301
        """Add mpdiffs to this versionedfile
302
303
        Records should be iterables of version, parents, expected_sha1,
304
        mpdiff.  mpdiff should be a MultiParent instance.
305
        """
2520.4.61 by Aaron Bentley
Do bulk insertion of records
306
        vf_parents = {}
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
307
        mpvf = multiparent.MultiMemoryVersionedFile()
308
        versions = []
309
        for version, parent_ids, expected_sha1, mpdiff in records:
310
            versions.append(version)
311
            mpvf.add_diff(mpdiff, version, parent_ids)
312
        needed_parents = set()
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
313
        for version, parent_ids, expected_sha1, mpdiff in records:
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
314
            needed_parents.update(p for p in parent_ids
315
                                  if not mpvf.has_version(p))
316
        for parent_id, lines in zip(needed_parents,
317
                                 self._get_lf_split_line_list(needed_parents)):
318
            mpvf.add_version(lines, parent_id, [])
319
        for (version, parent_ids, expected_sha1, mpdiff), lines in\
320
            zip(records, mpvf.get_line_list(versions)):
321
            if len(parent_ids) == 1:
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
322
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
323
                    mpvf.get_diff(parent_ids[0]).num_lines()))
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
324
            else:
325
                left_matching_blocks = None
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
326
            version_text = self.add_lines(version, parent_ids, lines,
2520.4.151 by Aaron Bentley
Style fixes from review
327
                vf_parents, left_matching_blocks=left_matching_blocks)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
328
            vf_parents[version] = version_text
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
329
        for (version, parent_ids, expected_sha1, mpdiff), sha1 in\
330
             zip(records, self.get_sha1s(versions)):
331
            if expected_sha1 != sha1:
2520.4.71 by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
332
                raise errors.VersionedFileInvalidChecksum(version)
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
333
1666.1.6 by Robert Collins
Make knit the default format.
334
    def get_sha1(self, version_id):
335
        """Get the stored sha1 sum for the given revision.
336
        
337
        :param name: The name of the version to lookup
338
        """
339
        raise NotImplementedError(self.get_sha1)
340
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
341
    def get_sha1s(self, version_ids):
342
        """Get the stored sha1 sums for the given revisions.
343
344
        :param version_ids: The names of the versions to lookup
345
        :return: a list of sha1s in order according to the version_ids
346
        """
347
        raise NotImplementedError(self.get_sha1)
348
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
349
    def get_suffixes(self):
350
        """Return the file suffixes associated with this versioned file."""
351
        raise NotImplementedError(self.get_suffixes)
352
    
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
353
    def get_text(self, version_id):
354
        """Return version contents as a text string.
355
356
        Raises RevisionNotPresent if version is not present in
357
        file history.
358
        """
359
        return ''.join(self.get_lines(version_id))
360
    get_string = get_text
361
1756.2.1 by Aaron Bentley
Implement get_texts
362
    def get_texts(self, version_ids):
363
        """Return the texts of listed versions as a list of strings.
364
365
        Raises RevisionNotPresent if version is not present in
366
        file history.
367
        """
368
        return [''.join(self.get_lines(v)) for v in version_ids]
369
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
370
    def get_lines(self, version_id):
371
        """Return version contents as a sequence of lines.
372
373
        Raises RevisionNotPresent if version is not present in
374
        file history.
375
        """
376
        raise NotImplementedError(self.get_lines)
377
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
378
    def _get_lf_split_line_list(self, version_ids):
379
        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
380
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
381
    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.
382
        """Return a list of all ancestors of given version(s). This
383
        will not include the null revision.
384
2490.2.32 by Aaron Bentley
Merge of not-sorting-ancestry branch
385
        This list will not be topologically sorted if topo_sorted=False is
386
        passed.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
387
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
388
        Must raise RevisionNotPresent if any of the given versions are
389
        not present in file history."""
390
        if isinstance(version_ids, basestring):
391
            version_ids = [version_ids]
392
        raise NotImplementedError(self.get_ancestry)
393
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
394
    def get_ancestry_with_ghosts(self, version_ids):
395
        """Return a list of all ancestors of given version(s). This
396
        will not include the null revision.
397
398
        Must raise RevisionNotPresent if any of the given versions are
399
        not present in file history.
400
        
401
        Ghosts that are known about will be included in ancestry list,
402
        but are not explicitly marked.
403
        """
404
        raise NotImplementedError(self.get_ancestry_with_ghosts)
405
        
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
406
    def get_graph(self, version_ids=None):
407
        """Return a graph from the versioned file. 
1594.2.8 by Robert Collins
add ghost aware apis to knits.
408
        
409
        Ghosts are not listed or referenced in the graph.
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
410
        :param version_ids: Versions to select.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
411
                            None means retrieve all versions.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
412
        """
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
413
        if version_ids is None:
414
            return dict(self.iter_parents(self.versions()))
1563.2.13 by Robert Collins
InterVersionedFile implemented.
415
        result = {}
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
416
        pending = set(osutils.safe_revision_id(v) for v in version_ids)
417
        while pending:
418
            this_iteration = pending
419
            pending = set()
420
            for version, parents in self.iter_parents(this_iteration):
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
421
                result[version] = parents
2652.1.1 by John Arbash Meinel
Avoid set.difference_update(other) because it is slow when other is big.
422
                for parent in parents:
423
                    if parent in result:
424
                        continue
425
                    pending.add(parent)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
426
        return result
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
427
1594.2.8 by Robert Collins
add ghost aware apis to knits.
428
    def get_graph_with_ghosts(self):
429
        """Return a graph for the entire versioned file.
430
        
431
        Ghosts are referenced in parents list but are not
432
        explicitly listed.
433
        """
434
        raise NotImplementedError(self.get_graph_with_ghosts)
435
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.
436
    @deprecated_method(zero_eight)
437
    def parent_names(self, version):
438
        """Return version names for parents of a version.
439
        
440
        See get_parents for the current api.
441
        """
442
        return self.get_parents(version)
443
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
444
    def get_parents(self, version_id):
445
        """Return version names for parents of a version.
446
447
        Must raise RevisionNotPresent if version is not present in
448
        file history.
449
        """
450
        raise NotImplementedError(self.get_parents)
451
1594.2.8 by Robert Collins
add ghost aware apis to knits.
452
    def get_parents_with_ghosts(self, version_id):
453
        """Return version names for parents of version_id.
454
455
        Will raise RevisionNotPresent if version_id is not present
456
        in the history.
457
458
        Ghosts that are known about will be included in the parent list,
459
        but are not explicitly marked.
460
        """
461
        raise NotImplementedError(self.get_parents_with_ghosts)
462
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
463
    def annotate_iter(self, version_id):
464
        """Yield list of (version-id, line) pairs for the specified
465
        version.
466
467
        Must raise RevisionNotPresent if any of the given versions are
468
        not present in file history.
469
        """
470
        raise NotImplementedError(self.annotate_iter)
471
472
    def annotate(self, version_id):
473
        return list(self.annotate_iter(version_id))
474
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
475
    def _apply_delta(self, lines, delta):
476
        """Apply delta to lines."""
477
        lines = list(lines)
478
        offset = 0
479
        for start, end, count, delta_lines in delta:
480
            lines[offset+start:offset+end] = delta_lines
481
            offset = offset + (start - end) + count
482
        return lines
483
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
484
    def join(self, other, pb=None, msg=None, version_ids=None,
485
             ignore_missing=False):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
486
        """Integrate versions from other into this versioned file.
487
488
        If version_ids is None all versions from other should be
489
        incorporated into this versioned file.
490
491
        Must raise RevisionNotPresent if any of the specified versions
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
492
        are not present in the other files history unless ignore_missing
493
        is supplied when they are silently skipped.
494
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
495
        self._check_write_ok()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
496
        return InterVersionedFile.get(other, self).join(
497
            pb,
498
            msg,
499
            version_ids,
500
            ignore_missing)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
501
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
502
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
503
                                                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.
504
        """Iterate over the lines in the versioned file from version_ids.
505
506
        This may return lines from other versions, and does not return the
507
        specific version marker at this point. The api may be changed
508
        during development to include the version that the versioned file
509
        thinks is relevant, but given that such hints are just guesses,
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
510
        its better not to have it if we don't need it.
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
511
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
512
        If a progress bar is supplied, it may be used to indicate progress.
513
        The caller is responsible for cleaning up progress bars (because this
514
        is an iterator).
515
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
516
        NOTES: Lines are normalised: they will all have \n terminators.
517
               Lines are returned in arbitrary order.
518
        """
519
        raise NotImplementedError(self.iter_lines_added_or_present_in_versions)
520
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
521
    def iter_parents(self, version_ids):
522
        """Iterate through the parents for many version ids.
523
524
        :param version_ids: An iterable yielding version_ids.
525
        :return: An iterator that yields (version_id, parents). Requested 
526
            version_ids not present in the versioned file are simply skipped.
527
            The order is undefined, allowing for different optimisations in
528
            the underlying implementation.
529
        """
530
        for version_id in version_ids:
531
            try:
532
                yield version_id, tuple(self.get_parents(version_id))
533
            except errors.RevisionNotPresent:
534
                pass
535
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
536
    def transaction_finished(self):
537
        """The transaction that this file was opened in has finished.
538
539
        This records self.finished = True and should cause all mutating
540
        operations to error.
541
        """
542
        self.finished = True
543
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
544
    @deprecated_method(zero_eight)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
545
    def walk(self, version_ids=None):
546
        """Walk the versioned file as a weave-like structure, for
547
        versions relative to version_ids.  Yields sequence of (lineno,
548
        insert, deletes, text) for each relevant line.
549
550
        Must raise RevisionNotPresent if any of the specified versions
551
        are not present in the file history.
552
553
        :param version_ids: the version_ids to walk with respect to. If not
554
                            supplied the entire weave-like structure is walked.
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
555
556
        walk is deprecated in favour of iter_lines_added_or_present_in_versions
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
557
        """
558
        raise NotImplementedError(self.walk)
559
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.
560
    @deprecated_method(zero_eight)
561
    def iter_names(self):
562
        """Walk the names list."""
563
        return iter(self.versions())
564
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
565
    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.
566
        """Return pseudo-annotation indicating how the two versions merge.
567
568
        This is computed between versions a and b and their common
569
        base.
570
571
        Weave lines present in none of them are skipped entirely.
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
572
573
        Legend:
574
        killed-base Dead in base revision
575
        killed-both Killed in each revision
576
        killed-a    Killed in a
577
        killed-b    Killed in b
578
        unchanged   Alive in both a and b (possibly created in both)
579
        new-a       Created in a
580
        new-b       Created in b
1664.2.5 by Aaron Bentley
Update plan-merge legend
581
        ghost-a     Killed in a, unborn in b    
582
        ghost-b     Killed in b, unborn in a
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
583
        irrelevant  Not in either revision
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
584
        """
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
585
        raise NotImplementedError(VersionedFile.plan_merge)
586
        
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
587
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,
1551.6.14 by Aaron Bentley
Tweaks from merge review
588
                    b_marker=TextMerge.B_MARKER):
1551.6.12 by Aaron Bentley
Indicate conflicts from merge_lines, insead of guessing
589
        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
590
1664.2.7 by Aaron Bentley
Merge bzr.dev
591
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
592
class PlanWeaveMerge(TextMerge):
1551.6.13 by Aaron Bentley
Cleanup
593
    """Weave merge that takes a plan as its input.
594
    
1551.6.14 by Aaron Bentley
Tweaks from merge review
595
    This exists so that VersionedFile.plan_merge is implementable.
596
    Most callers will want to use WeaveMerge instead.
1551.6.13 by Aaron Bentley
Cleanup
597
    """
598
1551.6.14 by Aaron Bentley
Tweaks from merge review
599
    def __init__(self, plan, a_marker=TextMerge.A_MARKER,
600
                 b_marker=TextMerge.B_MARKER):
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
601
        TextMerge.__init__(self, a_marker, b_marker)
602
        self.plan = plan
603
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
604
    def _merge_struct(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
605
        lines_a = []
606
        lines_b = []
607
        ch_a = ch_b = False
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
608
609
        def outstanding_struct():
610
            if not lines_a and not lines_b:
611
                return
612
            elif ch_a and not ch_b:
613
                # one-sided change:
614
                yield(lines_a,)
615
            elif ch_b and not ch_a:
616
                yield (lines_b,)
617
            elif lines_a == lines_b:
618
                yield(lines_a,)
619
            else:
620
                yield (lines_a, lines_b)
1551.6.13 by Aaron Bentley
Cleanup
621
       
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
622
        # We previously considered either 'unchanged' or 'killed-both' lines
623
        # to be possible places to resynchronize.  However, assuming agreement
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
624
        # on killed-both lines may be too aggressive. -- mbp 20060324
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
625
        for state, line in self.plan:
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
626
            if state == 'unchanged':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
627
                # resync and flush queued conflicts changes if any
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
628
                for struct in outstanding_struct():
629
                    yield struct
1551.6.11 by Aaron Bentley
Switched TextMerge_lines to work on a list
630
                lines_a = []
631
                lines_b = []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
632
                ch_a = ch_b = False
633
                
634
            if state == 'unchanged':
635
                if line:
1551.6.5 by Aaron Bentley
Got weave merge producing structural output
636
                    yield ([line],)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
637
            elif state == 'killed-a':
638
                ch_a = True
639
                lines_b.append(line)
640
            elif state == 'killed-b':
641
                ch_b = True
642
                lines_a.append(line)
643
            elif state == 'new-a':
644
                ch_a = True
645
                lines_a.append(line)
646
            elif state == 'new-b':
647
                ch_b = True
648
                lines_b.append(line)
649
            else:
1551.6.6 by Aaron Bentley
Cleanup
650
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
651
                                 'killed-base', 'killed-both'), state
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
652
        for struct in outstanding_struct():
653
            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.
654
1664.2.14 by Aaron Bentley
spacing fix
655
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
656
class WeaveMerge(PlanWeaveMerge):
1551.6.13 by Aaron Bentley
Cleanup
657
    """Weave merge that takes a VersionedFile and two versions as its input"""
658
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
659
    def __init__(self, versionedfile, ver_a, ver_b, 
1551.6.14 by Aaron Bentley
Tweaks from merge review
660
        a_marker=PlanWeaveMerge.A_MARKER, b_marker=PlanWeaveMerge.B_MARKER):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
661
        plan = versionedfile.plan_merge(ver_a, ver_b)
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
662
        PlanWeaveMerge.__init__(self, plan, a_marker, b_marker)
663
664
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.
665
class InterVersionedFile(InterObject):
666
    """This class represents operations taking place between two versionedfiles..
667
668
    Its instances have methods like join, and contain
669
    references to the source and target versionedfiles these operations can be 
670
    carried out on.
671
672
    Often we will provide convenience methods on 'versionedfile' which carry out
673
    operations with another versionedfile - they will always forward to
674
    InterVersionedFile.get(other).method_name(parameters).
675
    """
676
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
677
    _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.
678
    """The available optimised InterVersionedFile types."""
679
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
680
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
681
        """Integrate versions from self.source into self.target.
682
683
        If version_ids is None all versions from source should be
684
        incorporated into this versioned file.
685
686
        Must raise RevisionNotPresent if any of the specified versions
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
687
        are not present in the other files history unless ignore_missing is 
688
        supplied when they are silently skipped.
1563.2.13 by Robert Collins
InterVersionedFile implemented.
689
        """
690
        # the default join: 
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
691
        # - if the target is empty, just add all the versions from 
692
        #   source to target, otherwise:
1563.2.13 by Robert Collins
InterVersionedFile implemented.
693
        # - make a temporary versioned file of type target
694
        # - insert the source content into it one at a time
695
        # - join them
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
696
        if not self.target.versions():
697
            target = self.target
698
        else:
699
            # Make a new target-format versioned file. 
700
            temp_source = self.target.create_empty("temp", MemoryTransport())
701
            target = temp_source
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
702
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
703
        graph = self.source.get_graph(version_ids)
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
704
        order = tsort.topo_sort(graph.items())
1563.2.37 by Robert Collins
Merge in nested progress bars
705
        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.
706
        parent_texts = {}
1563.2.37 by Robert Collins
Merge in nested progress bars
707
        try:
1596.2.28 by Robert Collins
more knit profile based tuning.
708
            # TODO for incremental cross-format work:
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
709
            # make a versioned file with the following content:
710
            # all revisions we have been asked to join
711
            # all their ancestors that are *not* in target already.
712
            # the immediate parents of the above two sets, with 
713
            # empty parent lists - these versions are in target already
714
            # and the incorrect version data will be ignored.
715
            # TODO: for all ancestors that are present in target already,
716
            # 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.
717
            # 
718
            # TODO: remove parent texts when they are not relevant any more for 
719
            # memory pressure reduction. RBC 20060313
720
            # pb.update('Converting versioned data', 0, len(order))
721
            # deltas = self.source.get_deltas(order)
1563.2.37 by Robert Collins
Merge in nested progress bars
722
            for index, version in enumerate(order):
723
                pb.update('Converting versioned data', index, len(order))
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
724
                parent_text = target.add_lines(version,
725
                                               self.source.get_parents(version),
726
                                               self.source.get_lines(version),
727
                                               parent_texts=parent_texts)
728
                parent_texts[version] = parent_text
729
                #delta_parent, sha1, noeol, delta = deltas[version]
730
                #target.add_delta(version,
731
                #                 self.source.get_parents(version),
732
                #                 delta_parent,
733
                #                 sha1,
734
                #                 noeol,
735
                #                 delta)
736
                #target.get_lines(version)
1563.2.37 by Robert Collins
Merge in nested progress bars
737
            
738
            # this should hit the native code path for target
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
739
            if target is not self.target:
740
                return self.target.join(temp_source,
741
                                        pb,
742
                                        msg,
743
                                        version_ids,
744
                                        ignore_missing)
1563.2.37 by Robert Collins
Merge in nested progress bars
745
        finally:
746
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
747
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
748
    def _get_source_version_ids(self, version_ids, ignore_missing):
749
        """Determine the version ids to be used from self.source.
750
751
        :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.
752
                            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.
753
        :param ignore_missing: if True, remove missing ids from the version 
754
                               list. If False, raise RevisionNotPresent on
755
                               a missing version id.
756
        :return: A set of version ids.
757
        """
758
        if version_ids is None:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
759
            # None cannot be in source.versions
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
760
            return set(self.source.versions())
761
        else:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
762
            version_ids = [osutils.safe_revision_id(v) for v in version_ids]
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
763
            if ignore_missing:
764
                return set(self.source.versions()).intersection(set(version_ids))
765
            else:
766
                new_version_ids = set()
767
                for version in version_ids:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
768
                    if version is None:
769
                        continue
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
770
                    if not self.source.has_version(version):
771
                        raise errors.RevisionNotPresent(version, str(self.source))
772
                    else:
773
                        new_version_ids.add(version)
774
                return new_version_ids