~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(), """
24
25
from bzrlib import (
26
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
27
    osutils,
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
28
    multiparent,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
29
    tsort,
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
30
    revision,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
31
    ui,
32
    )
33
from bzrlib.transport.memory import MemoryTransport
34
""")
35
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
36
from cStringIO import StringIO
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.41 by Aaron Bentley
Accelerate mpdiff generation
270
    def make_mpdiffs(self, version_ids):
2520.4.126 by Aaron Bentley
Add more docs
271
        """Create multiparent diffs for specified versions"""
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
272
        knit_versions = set()
273
        for version_id in version_ids:
274
            knit_versions.add(version_id)
275
            knit_versions.update(self.get_parents(version_id))
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
276
        lines = dict(zip(knit_versions,
277
            self._get_lf_split_line_list(knit_versions)))
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
278
        diffs = []
279
        for version_id in version_ids:
280
            target = lines[version_id]
281
            parents = [lines[p] for p in self.get_parents(version_id)]
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
282
            if len(parents) > 0:
283
                left_parent_blocks = self._extract_blocks(version_id,
284
                                                          parents[0], target)
285
            else:
286
                left_parent_blocks = None
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
287
            diffs.append(multiparent.MultiParent.from_lines(target, parents,
288
                         left_parent_blocks))
289
        return diffs
290
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
291
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
292
        return None
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
293
2520.4.61 by Aaron Bentley
Do bulk insertion of records
294
    def add_mpdiffs(self, records):
2520.4.126 by Aaron Bentley
Add more docs
295
        """Add mpdiffs to this versionedfile
296
297
        Records should be iterables of version, parents, expected_sha1,
298
        mpdiff.  mpdiff should be a MultiParent instance.
299
        """
2520.4.61 by Aaron Bentley
Do bulk insertion of records
300
        vf_parents = {}
301
        for version, parents, expected_sha1, mpdiff in records:
2520.4.62 by Aaron Bentley
Use a fresh versionedfile each time
302
            mpvf = multiparent.MultiMemoryVersionedFile()
2520.4.61 by Aaron Bentley
Do bulk insertion of records
303
            needed_parents = [p for p in parents if not mpvf.has_version(p)]
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
304
            parent_lines = self._get_lf_split_line_list(needed_parents)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
305
            for parent_id, lines in zip(needed_parents, parent_lines):
306
                mpvf.add_version(lines, parent_id, [])
307
            mpvf.add_diff(mpdiff, version, parents)
308
            lines = mpvf.get_line_list([version])[0]
309
            version_text = self.add_lines(version, parents, lines, vf_parents)
310
            vf_parents[version] = version_text
2520.4.71 by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
311
            if expected_sha1 != self.get_sha1(version):
312
                raise errors.VersionedFileInvalidChecksum(version)
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
313
1666.1.6 by Robert Collins
Make knit the default format.
314
    def get_sha1(self, version_id):
315
        """Get the stored sha1 sum for the given revision.
316
        
317
        :param name: The name of the version to lookup
318
        """
319
        raise NotImplementedError(self.get_sha1)
320
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
321
    def get_sha1s(self, version_ids):
322
        """Get the stored sha1 sums for the given revisions.
323
324
        :param version_ids: The names of the versions to lookup
325
        :return: a list of sha1s in order according to the version_ids
326
        """
327
        raise NotImplementedError(self.get_sha1)
328
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
329
    def get_suffixes(self):
330
        """Return the file suffixes associated with this versioned file."""
331
        raise NotImplementedError(self.get_suffixes)
332
    
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
333
    def get_text(self, version_id):
334
        """Return version contents as a text string.
335
336
        Raises RevisionNotPresent if version is not present in
337
        file history.
338
        """
339
        return ''.join(self.get_lines(version_id))
340
    get_string = get_text
341
1756.2.1 by Aaron Bentley
Implement get_texts
342
    def get_texts(self, version_ids):
343
        """Return the texts of listed versions as a list of strings.
344
345
        Raises RevisionNotPresent if version is not present in
346
        file history.
347
        """
