/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(), """
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
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.
40
41
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
42
class VersionedFile(object):
43
    """Versioned text file storage.
44
    
45
    A versioned file manages versions of line-based text files,
46
    keeping track of the originating version for each line.
47
48
    To clients the "lines" of the file are represented as a list of
49
    strings. These strings will typically have terminal newline
50
    characters, but this is not required.  In particular files commonly
51
    do not have a newline at the end of the file.
52
53
    Texts are identified by a version-id string.
54
    """
55
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
56
    def __init__(self, access_mode):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
57
        self.finished = False
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
58
        self._access_mode = access_mode
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
59
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
60
    @staticmethod
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
61
    def check_not_reserved_id(version_id):
62
        revision.check_not_reserved_id(version_id)
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
63
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
64
    def copy_to(self, name, transport):
65
        """Copy this versioned file to name on transport."""
66
        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
67
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
68
    def versions(self):
69
        """Return a unsorted list of versions."""
70
        raise NotImplementedError(self.versions)
71
1594.2.8 by Robert Collins
add ghost aware apis to knits.
72
    def has_ghost(self, version_id):
73
        """Returns whether version is present as a ghost."""
74
        raise NotImplementedError(self.has_ghost)
75
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
76
    def has_version(self, version_id):
77
        """Returns whether version is present."""
78
        raise NotImplementedError(self.has_version)
79
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
80
    def add_lines(self, version_id, parents, lines, parent_texts=None,
2805.6.7 by Robert Collins
Review feedback.
81
        left_matching_blocks=None, nostore_sha=None, random_id=False,
82
        check_content=True):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
83
        """Add a single text on top of the versioned file.
84
85
        Must raise RevisionAlreadyPresent if the new version is
86
        already present in file history.
87
88
        Must raise RevisionNotPresent if any of the given parents are
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
89
        not present in file history.
2805.6.3 by Robert Collins
* The ``VersionedFile`` interface no longer protects against misuse when
90
91
        :param lines: A list of lines. Each line must be a bytestring. And all
92
            of them except the last must be terminated with \n and contain no
93
            other \n's. The last line may either contain no \n's or a single
94
            terminated \n. If the lines list does meet this constraint the add
95
            routine may error or may succeed - but you will be unable to read
96
            the data back accurately. (Checking the lines have been split
2805.6.7 by Robert Collins
Review feedback.
97
            correctly is expensive and extremely unlikely to catch bugs so it
98
            is not done at runtime unless check_content is True.)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
99
        :param parent_texts: An optional dictionary containing the opaque 
2805.6.3 by Robert Collins
* The ``VersionedFile`` interface no longer protects against misuse when
100
            representations of some or all of the parents of version_id to
101
            allow delta optimisations.  VERY IMPORTANT: the texts must be those
102
            returned by add_lines or data corruption can be caused.
2520.4.148 by Aaron Bentley
Updates from review
103
        :param left_matching_blocks: a hint about which areas are common
104
            between the text and its left-hand-parent.  The format is
105
            the SequenceMatcher.get_matching_blocks format.
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
106
        :param nostore_sha: Raise ExistingContent and do not add the lines to
107
            the versioned file if the digest of the lines matches this.
2805.6.4 by Robert Collins
Don't check for existing versions when adding texts with random revision ids.
108
        :param random_id: If True a random id has been selected rather than
109
            an id determined by some deterministic process such as a converter
110
            from a foreign VCS. When True the backend may choose not to check
111
            for uniqueness of the resulting key within the versioned file, so
112
            this should only be done when the result is expected to be unique
113
            anyway.
2805.6.7 by Robert Collins
Review feedback.
114
        :param check_content: If True, the lines supplied are verified to be
115
            bytestrings that are correctly formed lines.
2776.1.1 by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
116
        :return: The text sha1, the number of bytes in the text, and an opaque
117
                 representation of the inserted version which can be provided
118
                 back to future add_lines calls in the parent_texts dictionary.
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
119
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
120
        version_id = osutils.safe_revision_id(version_id)
121
        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.
