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