~bzr-pqm/bzr/bzr.dev

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