~bzr-pqm/bzr/bzr.dev

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