122
        self._check_write_ok()
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
123
        return self._add_lines(version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
124
            left_matching_blocks, nostore_sha, random_id, check_content)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
125
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
126
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
127
        left_matching_blocks, nostore_sha, random_id, check_content):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
128
        """Helper to do the class specific add_lines."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
129
        raise NotImplementedError(self.add_lines)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
130
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
131
    def add_lines_with_ghosts(self, version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
132
        parent_texts=None, nostore_sha=None, random_id=False,
133
        check_content=True):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
134
        """Add lines to the versioned file, allowing ghosts to be present.
135
        
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
136
        This takes the same parameters as add_lines and returns the same.
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
137
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
138
        version_id = osutils.safe_revision_id(version_id)
139
        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.
140
        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.
141
        return self._add_lines_with_ghosts(version_id, parents, lines,
2805.6.7 by Robert Collins
Review feedback.
142
            parent_texts, nostore_sha, random_id, check_content)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
143
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
144
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
145
        nostore_sha, random_id, check_content):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
146
        """Helper to do class specific add_lines_with_ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
147
        raise NotImplementedError(self.add_lines_with_ghosts)
148
1563.2.19 by Robert Collins
stub out a check for knits.
149
    def check(self, progress_bar=None):
150
        """Check the versioned file for integrity."""
151
        raise NotImplementedError(self.check)
152
1666.1.6 by Robert Collins
Make knit the default format.
153
    def _check_lines_not_unicode(self, lines):
154
        """Check that lines being added to a versioned file are not unicode."""
155
        for line in lines:
156
            if line.__class__ is not str:
157
                raise errors.BzrBadParameterUnicode("lines")
158
159
    def _check_lines_are_lines(self, lines):
160
        """Check that the lines really are full lines without inline EOL."""
161
        for line in lines:
162
            if '\n' in line[:-1]:
163
                raise errors.BzrBadParameterContainsNewline("lines")
164
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
165
    def _check_write_ok(self):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
166
        """Is the versioned file marked as 'finished' ? Raise if it is."""
167
        if self.finished:
168
            raise errors.OutSideTransaction()
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
169
        if self._access_mode != 'w':
170
            raise errors.ReadOnlyObjectDirtiedError(self)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
171
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
172
    def enable_cache(self):
173
        """Tell this versioned file that it should cache any data it reads.
174
        
175
        This is advisory, implementations do not have to support caching.
176
        """
177
        pass
178
    
1563.2.7 by Robert Collins
add versioned file clear_cache entry.
179
    def clear_cache(self):
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
180
        """Remove any data cached in the versioned file object.
181
182
        This only needs to be supported if caches are supported
183
        """
184
        pass
1563.2.7 by Robert Collins
add versioned file clear_cache entry.
185
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
186
    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.
187
        """Add an identical text to old_version_id as new_version_id.
188
189
        Must raise RevisionNotPresent if the old version or any of the
190
        parents are not present in file history.
191
192
        Must raise RevisionAlreadyPresent if the new version is
193
        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
194
        new_version_id = osutils.safe_revision_id(new_version_id)
195
        old_version_id = osutils.safe_revision_id(old_version_id)
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
196
        parents = [osutils.safe_revision_id(v) for v in parents]
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
197
        self._check_write_ok()
198
        return self._clone_text(new_version_id, old_version_id, parents)
199
200
    def _clone_text(self, new_version_id, old_version_id, parents):
201
        """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.
202
        raise NotImplementedError(self.clone_text)
203
1563.2.13 by Robert Collins
InterVersionedFile implemented.
204
    def create_empty(self, name, transport, mode=None):
205
        """Create a new versioned file of this exact type.
206
207
        :param name: the file name
208
        :param transport: the transport
209
        :param mode: optional file mode.
210
        """
211
        raise NotImplementedError(self.create_empty)
212
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
213
    def fix_parents(self, version_id, new_parents):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
214
        """Fix the parents list for version.
215
        
216
        This is done by appending a new version to the index
217
        with identical data except for the parents list.
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
218
        The parents list must be a superset of the current
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
219
        list.
220
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
221
        version_id = osutils.safe_revision_id(version_id)
222
        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.