348
        return [''.join(self.get_lines(v)) for v in version_ids]
349
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
350
    def get_lines(self, version_id):
351
        """Return version contents as a sequence of lines.
352
353
        Raises RevisionNotPresent if version is not present in
354
        file history.
355
        """
356
        raise NotImplementedError(self.get_lines)
357
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
358
    def _get_lf_split_line_list(self, version_ids):
359
        return [StringIO(t).readlines() for t in self.get_texts(version_ids)]
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
360
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
361
    def get_ancestry(self, version_ids, topo_sorted=True):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
362
        """Return a list of all ancestors of given version(s). This
363
        will not include the null revision.
364
2490.2.32 by Aaron Bentley
Merge of not-sorting-ancestry branch
365
        This list will not be topologically sorted if topo_sorted=False is
366
        passed.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
367
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
368
        Must raise RevisionNotPresent if any of the given versions are
369
        not present in file history."""
370
        if isinstance(version_ids, basestring):
371
            version_ids = [version_ids]
372
        raise NotImplementedError(self.get_ancestry)
373
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
374
    def get_ancestry_with_ghosts(self, version_ids):
375
        """Return a list of all ancestors of given version(s). This
376
        will not include the null revision.
377
378
        Must raise RevisionNotPresent if any of the given versions are
379
        not present in file history.
380
        
381
        Ghosts that are known about will be included in ancestry list,
382
        but are not explicitly marked.
383
        """
384
        raise NotImplementedError(self.get_ancestry_with_ghosts)
385
        
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
386
    def get_graph(self, version_ids=None):
387
        """Return a graph from the versioned file. 
1594.2.8 by Robert Collins
add ghost aware apis to knits.
388
        
389
        Ghosts are not listed or referenced in the graph.
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
390
        :param version_ids: Versions to select.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
391
                            None means retrieve all versions.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
392
        """
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
393
        if version_ids is None:
394
            return dict(self.iter_parents(self.versions()))
1563.2.13 by Robert Collins
InterVersionedFile implemented.
395
        result = {}
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
396
        pending = set(osutils.safe_revision_id(v) for v in version_ids)
397
        while pending:
398
            this_iteration = pending
399
            pending = set()
400
            for version, parents in self.iter_parents(this_iteration):
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
401
                result[version] = parents
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
402
                pending.update(parents)
403
            pending.difference_update(result)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
404
        return result
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
405
1594.2.8 by Robert Collins
add ghost aware apis to knits.
406
    def get_graph_with_ghosts(self):
407
        """Return a graph for the entire versioned file.
408
        
409
        Ghosts are referenced in parents list but are not
410
        explicitly listed.
411
        """
412
        raise NotImplementedError(self.get_graph_with_ghosts)
413
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.
414
    @deprecated_method(zero_eight)
415
    def parent_names(self, version):
416
        """Return version names for parents of a version.
417
        
418
        See get_parents for the current api.
419
        """
420
        return self.get_parents(version)
421
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
422
    def get_parents(self, version_id):
423
        """Return version names for parents of a version.
424
425
        Must raise RevisionNotPresent if version is not present in
426
        file history.
427
        """
428
        raise NotImplementedError(self.get_parents)
429
1594.2.8 by Robert Collins
add ghost aware apis to knits.
430
    def get_parents_with_ghosts(self, version_id):
431
        """Return version names for parents of version_id.
432
433
        Will raise RevisionNotPresent if version_id is not present
434
        in the history.
435
436
        Ghosts that are known about will be included in the parent list,
437
        but are not explicitly marked.
438
        """
439
        raise NotImplementedError(self.get_parents_with_ghosts)
440
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
441
    def annotate_iter(self, version_id):
442
        """Yield list of (version-id, line) pairs for the specified
443
        version.
444
445
        Must raise RevisionNotPresent if any of the given versions are
446
        not present in file history.
447
        """
448
        raise NotImplementedError(self.annotate_iter)
449
450
    def annotate(self, version_id):
451
        return list(self.annotate_iter(version_id))
