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