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