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