452
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
453
    def _apply_delta(self, lines, delta):
454
        """Apply delta to lines."""
455
        lines = list(lines)
456
        offset = 0
457
        for start, end, count, delta_lines in delta:
458
            lines[offset+start:offset+end] = delta_lines
459
            offset = offset + (start - end) + count
460
        return lines
461
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
462
    def join(self, other, pb=None, msg=None, version_ids=None,
463
             ignore_missing=False):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
464
        """Integrate versions from other into this versioned file.
465
466
        If version_ids is None all versions from other should be
467
        incorporated into this versioned file.
468
469
        Must raise RevisionNotPresent if any of the specified versions
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
470
        are not present in the other files history unless ignore_missing
471
        is supplied when they are silently skipped.
472
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
473
        self._check_write_ok()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
474
        return InterVersionedFile.get(other, self).join(
475
            pb,
476
            msg,
477
            version_ids,
478
            ignore_missing)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
479
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
480
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
481
                                                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.
482
        """Iterate over the lines in the versioned file from version_ids.
483
484
        This may return lines from other versions, and does not return the
485
        specific version marker at this point. The api may be changed
486
        during development to include the version that the versioned file
487
        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.
488
        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.
489
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
490
        If a progress bar is supplied, it may be used to indicate progress.
491
        The caller is responsible for cleaning up progress bars (because this
492
        is an iterator).
493
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
494
        NOTES: Lines are normalised: they will all have \n terminators.
495
               Lines are returned in arbitrary order.
496
        """
497
        raise NotImplementedError(self.iter_lines_added_or_present_in_versions)
498
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
499
    def iter_parents(self, version_ids):
500
        """Iterate through the parents for many version ids.
501
502
        :param version_ids: An iterable yielding version_ids.
503
        :return: An iterator that yields (version_id, parents). Requested 
504
            version_ids not present in the versioned file are simply skipped.
505
            The order is undefined, allowing for different optimisations in
506
            the underlying implementation.
507
        """
508
        for version_id in version_ids:
509
            try:
510
                yield version_id, tuple(self.get_parents(version_id))
511
            except errors.RevisionNotPresent:
512
                pass
513
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
514
    def transaction_finished(self):
515
        """The transaction that this file was opened in has finished.
516
517
        This records self.finished = True and should cause all mutating
518
        operations to error.
519
        """
520
        self.finished = True
521
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
522
    @deprecated_method(zero_eight)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
523
    def walk(self, version_ids=None):
524
        """Walk the versioned file as a weave-like structure, for
525
        versions relative to version_ids.  Yields sequence of (lineno,
526
        insert, deletes, text) for each relevant line.
527
528
        Must raise RevisionNotPresent if any of the specified versions
529
        are not present in the file history.
530
531
        :param version_ids: the version_ids to walk with respect to. If not
532
                            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.
533
534
        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.
535
        """
536
        raise NotImplementedError(self.walk)
537
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.
538
    @deprecated_method(zero_eight)
539
    def iter_names(self):
540
        """Walk the names list."""
541
        return iter(self.versions())
542
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
543
    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.
544
        """Return pseudo-annotation indicating how the two versions merge.
545
546
        This is computed between versions a and b and their common
547
        base.
548
549
        Weave lines present in none of them are skipped entirely.
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
550
551
        Legend:
552
        killed-base Dead in base revision
553
        killed-both Killed in each revision
554
        killed-a    Killed in a
555
        killed-b    Killed in b
556
        unchanged   Alive in both a and b (possibly created in both)
557
        new-a       Created in a
558
        new-b       Created in b
1664.2.5 by Aaron Bentley
Update plan-merge legend
559
        ghost-a     Killed in a, unborn in b    