223
        self._check_write_ok()
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
224
        return self._fix_parents(version_id, new_parents)
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
225
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
226
    def _fix_parents(self, version_id, new_parents):
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
227
        """Helper for fix_parents."""
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
228
        raise NotImplementedError(self.fix_parents)
229
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
230
    def get_format_signature(self):
231
        """Get a text description of the data encoding in this file.
232
        
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
233
        :since: 0.90
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
234
        """
235
        raise NotImplementedError(self.get_format_signature)
236
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
237
    def make_mpdiffs(self, version_ids):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
238
        """Create multiparent diffs for specified versions."""
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
239
        knit_versions = set()
240
        for version_id in version_ids:
241
            knit_versions.add(version_id)
242
            knit_versions.update(self.get_parents(version_id))
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
243
        lines = dict(zip(knit_versions,
244
            self._get_lf_split_line_list(knit_versions)))
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
245
        diffs = []
246
        for version_id in version_ids:
247
            target = lines[version_id]
248
            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
249
            if len(parents) > 0:
250
                left_parent_blocks = self._extract_blocks(version_id,
251
                                                          parents[0], target)
252
            else:
253
                left_parent_blocks = None
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
254
            diffs.append(multiparent.MultiParent.from_lines(target, parents,
255
                         left_parent_blocks))
256
        return diffs
257
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
258
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
259
        return None
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
260
2520.4.61 by Aaron Bentley
Do bulk insertion of records
261
    def add_mpdiffs(self, records):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
262
        """Add mpdiffs to this VersionedFile.
2520.4.126 by Aaron Bentley
Add more docs
263
264
        Records should be iterables of version, parents, expected_sha1,
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
265
        mpdiff. mpdiff should be a MultiParent instance.
2520.4.126 by Aaron Bentley
Add more docs
266
        """
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
267
        # Does this need to call self._check_write_ok()? (IanC 20070919)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
268
        vf_parents = {}
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
269
        mpvf = multiparent.MultiMemoryVersionedFile()
270
        versions = []
271
        for version, parent_ids, expected_sha1, mpdiff in records:
272
            versions.append(version)
273
            mpvf.add_diff(mpdiff, version, parent_ids)
274
        needed_parents = set()
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
275
        for version, parent_ids, expected_sha1, mpdiff in records:
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
276
            needed_parents.update(p for p in parent_ids
277
                                  if not mpvf.has_version(p))
278
        for parent_id, lines in zip(needed_parents,
279
                                 self._get_lf_split_line_list(needed_parents)):
280
            mpvf.add_version(lines, parent_id, [])
281
        for (version, parent_ids, expected_sha1, mpdiff), lines in\
282
            zip(records, mpvf.get_line_list(versions)):
283
            if len(parent_ids) == 1:
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
284
                left_matching_blocks = list(mpdiff.get_matching_blocks(0,
2520.4.141 by Aaron Bentley
More batch operations adding mpdiffs
285
                    mpvf.get_diff(parent_ids[0]).num_lines()))
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
286
            else:
287
                left_matching_blocks = None
2776.1.3 by Robert Collins
Missed bundles in the return value conversion of vf.add_lines.
288
            _, _, version_text = self.add_lines(version, parent_ids, lines,
2520.4.151 by Aaron Bentley
Style fixes from review
289
                vf_parents, left_matching_blocks=left_matching_blocks)
2520.4.61 by Aaron Bentley
Do bulk insertion of records
290
            vf_parents[version] = version_text
2520.4.142 by Aaron Bentley
Clean up installation of inventory records
291
        for (version, parent_ids, expected_sha1, mpdiff), sha1 in\
292
             zip(records, self.get_sha1s(versions)):
293
            if expected_sha1 != sha1:
2520.4.71 by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
294
                raise errors.VersionedFileInvalidChecksum(version)
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
295
1666.1.6 by Robert Collins
Make knit the default format.
296
    def get_sha1(self, version_id):
297
        """Get the stored sha1 sum for the given revision.
298
        
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
299
        :param version_id: The name of the version to lookup
1666.1.6 by Robert Collins
Make knit the default format.
300
        """
