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