~bzr-pqm/bzr/bzr.dev

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