560
        ghost-b     Killed in b, unborn in a
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
561
        irrelevant  Not in either revision
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
562
        """
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
563
        raise NotImplementedError(VersionedFile.plan_merge)
564
        
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
565
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,
1551.6.14 by Aaron Bentley
Tweaks from merge review
566
                    b_marker=TextMerge.B_MARKER):
1551.6.12 by Aaron Bentley
Indicate conflicts from merge_lines, insead of guessing
567
        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
568
1664.2.7 by Aaron Bentley
Merge bzr.dev
569
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
570
class PlanWeaveMerge(TextMerge):
1551.6.13 by Aaron Bentley
Cleanup
571
    """Weave merge that takes a plan as its input.
572
    
1551.6.14 by Aaron Bentley
Tweaks from merge review
573
    This exists so that VersionedFile.plan_merge is implementable.
574
    Most callers will want to use WeaveMerge instead.
1551.6.13 by Aaron Bentley
Cleanup
575
    """
576
1551.6.14 by Aaron Bentley
Tweaks from merge review
577
    def __init__(self, plan, a_marker=TextMerge.A_MARKER,
578
                 b_marker=TextMerge.B_MARKER):
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
579
        TextMerge.__init__(self, a_marker, b_marker)
580
        self.plan = plan
581
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
582
    def _merge_struct(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
583
        lines_a = []
584
        lines_b = []
585
        ch_a = ch_b = False
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
586
587
        def outstanding_struct():
588
            if not lines_a and not lines_b:
589
                return
590
            elif ch_a and not ch_b:
591
                # one-sided change:
592
                yield(lines_a,)
593
            elif ch_b and not ch_a:
594
                yield (lines_b,)
595
            elif lines_a == lines_b:
596
                yield(lines_a,)
597
            else:
598
                yield (lines_a, lines_b)
1551.6.13 by Aaron Bentley
Cleanup
599
       
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
600
        # We previously considered either 'unchanged' or 'killed-both' lines
601
        # to be possible places to resynchronize.  However, assuming agreement
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
602
        # on killed-both lines may be too aggressive. -- mbp 20060324
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
603
        for state, line in self.plan:
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
604
            if state == 'unchanged':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
605
                # resync and flush queued conflicts changes if any
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
606
                for struct in outstanding_struct():
607
                    yield struct
1551.6.11 by Aaron Bentley
Switched TextMerge_lines to work on a list
608
                lines_a = []
609
                lines_b = []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
610
                ch_a = ch_b = False
611
                
612
            if state == 'unchanged':
613
                if line:
1551.6.5 by Aaron Bentley
Got weave merge producing structural output
614
                    yield ([line],)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
615
            elif state == 'killed-a':
616
                ch_a = True
617
                lines_b.append(line)
618
            elif state == 'killed-b':
619
                ch_b = True
620
                lines_a.append(line)
621
            elif state == 'new-a':
622
                ch_a = True
623
                lines_a.append(line)
624
            elif state == 'new-b':
625
                ch_b = True
626
                lines_b.append(line)
627
            else:
1551.6.6 by Aaron Bentley
Cleanup
628
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
629
                                 'killed-base', 'killed-both'), state
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
630
        for struct in outstanding_struct():
631
            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.
632
1664.2.14 by Aaron Bentley
spacing fix
633
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
634
class WeaveMerge(PlanWeaveMerge):
1551.6.13 by Aaron Bentley
Cleanup
635
    """Weave merge that takes a VersionedFile and two versions as its input"""
636
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
637
    def __init__(self, versionedfile, ver_a, ver_b, 
1551.6.14 by Aaron Bentley
Tweaks from merge review
638
        a_marker=PlanWeaveMerge.A_MARKER, b_marker=PlanWeaveMerge.B_MARKER):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
639
        plan = versionedfile.plan_merge(ver_a, ver_b)
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
640
        PlanWeaveMerge.__init__(self, plan, a_marker, b_marker)
641
642
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.
643
class InterVersionedFile(InterObject):
644
    """This class represents operations taking place between two versionedfiles..
645
646
    Its instances have methods like join, and contain
647
    references to the source and target versionedfiles these operations can be 
648
    carried out on.
649
650
    Often we will provide convenience methods on 'versionedfile' which carry out
651
    operations with another versionedfile - they will always forward to
652
    InterVersionedFile.get(other).method_name(parameters).
