~bzr-pqm/bzr/bzr.dev

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