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