653
    """
654
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
655
    _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.
656
    """The available optimised InterVersionedFile types."""
657
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
658
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
659
        """Integrate versions from self.source into self.target.
660
661
        If version_ids is None all versions from source should be
662
        incorporated into this versioned file.
663
664
        Must raise RevisionNotPresent if any of the specified versions
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
665
        are not present in the other files history unless ignore_missing is 
666
        supplied when they are silently skipped.
1563.2.13 by Robert Collins
InterVersionedFile implemented.
667
        """
668
        # the default join: 
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
669
        # - if the target is empty, just add all the versions from 
670
        #   source to target, otherwise:
1563.2.13 by Robert Collins
InterVersionedFile implemented.
671
        # - make a temporary versioned file of type target
672
        # - insert the source content into it one at a time
673
        # - join them
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
674
        if not self.target.versions():
675
            target = self.target
676
        else:
677
            # Make a new target-format versioned file. 
678
            temp_source = self.target.create_empty("temp", MemoryTransport())
679
            target = temp_source
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
680
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
681
        graph = self.source.get_graph(version_ids)
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
682
        order = tsort.topo_sort(graph.items())
1563.2.37 by Robert Collins
Merge in nested progress bars
683
        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.
684
        parent_texts = {}
1563.2.37 by Robert Collins
Merge in nested progress bars
685
        try:
1596.2.28 by Robert Collins
more knit profile based tuning.
686
            # TODO for incremental cross-format work:
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
687
            # make a versioned file with the following content:
688
            # all revisions we have been asked to join
689
            # all their ancestors that are *not* in target already.
690
            # the immediate parents of the above two sets, with 
691
            # empty parent lists - these versions are in target already
692
            # and the incorrect version data will be ignored.
693
            # TODO: for all ancestors that are present in target already,
694
            # 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.
695
            # 
696
            # TODO: remove parent texts when they are not relevant any more for 
697
            # memory pressure reduction. RBC 20060313
698
            # pb.update('Converting versioned data', 0, len(order))
699
            # deltas = self.source.get_deltas(order)
1563.2.37 by Robert Collins
Merge in nested progress bars
700
            for index, version in enumerate(order):
701
                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.
702
                parent_text = target.add_lines(version,
703
                                               self.source.get_parents(version),
704
                                               self.source.get_lines(version),
705
                                               parent_texts=parent_texts)
706
                parent_texts[version] = parent_text
707
                #delta_parent, sha1, noeol, delta = deltas[version]
708
                #target.add_delta(version,
709
                #                 self.source.get_parents(version),
710
                #                 delta_parent,
711
                #                 sha1,
712
                #                 noeol,
713
                #                 delta)
714
                #target.get_lines(version)
1563.2.37 by Robert Collins
Merge in nested progress bars
715
            
716
            # 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.
717
            if target is not self.target:
718
                return self.target.join(temp_source,
719
                                        pb,
720
                                        msg,
721
                                        version_ids,
722
                                        ignore_missing)
1563.2.37 by Robert Collins
Merge in nested progress bars
723
        finally:
724
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
725
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
726
    def _get_source_version_ids(self, version_ids, ignore_missing):
727
        """Determine the version ids to be used from self.source.
728
729
        :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.
730
                            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.
731
        :param ignore_missing: if True, remove missing ids from the version 
732
                               list. If False, raise RevisionNotPresent on
733
                               a missing version id.
734
        :return: A set of version ids.
735
        """
736
        if version_ids is None:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
737
            # None cannot be in source.versions
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
738
            return set(self.source.versions())
739
        else:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
740
            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.
741
            if ignore_missing:
742
                return set(self.source.versions()).intersection(set(version_ids))
743
            else:
744
                new_version_ids = set()
745
                for version in version_ids:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
746
                    if version is None:
747
                        continue
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
748
                    if not self.source.has_version(version):
749
                        raise errors.RevisionNotPresent(version, str(self.source))
750
                    else:
751
                        new_version_ids.add(version)
752
                return new_version_ids