301
        raise NotImplementedError(self.get_sha1)
302
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
303
    def get_sha1s(self, version_ids):
304
        """Get the stored sha1 sums for the given revisions.
305
306
        :param version_ids: The names of the versions to lookup
307
        :return: a list of sha1s in order according to the version_ids
308
        """
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
309
        raise NotImplementedError(self.get_sha1s)
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
310
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
311
    def get_suffixes(self):
312
        """Return the file suffixes associated with this versioned file."""
313
        raise NotImplementedError(self.get_suffixes)
314
    
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
315
    def get_text(self, version_id):
316
        """Return version contents as a text string.
317
318
        Raises RevisionNotPresent if version is not present in
319
        file history.
320
        """
321
        return ''.join(self.get_lines(version_id))
322
    get_string = get_text
323
1756.2.1 by Aaron Bentley
Implement get_texts
324
    def get_texts(self, version_ids):
325
        """Return the texts of listed versions as a list of strings.
326
327
        Raises RevisionNotPresent if version is not present in
328
        file history.
329
        """
330
        return [''.join(self.get_lines(v)) for v in version_ids]
331
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
332
    def get_lines(self, version_id):
333
        """Return version contents as a sequence of lines.
334
335
        Raises RevisionNotPresent if version is not present in
336
        file history.
337
        """
338
        raise NotImplementedError(self.get_lines)
339
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
340
    def _get_lf_split_line_list(self, version_ids):
341
        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
342
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
343
    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.
344
        """Return a list of all ancestors of given version(s). This
345
        will not include the null revision.
346
2490.2.32 by Aaron Bentley
Merge of not-sorting-ancestry branch
347
        This list will not be topologically sorted if topo_sorted=False is
348
        passed.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
349
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
350
        Must raise RevisionNotPresent if any of the given versions are
351
        not present in file history."""
352
        if isinstance(version_ids, basestring):
353
            version_ids = [version_ids]
354
        raise NotImplementedError(self.get_ancestry)
355
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
356
    def get_ancestry_with_ghosts(self, version_ids):
357
        """Return a list of all ancestors of given version(s). This
358
        will not include the null revision.
359
360
        Must raise RevisionNotPresent if any of the given versions are
361
        not present in file history.
362
        
363
        Ghosts that are known about will be included in ancestry list,
364
        but are not explicitly marked.
365
        """
366
        raise NotImplementedError(self.get_ancestry_with_ghosts)
367
        
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
368
    def get_graph(self, version_ids=None):
369
        """Return a graph from the versioned file. 
1594.2.8 by Robert Collins
add ghost aware apis to knits.
370
        
371
        Ghosts are not listed or referenced in the graph.
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
372
        :param version_ids: Versions to select.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
373
                            None means retrieve all versions.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
374
        """
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
375
        if version_ids is None:
376
            return dict(self.iter_parents(self.versions()))
1563.2.13 by Robert Collins
InterVersionedFile implemented.
377
        result = {}
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
378
        pending = set(osutils.safe_revision_id(v) for v in version_ids)
379
        while pending:
380
            this_iteration = pending
381
            pending = set()
382
            for version, parents in self.iter_parents(this_iteration):
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
383
                result[version] = parents
2652.1.1 by John Arbash Meinel
Avoid set.difference_update(other) because it is slow when other is big.
384
                for parent in parents:
385
                    if parent in result:
386
                        continue
387
                    pending.add(parent)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
388
        return result
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
389
1594.2.8 by Robert Collins
add ghost aware apis to knits.
390
    def get_graph_with_ghosts(self):
391
        """Return a graph for the entire versioned file.
392
        
393
        Ghosts are referenced in parents list but are not
394
        explicitly listed.
395
        """
396
        raise NotImplementedError(self.get_graph_with_ghosts)
397
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
398
    def get_parents(self, version_id):
399
        """Return version names for parents of a version.
400
401
        Must raise RevisionNotPresent if version is not present in
402
        file history.
403
        """
404
        raise NotImplementedError(self.get_parents)
405
1594.2.8 by Robert Collins
add ghost aware apis to knits.
406
    def get_parents_with_ghosts(self, version_id):
