/brz/remove-bazaar

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