407
        """Return version names for parents of version_id.
408
409
        Will raise RevisionNotPresent if version_id is not present
410
        in the history.
411
412
        Ghosts that are known about will be included in the parent list,
413
        but are not explicitly marked.
414
        """
415
        raise NotImplementedError(self.get_parents_with_ghosts)
416
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
417
    def annotate_iter(self, version_id):
418
        """Yield list of (version-id, line) pairs for the specified
419
        version.
420
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
421
        Must raise RevisionNotPresent if the given version is
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
422
        not present in file history.
423
        """
424
        raise NotImplementedError(self.annotate_iter)
425
426
    def annotate(self, version_id):
427
        return list(self.annotate_iter(version_id))
428
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
429
    def join(self, other, pb=None, msg=None, version_ids=None,
430
             ignore_missing=False):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
431
        """Integrate versions from other into this versioned file.
432
433
        If version_ids is None all versions from other should be
434
        incorporated into this versioned file.
435
436
        Must raise RevisionNotPresent if any of the specified versions
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
437
        are not present in the other file's history unless ignore_missing
438
        is supplied in which case they are silently skipped.
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
439
        """
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
440
        self._check_write_ok()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
441
        return InterVersionedFile.get(other, self).join(
442
            pb,
443
            msg,
444
            version_ids,
445
            ignore_missing)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
446
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
447
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
448
                                                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.
449
        """Iterate over the lines in the versioned file from version_ids.
450
451
        This may return lines from other versions, and does not return the
452
        specific version marker at this point. The api may be changed
453
        during development to include the version that the versioned file
454
        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.
455
        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.
456
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
457
        If a progress bar is supplied, it may be used to indicate progress.
458
        The caller is responsible for cleaning up progress bars (because this
459
        is an iterator).
460
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
461
        NOTES: Lines are normalised: they will all have \n terminators.
462
               Lines are returned in arbitrary order.
463
        """
464
        raise NotImplementedError(self.iter_lines_added_or_present_in_versions)
465
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
466
    def iter_parents(self, version_ids):
467
        """Iterate through the parents for many version ids.
468
469
        :param version_ids: An iterable yielding version_ids.
470
        :return: An iterator that yields (version_id, parents). Requested 
471
            version_ids not present in the versioned file are simply skipped.
472
            The order is undefined, allowing for different optimisations in
473
            the underlying implementation.
474
        """
475
        for version_id in version_ids:
476
            try:
477
                yield version_id, tuple(self.get_parents(version_id))
478
            except errors.RevisionNotPresent:
479
                pass
480
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
481
    def transaction_finished(self):
482
        """The transaction that this file was opened in has finished.
483
484
        This records self.finished = True and should cause all mutating
485
        operations to error.
486
        """
487
        self.finished = True
488
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
489
    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.
490
        """Return pseudo-annotation indicating how the two versions merge.
491
492
        This is computed between versions a and b and their common
493
        base.
494
495
        Weave lines present in none of them are skipped entirely.
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
496
497
        Legend:
498
        killed-base Dead in base revision
499
        killed-both Killed in each revision
500
        killed-a    Killed in a
501
        killed-b    Killed in b
502
        unchanged   Alive in both a and b (possibly created in both)
503
        new-a       Created in a
504
        new-b       Created in b
1664.2.5 by Aaron Bentley
Update plan-merge legend
505
        ghost-a     Killed in a, unborn in b    
506
        ghost-b     Killed in b, unborn in a
1664.2.2 by Aaron Bentley
Added legend for plan-merge output
507
        irrelevant  Not in either revision
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
508
        """
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
509
        raise NotImplementedError(VersionedFile.plan_merge)
510
        
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
511
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,
1551.6.14 by Aaron Bentley
Tweaks from merge review
512
                    b_marker=TextMerge.B_MARKER):
1551.6.12 by Aaron Bentley
Indicate conflicts from merge_lines, insead of guessing
513
        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
514
1664.2.7 by Aaron Bentley
Merge bzr.dev
515
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
516
class PlanWeaveMerge(TextMerge):
1551.6.13 by Aaron Bentley
Cleanup
517
    """Weave merge that takes a plan as its input.
518
    
1551.6.14 by Aaron Bentley
Tweaks from merge review
519
    This exists so that VersionedFile.plan_merge is implementable.
520
    Most callers will want to use WeaveMerge instead.
1551.6.13 by Aaron Bentley
Cleanup
521
    """
522
1551.6.14 by Aaron Bentley
Tweaks from merge review
523
    def __init__(self, plan, a_marker=TextMerge.A_MARKER,
524
                 b_marker=TextMerge.B_MARKER):
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
525
        TextMerge.__init__(self, a_marker, b_marker)
526
        self.plan = plan
527
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
528
    def _merge_struct(self):
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
529
        lines_a = []
530
        lines_b = []
531
        ch_a = ch_b = False
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
532
533
        def outstanding_struct():
534
            if not lines_a and not lines_b:
535
                return
536
            elif ch_a and not ch_b:
537
                # one-sided change:
538
                yield(lines_a,)
539
            elif ch_b and not ch_a:
540
                yield (lines_b,)
541
            elif lines_a == lines_b:
542
                yield(lines_a,)
543
            else:
544
                yield (lines_a, lines_b)
1551.6.13 by Aaron Bentley
Cleanup
545
       
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
546
        # We previously considered either 'unchanged' or 'killed-both' lines
547
        # to be possible places to resynchronize.  However, assuming agreement
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
548
        # on killed-both lines may be too aggressive. -- mbp 20060324
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
549
        for state, line in self.plan:
1616.1.18 by Martin Pool
(weave-merge) don't treat killed-both lines as points of agreement;
550
            if state == 'unchanged':
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
551
                # resync and flush queued conflicts changes if any
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
552
                for struct in outstanding_struct():
553
                    yield struct
1551.6.11 by Aaron Bentley
Switched TextMerge_lines to work on a list
554
                lines_a = []
555
                lines_b = []
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
556
                ch_a = ch_b = False
557
                
558
            if state == 'unchanged':
559
                if line:
1551.6.5 by Aaron Bentley
Got weave merge producing structural output
560
                    yield ([line],)
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
561
            elif state == 'killed-a':
562
                ch_a = True
563
                lines_b.append(line)
564
            elif state == 'killed-b':
565
                ch_b = True
566
                lines_a.append(line)
567
            elif state == 'new-a':
568
                ch_a = True
569
                lines_a.append(line)
570
            elif state == 'new-b':
571
                ch_b = True
572
                lines_b.append(line)
573
            else:
1551.6.6 by Aaron Bentley
Cleanup
574
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 
575
                                 'killed-base', 'killed-both'), state
1664.2.8 by Aaron Bentley
Fix WeaveMerge when plan doesn't end with unchanged lines
576
        for struct in outstanding_struct():
577
            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.
578
1664.2.14 by Aaron Bentley
spacing fix
579
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
580
class WeaveMerge(PlanWeaveMerge):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
581
    """Weave merge that takes a VersionedFile and two versions as its input."""
1551.6.13 by Aaron Bentley
Cleanup
582
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
583
    def __init__(self, versionedfile, ver_a, ver_b, 
1551.6.14 by Aaron Bentley
Tweaks from merge review
584
        a_marker=PlanWeaveMerge.A_MARKER, b_marker=PlanWeaveMerge.B_MARKER):
1551.6.15 by Aaron Bentley
Moved plan_merge into Weave
585
        plan = versionedfile.plan_merge(ver_a, ver_b)
1551.6.10 by Aaron Bentley
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
586
        PlanWeaveMerge.__init__(self, plan, a_marker, b_marker)
587
588
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.
589
class InterVersionedFile(InterObject):
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
590
    """This class represents operations taking place between two VersionedFiles.
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.
591
592
    Its instances have methods like join, and contain
593
    references to the source and target versionedfiles these operations can be 
594
    carried out on.
595
596
    Often we will provide convenience methods on 'versionedfile' which carry out
597
    operations with another versionedfile - they will always forward to
598
    InterVersionedFile.get(other).method_name(parameters).
599
    """
600
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
601
    _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.
602
    """The available optimised InterVersionedFile types."""
603
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
604
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
605
        """Integrate versions from self.source into self.target.
606
607
        If version_ids is None all versions from source should be
608
        incorporated into this versioned file.
609
610
        Must raise RevisionNotPresent if any of the specified versions
2831.7.1 by Ian Clatworthy
versionedfile.py code cleanups
611
        are not present in the other file's history unless ignore_missing is 
612
        supplied in which case they are silently skipped.
1563.2.13 by Robert Collins
InterVersionedFile implemented.
613
        """
614
        # the default join: 
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
615
        # - if the target is empty, just add all the versions from 
616
        #   source to target, otherwise:
1563.2.13 by Robert Collins
InterVersionedFile implemented.
617
        # - make a temporary versioned file of type target
618
        # - insert the source content into it one at a time
619
        # - join them
1594.2.11 by Robert Collins
Setup fast-code paths for copying into empty weaves and weave->empty knit.
620
        if not self.target.versions():
621
            target = self.target
622
        else:
623
            # Make a new target-format versioned file. 
624
            temp_source = self.target.create_empty("temp", MemoryTransport())
625
            target = temp_source
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
626
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1684.3.1 by Robert Collins
Fix versioned file joins with empty targets.
627
        graph = self.source.get_graph(version_ids)
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
628
        order = tsort.topo_sort(graph.items())
1563.2.37 by Robert Collins
Merge in nested progress bars
629
        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.
630
        parent_texts = {}
1563.2.37 by Robert Collins
Merge in nested progress bars
631
        try:
1596.2.28 by Robert Collins
more knit profile based tuning.
632
            # TODO for incremental cross-format work:
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
633
            # make a versioned file with the following content:
634
            # all revisions we have been asked to join
635
            # all their ancestors that are *not* in target already.
636
            # the immediate parents of the above two sets, with 
637
            # empty parent lists - these versions are in target already
638
            # and the incorrect version data will be ignored.
639
            # TODO: for all ancestors that are present in target already,
640
            # 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.
641
            # 
642
            # TODO: remove parent texts when they are not relevant any more for 
643
            # memory pressure reduction. RBC 20060313
644
            # pb.update('Converting versioned data', 0, len(order))
1563.2.37 by Robert Collins
Merge in nested progress bars
645
            for index, version in enumerate(order):
646
                pb.update('Converting versioned data', index, len(order))
2776.1.3 by Robert Collins
Missed bundles in the return value conversion of vf.add_lines.
647
                _, _, parent_text = target.add_lines(version,
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
648
                                               self.source.get_parents(version),
649
                                               self.source.get_lines(version),
650
                                               parent_texts=parent_texts)
651
                parent_texts[version] = parent_text
1563.2.37 by Robert Collins
Merge in nested progress bars
652
            
653
            # 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.
654
            if target is not self.target:
655
                return self.target.join(temp_source,
656
                                        pb,
657
                                        msg,
658
                                        version_ids,
659
                                        ignore_missing)
1563.2.37 by Robert Collins
Merge in nested progress bars
660
        finally:
661
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
662
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
663
    def _get_source_version_ids(self, version_ids, ignore_missing):
664
        """Determine the version ids to be used from self.source.
665
666
        :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.
667
                            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.
668
        :param ignore_missing: if True, remove missing ids from the version 
669
                               list. If False, raise RevisionNotPresent on
670
                               a missing version id.
671
        :return: A set of version ids.
672
        """
673
        if version_ids is None:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
674
            # None cannot be in source.versions
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
675
            return set(self.source.versions())
676
        else:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
677
            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.
678
            if ignore_missing:
679
                return set(self.source.versions()).intersection(set(version_ids))
680
            else:
681
                new_version_ids = set()
682
                for version in version_ids:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
683
                    if version is None:
684
                        continue
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
685
                    if not self.source.has_version(version):
686
                        raise errors.RevisionNotPresent(version, str(self.source))
687
                    else:
688
                        new_version_ids.add(version)
689
                return new_version_ids