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(), """  | 
|
| 
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.  | 
24  | 
from copy import deepcopy
 | 
| 
1996.3.7
by John Arbash Meinel
 lazy import versionedfile, late-load bzrlib.merge  | 
25  | 
import unittest
 | 
26  | 
||
27  | 
from bzrlib import (
 | 
|
28  | 
    errors,
 | 
|
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  | 
||
| 
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.  | 
36  | 
from bzrlib.inter import InterObject  | 
| 
1551.6.7
by Aaron Bentley
 Implemented two-way merge, refactored weave merge  | 
37  | 
from bzrlib.textmerge import TextMerge  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
38  | 
from bzrlib.symbol_versioning import (deprecated_function,  | 
39  | 
deprecated_method,  | 
|
40  | 
zero_eight,  | 
|
41  | 
        )
 | 
|
| 
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.  | 
42  | 
|
43  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
44  | 
class VersionedFile(object):  | 
45  | 
"""Versioned text file storage.  | 
|
46  | 
    
 | 
|
47  | 
    A versioned file manages versions of line-based text files,
 | 
|
48  | 
    keeping track of the originating version for each line.
 | 
|
49  | 
||
50  | 
    To clients the "lines" of the file are represented as a list of
 | 
|
51  | 
    strings. These strings will typically have terminal newline
 | 
|
52  | 
    characters, but this is not required.  In particular files commonly
 | 
|
53  | 
    do not have a newline at the end of the file.
 | 
|
54  | 
||
55  | 
    Texts are identified by a version-id string.
 | 
|
56  | 
    """
 | 
|
57  | 
||
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
58  | 
def __init__(self, access_mode):  | 
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
59  | 
self.finished = False  | 
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
60  | 
self._access_mode = access_mode  | 
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
61  | 
|
| 
2229.2.1
by Aaron Bentley
 Reject reserved ids in versiondfile, tree, branch and repository  | 
62  | 
    @staticmethod
 | 
| 
2229.2.3
by Aaron Bentley
 change reserved_id to is_reserved_id, add check_not_reserved for DRY  | 
63  | 
def check_not_reserved_id(version_id):  | 
64  | 
revision.check_not_reserved_id(version_id)  | 
|
| 
2229.2.1
by Aaron Bentley
 Reject reserved ids in versiondfile, tree, branch and repository  | 
65  | 
|
| 
1563.2.15
by Robert Collins
 remove the weavestore assumptions about the number and nature of files it manages.  | 
66  | 
def copy_to(self, name, transport):  | 
67  | 
"""Copy this versioned file to name on transport."""  | 
|
68  | 
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  | 
69  | 
|
| 
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.  | 
70  | 
@deprecated_method(zero_eight)  | 
71  | 
def names(self):  | 
|
72  | 
"""Return a list of all the versions in this versioned file.  | 
|
73  | 
||
74  | 
        Please use versionedfile.versions() now.
 | 
|
75  | 
        """
 | 
|
76  | 
return self.versions()  | 
|
77  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
78  | 
def versions(self):  | 
79  | 
"""Return a unsorted list of versions."""  | 
|
80  | 
raise NotImplementedError(self.versions)  | 
|
81  | 
||
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
82  | 
def has_ghost(self, version_id):  | 
83  | 
"""Returns whether version is present as a ghost."""  | 
|
84  | 
raise NotImplementedError(self.has_ghost)  | 
|
85  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
86  | 
def has_version(self, version_id):  | 
87  | 
"""Returns whether version is present."""  | 
|
88  | 
raise NotImplementedError(self.has_version)  | 
|
89  | 
||
| 
1596.2.37
by Robert Collins
 Switch to delta based content copying in the generic versioned file copier.  | 
90  | 
def add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):  | 
91  | 
"""Add a text to the versioned file via a pregenerated delta.  | 
|
92  | 
||
93  | 
        :param version_id: The version id being added.
 | 
|
94  | 
        :param parents: The parents of the version_id.
 | 
|
95  | 
        :param delta_parent: The parent this delta was created against.
 | 
|
96  | 
        :param sha1: The sha1 of the full text.
 | 
|
97  | 
        :param delta: The delta instructions. See get_delta for details.
 | 
|
98  | 
        """
 | 
|
99  | 
self._check_write_ok()  | 
|
100  | 
if self.has_version(version_id):  | 
|
101  | 
raise errors.RevisionAlreadyPresent(version_id, self)  | 
|
102  | 
return self._add_delta(version_id, parents, delta_parent, sha1, noeol, delta)  | 
|
103  | 
||
104  | 
def _add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):  | 
|
105  | 
"""Class specific routine to add a delta.  | 
|
106  | 
||
107  | 
        This generic version simply applies the delta to the delta_parent and
 | 
|
108  | 
        then inserts it.
 | 
|
109  | 
        """
 | 
|
110  | 
        # strip annotation from delta
 | 
|
111  | 
new_delta = []  | 
|
112  | 
for start, stop, delta_len, delta_lines in delta:  | 
|
113  | 
new_delta.append((start, stop, delta_len, [text for origin, text in delta_lines]))  | 
|
114  | 
if delta_parent is not None:  | 
|
115  | 
parent_full = self.get_lines(delta_parent)  | 
|
116  | 
else:  | 
|
117  | 
parent_full = []  | 
|
118  | 
new_full = self._apply_delta(parent_full, new_delta)  | 
|
119  | 
        # its impossible to have noeol on an empty file
 | 
|
120  | 
if noeol and new_full[-1][-1] == '\n':  | 
|
121  | 
new_full[-1] = new_full[-1][:-1]  | 
|
122  | 
self.add_lines(version_id, parents, new_full)  | 
|
123  | 
||
| 
1596.2.32
by Robert Collins
 Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.  | 
124  | 
def add_lines(self, version_id, parents, lines, parent_texts=None):  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
125  | 
"""Add a single text on top of the versioned file.  | 
126  | 
||
127  | 
        Must raise RevisionAlreadyPresent if the new version is
 | 
|
128  | 
        already present in file history.
 | 
|
129  | 
||
130  | 
        Must raise RevisionNotPresent if any of the given parents are
 | 
|
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
131  | 
        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.  | 
132  | 
        :param parent_texts: An optional dictionary containing the opaque 
 | 
| 
1616.1.1
by Martin Pool
 [merge] robertc  | 
133  | 
             representations of some or all of the parents of 
 | 
134  | 
             version_id to allow delta optimisations. 
 | 
|
135  | 
             VERY IMPORTANT: the texts must be those returned
 | 
|
136  | 
             by add_lines or data corruption can be caused.
 | 
|
| 
1596.2.32
by Robert Collins
 Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.  | 
137  | 
        :return: An opaque representation of the inserted version which can be
 | 
138  | 
                 provided back to future add_lines calls in the parent_texts
 | 
|
139  | 
                 dictionary.
 | 
|
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
140  | 
        """
 | 
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
141  | 
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.  | 
142  | 
return self._add_lines(version_id, parents, lines, parent_texts)  | 
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
143  | 
|
| 
1596.2.32
by Robert Collins
 Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.  | 
144  | 
def _add_lines(self, version_id, parents, lines, parent_texts):  | 
| 
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  | 
        """
 | 
|
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
154  | 
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.  | 
155  | 
return self._add_lines_with_ghosts(version_id, parents, lines,  | 
156  | 
parent_texts)  | 
|
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
157  | 
|
| 
1596.2.32
by Robert Collins
 Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.  | 
158  | 
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.  | 
159  | 
"""Helper to do class specific add_lines_with_ghosts."""  | 
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
160  | 
raise NotImplementedError(self.add_lines_with_ghosts)  | 
161  | 
||
| 
1563.2.19
by Robert Collins
 stub out a check for knits.  | 
162  | 
def check(self, progress_bar=None):  | 
163  | 
"""Check the versioned file for integrity."""  | 
|
164  | 
raise NotImplementedError(self.check)  | 
|
165  | 
||
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
166  | 
def _check_lines_not_unicode(self, lines):  | 
167  | 
"""Check that lines being added to a versioned file are not unicode."""  | 
|
168  | 
for line in lines:  | 
|
169  | 
if line.__class__ is not str:  | 
|
170  | 
raise errors.BzrBadParameterUnicode("lines")  | 
|
171  | 
||
172  | 
def _check_lines_are_lines(self, lines):  | 
|
173  | 
"""Check that the lines really are full lines without inline EOL."""  | 
|
174  | 
for line in lines:  | 
|
175  | 
if '\n' in line[:-1]:  | 
|
176  | 
raise errors.BzrBadParameterContainsNewline("lines")  | 
|
177  | 
||
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
178  | 
def _check_write_ok(self):  | 
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
179  | 
"""Is the versioned file marked as 'finished' ? Raise if it is."""  | 
180  | 
if self.finished:  | 
|
181  | 
raise errors.OutSideTransaction()  | 
|
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
182  | 
if self._access_mode != 'w':  | 
183  | 
raise errors.ReadOnlyObjectDirtiedError(self)  | 
|
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
184  | 
|
| 
1863.1.1
by John Arbash Meinel
 Allow Versioned files to do caching if explicitly asked, and implement for Knit  | 
185  | 
def enable_cache(self):  | 
186  | 
"""Tell this versioned file that it should cache any data it reads.  | 
|
187  | 
        
 | 
|
188  | 
        This is advisory, implementations do not have to support caching.
 | 
|
189  | 
        """
 | 
|
190  | 
        pass
 | 
|
191  | 
||
| 
1563.2.7
by Robert Collins
 add versioned file clear_cache entry.  | 
192  | 
def clear_cache(self):  | 
| 
1863.1.1
by John Arbash Meinel
 Allow Versioned files to do caching if explicitly asked, and implement for Knit  | 
193  | 
"""Remove any data cached in the versioned file object.  | 
194  | 
||
195  | 
        This only needs to be supported if caches are supported
 | 
|
196  | 
        """
 | 
|
197  | 
        pass
 | 
|
| 
1563.2.7
by Robert Collins
 add versioned file clear_cache entry.  | 
198  | 
|
| 
1563.2.5
by Robert Collins
 Remove unused transaction references from knit.py and the versionedfile interface.  | 
199  | 
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.  | 
200  | 
"""Add an identical text to old_version_id as new_version_id.  | 
201  | 
||
202  | 
        Must raise RevisionNotPresent if the old version or any of the
 | 
|
203  | 
        parents are not present in file history.
 | 
|
204  | 
||
205  | 
        Must raise RevisionAlreadyPresent if the new version is
 | 
|
206  | 
        already present in file history."""
 | 
|
| 
1594.2.24
by Robert Collins
 Make use of the transaction finalisation warning support to implement in-knit caching.  | 
207  | 
self._check_write_ok()  | 
208  | 
return self._clone_text(new_version_id, old_version_id, parents)  | 
|
209  | 
||
210  | 
def _clone_text(self, new_version_id, old_version_id, parents):  | 
|
211  | 
"""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.  | 
212  | 
raise NotImplementedError(self.clone_text)  | 
213  | 
||
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
214  | 
def create_empty(self, name, transport, mode=None):  | 
215  | 
"""Create a new versioned file of this exact type.  | 
|
216  | 
||
217  | 
        :param name: the file name
 | 
|
218  | 
        :param transport: the transport
 | 
|
219  | 
        :param mode: optional file mode.
 | 
|
220  | 
        """
 | 
|
221  | 
raise NotImplementedError(self.create_empty)  | 
|
222  | 
||
| 
1594.2.7
by Robert Collins
 Add versionedfile.fix_parents api for correcting data post hoc.  | 
223  | 
def fix_parents(self, version, new_parents):  | 
224  | 
"""Fix the parents list for version.  | 
|
225  | 
        
 | 
|
226  | 
        This is done by appending a new version to the index
 | 
|
227  | 
        with identical data except for the parents list.
 | 
|
228  | 
        the parents list must be a superset of the current
 | 
|
229  | 
        list.
 | 
|
230  | 
        """
 | 
|
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
231  | 
self._check_write_ok()  | 
| 
1594.2.24
by Robert Collins
 Make use of the transaction finalisation warning support to implement in-knit caching.  | 
232  | 
return self._fix_parents(version, new_parents)  | 
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
233  | 
|
234  | 
def _fix_parents(self, version, new_parents):  | 
|
235  | 
"""Helper for fix_parents."""  | 
|
| 
1594.2.7
by Robert Collins
 Add versionedfile.fix_parents api for correcting data post hoc.  | 
236  | 
raise NotImplementedError(self.fix_parents)  | 
237  | 
||
| 
1596.2.36
by Robert Collins
 add a get_delta api to versioned_file.  | 
238  | 
def get_delta(self, version):  | 
239  | 
"""Get a delta for constructing version from some other version.  | 
|
240  | 
        
 | 
|
| 
1596.2.38
by Robert Collins
 rollback from using deltas to using fulltexts - deltas need more work to be ready.  | 
241  | 
        :return: (delta_parent, sha1, noeol, delta)
 | 
| 
1596.2.36
by Robert Collins
 add a get_delta api to versioned_file.  | 
242  | 
        Where delta_parent is a version id or None to indicate no parent.
 | 
243  | 
        """
 | 
|
244  | 
raise NotImplementedError(self.get_delta)  | 
|
245  | 
||
| 
1596.2.38
by Robert Collins
 rollback from using deltas to using fulltexts - deltas need more work to be ready.  | 
246  | 
def get_deltas(self, versions):  | 
247  | 
"""Get multiple deltas at once for constructing versions.  | 
|
248  | 
        
 | 
|
249  | 
        :return: dict(version_id:(delta_parent, sha1, noeol, delta))
 | 
|
250  | 
        Where delta_parent is a version id or None to indicate no parent, and
 | 
|
251  | 
        version_id is the version_id created by that delta.
 | 
|
252  | 
        """
 | 
|
253  | 
result = {}  | 
|
254  | 
for version in versions:  | 
|
255  | 
result[version] = self.get_delta(version)  | 
|
256  | 
return result  | 
|
257  | 
||
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
258  | 
def get_sha1(self, version_id):  | 
259  | 
"""Get the stored sha1 sum for the given revision.  | 
|
260  | 
        
 | 
|
261  | 
        :param name: The name of the version to lookup
 | 
|
262  | 
        """
 | 
|
263  | 
raise NotImplementedError(self.get_sha1)  | 
|
264  | 
||
| 
1563.2.15
by Robert Collins
 remove the weavestore assumptions about the number and nature of files it manages.  | 
265  | 
def get_suffixes(self):  | 
266  | 
"""Return the file suffixes associated with this versioned file."""  | 
|
267  | 
raise NotImplementedError(self.get_suffixes)  | 
|
268  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
269  | 
def get_text(self, version_id):  | 
270  | 
"""Return version contents as a text string.  | 
|
271  | 
||
272  | 
        Raises RevisionNotPresent if version is not present in
 | 
|
273  | 
        file history.
 | 
|
274  | 
        """
 | 
|
275  | 
return ''.join(self.get_lines(version_id))  | 
|
276  | 
get_string = get_text  | 
|
277  | 
||
| 
1756.2.1
by Aaron Bentley
 Implement get_texts  | 
278  | 
def get_texts(self, version_ids):  | 
279  | 
"""Return the texts of listed versions as a list of strings.  | 
|
280  | 
||
281  | 
        Raises RevisionNotPresent if version is not present in
 | 
|
282  | 
        file history.
 | 
|
283  | 
        """
 | 
|
284  | 
return [''.join(self.get_lines(v)) for v in version_ids]  | 
|
285  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
286  | 
def get_lines(self, version_id):  | 
287  | 
"""Return version contents as a sequence of lines.  | 
|
288  | 
||
289  | 
        Raises RevisionNotPresent if version is not present in
 | 
|
290  | 
        file history.
 | 
|
291  | 
        """
 | 
|
292  | 
raise NotImplementedError(self.get_lines)  | 
|
293  | 
||
294  | 
def get_ancestry(self, version_ids):  | 
|
295  | 
"""Return a list of all ancestors of given version(s). This  | 
|
296  | 
        will not include the null revision.
 | 
|
297  | 
||
298  | 
        Must raise RevisionNotPresent if any of the given versions are
 | 
|
299  | 
        not present in file history."""
 | 
|
300  | 
if isinstance(version_ids, basestring):  | 
|
301  | 
version_ids = [version_ids]  | 
|
302  | 
raise NotImplementedError(self.get_ancestry)  | 
|
303  | 
||
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
304  | 
def get_ancestry_with_ghosts(self, version_ids):  | 
305  | 
"""Return a list of all ancestors of given version(s). This  | 
|
306  | 
        will not include the null revision.
 | 
|
307  | 
||
308  | 
        Must raise RevisionNotPresent if any of the given versions are
 | 
|
309  | 
        not present in file history.
 | 
|
310  | 
        
 | 
|
311  | 
        Ghosts that are known about will be included in ancestry list,
 | 
|
312  | 
        but are not explicitly marked.
 | 
|
313  | 
        """
 | 
|
314  | 
raise NotImplementedError(self.get_ancestry_with_ghosts)  | 
|
315  | 
||
| 
1684.3.1
by Robert Collins
 Fix versioned file joins with empty targets.  | 
316  | 
def get_graph(self, version_ids=None):  | 
317  | 
"""Return a graph from the versioned file.  | 
|
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
318  | 
        
 | 
319  | 
        Ghosts are not listed or referenced in the graph.
 | 
|
| 
1684.3.1
by Robert Collins
 Fix versioned file joins with empty targets.  | 
320  | 
        :param version_ids: Versions to select.
 | 
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
321  | 
                            None means retrieve all versions.
 | 
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
322  | 
        """
 | 
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
323  | 
result = {}  | 
| 
1684.3.1
by Robert Collins
 Fix versioned file joins with empty targets.  | 
324  | 
if version_ids is None:  | 
325  | 
for version in self.versions():  | 
|
326  | 
result[version] = self.get_parents(version)  | 
|
327  | 
else:  | 
|
328  | 
pending = set(version_ids)  | 
|
329  | 
while pending:  | 
|
330  | 
version = pending.pop()  | 
|
331  | 
if version in result:  | 
|
332  | 
                    continue
 | 
|
333  | 
parents = self.get_parents(version)  | 
|
334  | 
for parent in parents:  | 
|
335  | 
if parent in result:  | 
|
336  | 
                        continue
 | 
|
337  | 
pending.add(parent)  | 
|
338  | 
result[version] = parents  | 
|
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
339  | 
return result  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
340  | 
|
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
341  | 
def get_graph_with_ghosts(self):  | 
342  | 
"""Return a graph for the entire versioned file.  | 
|
343  | 
        
 | 
|
344  | 
        Ghosts are referenced in parents list but are not
 | 
|
345  | 
        explicitly listed.
 | 
|
346  | 
        """
 | 
|
347  | 
raise NotImplementedError(self.get_graph_with_ghosts)  | 
|
348  | 
||
| 
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.  | 
349  | 
@deprecated_method(zero_eight)  | 
350  | 
def parent_names(self, version):  | 
|
351  | 
"""Return version names for parents of a version.  | 
|
352  | 
        
 | 
|
353  | 
        See get_parents for the current api.
 | 
|
354  | 
        """
 | 
|
355  | 
return self.get_parents(version)  | 
|
356  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
357  | 
def get_parents(self, version_id):  | 
358  | 
"""Return version names for parents of a version.  | 
|
359  | 
||
360  | 
        Must raise RevisionNotPresent if version is not present in
 | 
|
361  | 
        file history.
 | 
|
362  | 
        """
 | 
|
363  | 
raise NotImplementedError(self.get_parents)  | 
|
364  | 
||
| 
1594.2.8
by Robert Collins
 add ghost aware apis to knits.  | 
365  | 
def get_parents_with_ghosts(self, version_id):  | 
366  | 
"""Return version names for parents of version_id.  | 
|
367  | 
||
368  | 
        Will raise RevisionNotPresent if version_id is not present
 | 
|
369  | 
        in the history.
 | 
|
370  | 
||
371  | 
        Ghosts that are known about will be included in the parent list,
 | 
|
372  | 
        but are not explicitly marked.
 | 
|
373  | 
        """
 | 
|
374  | 
raise NotImplementedError(self.get_parents_with_ghosts)  | 
|
375  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
376  | 
def annotate_iter(self, version_id):  | 
377  | 
"""Yield list of (version-id, line) pairs for the specified  | 
|
378  | 
        version.
 | 
|
379  | 
||
380  | 
        Must raise RevisionNotPresent if any of the given versions are
 | 
|
381  | 
        not present in file history.
 | 
|
382  | 
        """
 | 
|
383  | 
raise NotImplementedError(self.annotate_iter)  | 
|
384  | 
||
385  | 
def annotate(self, version_id):  | 
|
386  | 
return list(self.annotate_iter(version_id))  | 
|
387  | 
||
| 
1596.2.37
by Robert Collins
 Switch to delta based content copying in the generic versioned file copier.  | 
388  | 
def _apply_delta(self, lines, delta):  | 
389  | 
"""Apply delta to lines."""  | 
|
390  | 
lines = list(lines)  | 
|
391  | 
offset = 0  | 
|
392  | 
for start, end, count, delta_lines in delta:  | 
|
393  | 
lines[offset+start:offset+end] = delta_lines  | 
|
394  | 
offset = offset + (start - end) + count  | 
|
395  | 
return lines  | 
|
396  | 
||
| 
1563.2.31
by Robert Collins
 Convert Knit repositories to use knits.  | 
397  | 
def join(self, other, pb=None, msg=None, version_ids=None,  | 
398  | 
ignore_missing=False):  | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
399  | 
"""Integrate versions from other into this versioned file.  | 
400  | 
||
401  | 
        If version_ids is None all versions from other should be
 | 
|
402  | 
        incorporated into this versioned file.
 | 
|
403  | 
||
404  | 
        Must raise RevisionNotPresent if any of the specified versions
 | 
|
| 
1563.2.31
by Robert Collins
 Convert Knit repositories to use knits.  | 
405  | 
        are not present in the other files history unless ignore_missing
 | 
406  | 
        is supplied when they are silently skipped.
 | 
|
407  | 
        """
 | 
|
| 
1594.2.23
by Robert Collins
 Test versioned file storage handling of clean/dirty status for accessed versioned files.  | 
408  | 
self._check_write_ok()  | 
| 
1563.2.31
by Robert Collins
 Convert Knit repositories to use knits.  | 
409  | 
return InterVersionedFile.get(other, self).join(  | 
410  | 
pb,  | 
|
411  | 
msg,  | 
|
412  | 
version_ids,  | 
|
413  | 
ignore_missing)  | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
414  | 
|
| 
2039.1.1
by Aaron Bentley
 Clean up progress properly when interrupted during fetch (#54000)  | 
415  | 
def iter_lines_added_or_present_in_versions(self, version_ids=None,  | 
416  | 
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.  | 
417  | 
"""Iterate over the lines in the versioned file from version_ids.  | 
418  | 
||
419  | 
        This may return lines from other versions, and does not return the
 | 
|
420  | 
        specific version marker at this point. The api may be changed
 | 
|
421  | 
        during development to include the version that the versioned file
 | 
|
422  | 
        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.  | 
423  | 
        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.  | 
424  | 
|
| 
2039.1.1
by Aaron Bentley
 Clean up progress properly when interrupted during fetch (#54000)  | 
425  | 
        If a progress bar is supplied, it may be used to indicate progress.
 | 
426  | 
        The caller is responsible for cleaning up progress bars (because this
 | 
|
427  | 
        is an iterator).
 | 
|
428  | 
||
| 
1594.2.6
by Robert Collins
 Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.  | 
429  | 
        NOTES: Lines are normalised: they will all have \n terminators.
 | 
430  | 
               Lines are returned in arbitrary order.
 | 
|
431  | 
        """
 | 
|
432  | 
raise NotImplementedError(self.iter_lines_added_or_present_in_versions)  | 
|
433  | 
||
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
434  | 
def transaction_finished(self):  | 
435  | 
"""The transaction that this file was opened in has finished.  | 
|
436  | 
||
437  | 
        This records self.finished = True and should cause all mutating
 | 
|
438  | 
        operations to error.
 | 
|
439  | 
        """
 | 
|
440  | 
self.finished = True  | 
|
441  | 
||
| 
1594.2.6
by Robert Collins
 Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.  | 
442  | 
@deprecated_method(zero_eight)  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
443  | 
def walk(self, version_ids=None):  | 
444  | 
"""Walk the versioned file as a weave-like structure, for  | 
|
445  | 
        versions relative to version_ids.  Yields sequence of (lineno,
 | 
|
446  | 
        insert, deletes, text) for each relevant line.
 | 
|
447  | 
||
448  | 
        Must raise RevisionNotPresent if any of the specified versions
 | 
|
449  | 
        are not present in the file history.
 | 
|
450  | 
||
451  | 
        :param version_ids: the version_ids to walk with respect to. If not
 | 
|
452  | 
                            supplied the entire weave-like structure is walked.
 | 
|
| 
1594.2.6
by Robert Collins
 Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.  | 
453  | 
|
454  | 
        walk is deprecated in favour of iter_lines_added_or_present_in_versions
 | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
455  | 
        """
 | 
456  | 
raise NotImplementedError(self.walk)  | 
|
457  | 
||
| 
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.  | 
458  | 
@deprecated_method(zero_eight)  | 
459  | 
def iter_names(self):  | 
|
460  | 
"""Walk the names list."""  | 
|
461  | 
return iter(self.versions())  | 
|
462  | 
||
| 
1551.6.15
by Aaron Bentley
 Moved plan_merge into Weave  | 
463  | 
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.  | 
464  | 
"""Return pseudo-annotation indicating how the two versions merge.  | 
465  | 
||
466  | 
        This is computed between versions a and b and their common
 | 
|
467  | 
        base.
 | 
|
468  | 
||
469  | 
        Weave lines present in none of them are skipped entirely.
 | 
|
| 
1664.2.2
by Aaron Bentley
 Added legend for plan-merge output  | 
470  | 
|
471  | 
        Legend:
 | 
|
472  | 
        killed-base Dead in base revision
 | 
|
473  | 
        killed-both Killed in each revision
 | 
|
474  | 
        killed-a    Killed in a
 | 
|
475  | 
        killed-b    Killed in b
 | 
|
476  | 
        unchanged   Alive in both a and b (possibly created in both)
 | 
|
477  | 
        new-a       Created in a
 | 
|
478  | 
        new-b       Created in b
 | 
|
| 
1664.2.5
by Aaron Bentley
 Update plan-merge legend  | 
479  | 
        ghost-a     Killed in a, unborn in b    
 | 
480  | 
        ghost-b     Killed in b, unborn in a
 | 
|
| 
1664.2.2
by Aaron Bentley
 Added legend for plan-merge output  | 
481  | 
        irrelevant  Not in either revision
 | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
482  | 
        """
 | 
| 
1551.6.15
by Aaron Bentley
 Moved plan_merge into Weave  | 
483  | 
raise NotImplementedError(VersionedFile.plan_merge)  | 
484  | 
||
| 
1996.3.7
by John Arbash Meinel
 lazy import versionedfile, late-load bzrlib.merge  | 
485  | 
def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,  | 
| 
1551.6.14
by Aaron Bentley
 Tweaks from merge review  | 
486  | 
b_marker=TextMerge.B_MARKER):  | 
| 
1551.6.12
by Aaron Bentley
 Indicate conflicts from merge_lines, insead of guessing  | 
487  | 
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  | 
488  | 
|
| 
1664.2.7
by Aaron Bentley
 Merge bzr.dev  | 
489  | 
|
| 
1551.6.10
by Aaron Bentley
 Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge  | 
490  | 
class PlanWeaveMerge(TextMerge):  | 
| 
1551.6.13
by Aaron Bentley
 Cleanup  | 
491  | 
"""Weave merge that takes a plan as its input.  | 
492  | 
    
 | 
|
| 
1551.6.14
by Aaron Bentley
 Tweaks from merge review  | 
493  | 
    This exists so that VersionedFile.plan_merge is implementable.
 | 
494  | 
    Most callers will want to use WeaveMerge instead.
 | 
|
| 
1551.6.13
by Aaron Bentley
 Cleanup  | 
495  | 
    """
 | 
496  | 
||
| 
1551.6.14
by Aaron Bentley
 Tweaks from merge review  | 
497  | 
def __init__(self, plan, a_marker=TextMerge.A_MARKER,  | 
498  | 
b_marker=TextMerge.B_MARKER):  | 
|
| 
1551.6.10
by Aaron Bentley
 Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge  | 
499  | 
TextMerge.__init__(self, a_marker, b_marker)  | 
500  | 
self.plan = plan  | 
|
501  | 
||
| 
1551.6.7
by Aaron Bentley
 Implemented two-way merge, refactored weave merge  | 
502  | 
def _merge_struct(self):  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
503  | 
lines_a = []  | 
504  | 
lines_b = []  | 
|
505  | 
ch_a = ch_b = False  | 
|
| 
1664.2.8
by Aaron Bentley
 Fix WeaveMerge when plan doesn't end with unchanged lines  | 
506  | 
|
507  | 
def outstanding_struct():  | 
|
508  | 
if not lines_a and not lines_b:  | 
|
509  | 
                return
 | 
|
510  | 
elif ch_a and not ch_b:  | 
|
511  | 
                # one-sided change:
 | 
|
512  | 
yield(lines_a,)  | 
|
513  | 
elif ch_b and not ch_a:  | 
|
514  | 
yield (lines_b,)  | 
|
515  | 
elif lines_a == lines_b:  | 
|
516  | 
yield(lines_a,)  | 
|
517  | 
else:  | 
|
518  | 
yield (lines_a, lines_b)  | 
|
| 
1551.6.13
by Aaron Bentley
 Cleanup  | 
519  | 
|
| 
1616.1.18
by Martin Pool
 (weave-merge) don't treat killed-both lines as points of agreement;  | 
520  | 
        # We previously considered either 'unchanged' or 'killed-both' lines
 | 
521  | 
        # to be possible places to resynchronize.  However, assuming agreement
 | 
|
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
522  | 
        # on killed-both lines may be too aggressive. -- mbp 20060324
 | 
| 
1551.6.7
by Aaron Bentley
 Implemented two-way merge, refactored weave merge  | 
523  | 
for state, line in self.plan:  | 
| 
1616.1.18
by Martin Pool
 (weave-merge) don't treat killed-both lines as points of agreement;  | 
524  | 
if state == 'unchanged':  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
525  | 
                # resync and flush queued conflicts changes if any
 | 
| 
1664.2.8
by Aaron Bentley
 Fix WeaveMerge when plan doesn't end with unchanged lines  | 
526  | 
for struct in outstanding_struct():  | 
527  | 
yield struct  | 
|
| 
1551.6.11
by Aaron Bentley
 Switched TextMerge_lines to work on a list  | 
528  | 
lines_a = []  | 
529  | 
lines_b = []  | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
530  | 
ch_a = ch_b = False  | 
531  | 
||
532  | 
if state == 'unchanged':  | 
|
533  | 
if line:  | 
|
| 
1551.6.5
by Aaron Bentley
 Got weave merge producing structural output  | 
534  | 
yield ([line],)  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
535  | 
elif state == 'killed-a':  | 
536  | 
ch_a = True  | 
|
537  | 
lines_b.append(line)  | 
|
538  | 
elif state == 'killed-b':  | 
|
539  | 
ch_b = True  | 
|
540  | 
lines_a.append(line)  | 
|
541  | 
elif state == 'new-a':  | 
|
542  | 
ch_a = True  | 
|
543  | 
lines_a.append(line)  | 
|
544  | 
elif state == 'new-b':  | 
|
545  | 
ch_b = True  | 
|
546  | 
lines_b.append(line)  | 
|
547  | 
else:  | 
|
| 
1551.6.6
by Aaron Bentley
 Cleanup  | 
548  | 
assert state in ('irrelevant', 'ghost-a', 'ghost-b',  | 
549  | 
'killed-base', 'killed-both'), state  | 
|
| 
1664.2.8
by Aaron Bentley
 Fix WeaveMerge when plan doesn't end with unchanged lines  | 
550  | 
for struct in outstanding_struct():  | 
551  | 
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.  | 
552  | 
|
| 
1664.2.14
by Aaron Bentley
 spacing fix  | 
553  | 
|
| 
1551.6.10
by Aaron Bentley
 Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge  | 
554  | 
class WeaveMerge(PlanWeaveMerge):  | 
| 
1551.6.13
by Aaron Bentley
 Cleanup  | 
555  | 
"""Weave merge that takes a VersionedFile and two versions as its input"""  | 
556  | 
||
| 
1551.6.10
by Aaron Bentley
 Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge  | 
557  | 
def __init__(self, versionedfile, ver_a, ver_b,  | 
| 
1551.6.14
by Aaron Bentley
 Tweaks from merge review  | 
558  | 
a_marker=PlanWeaveMerge.A_MARKER, b_marker=PlanWeaveMerge.B_MARKER):  | 
| 
1551.6.15
by Aaron Bentley
 Moved plan_merge into Weave  | 
559  | 
plan = versionedfile.plan_merge(ver_a, ver_b)  | 
| 
1551.6.10
by Aaron Bentley
 Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge  | 
560  | 
PlanWeaveMerge.__init__(self, plan, a_marker, b_marker)  | 
561  | 
||
562  | 
||
| 
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.  | 
563  | 
class InterVersionedFile(InterObject):  | 
564  | 
"""This class represents operations taking place between two versionedfiles..  | 
|
565  | 
||
566  | 
    Its instances have methods like join, and contain
 | 
|
567  | 
    references to the source and target versionedfiles these operations can be 
 | 
|
568  | 
    carried out on.
 | 
|
569  | 
||
570  | 
    Often we will provide convenience methods on 'versionedfile' which carry out
 | 
|
571  | 
    operations with another versionedfile - they will always forward to
 | 
|
572  | 
    InterVersionedFile.get(other).method_name(parameters).
 | 
|
573  | 
    """
 | 
|
574  | 
||
| 
1910.2.15
by Aaron Bentley
 Back out inter.get changes, make optimizers an ordered list  | 
575  | 
_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.  | 
576  | 
"""The available optimised InterVersionedFile types."""  | 
577  | 
||
| 
1563.2.31
by Robert Collins
 Convert Knit repositories to use knits.  | 
578  | 
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):  | 
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
579  | 
"""Integrate versions from self.source into self.target.  | 
580  | 
||
581  | 
        If version_ids is None all versions from source should be
 | 
|
582  | 
        incorporated into this versioned file.
 | 
|
583  | 
||
584  | 
        Must raise RevisionNotPresent if any of the specified versions
 | 
|
| 
1563.2.31
by Robert Collins
 Convert Knit repositories to use knits.  | 
585  | 
        are not present in the other files history unless ignore_missing is 
 | 
586  | 
        supplied when they are silently skipped.
 | 
|
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
587  | 
        """
 | 
588  | 
        # the default join: 
 | 
|
| 
1594.2.11
by Robert Collins
 Setup fast-code paths for copying into empty weaves and weave->empty knit.  | 
589  | 
        # - if the target is empty, just add all the versions from 
 | 
590  | 
        #   source to target, otherwise:
 | 
|
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
591  | 
        # - make a temporary versioned file of type target
 | 
592  | 
        # - insert the source content into it one at a time
 | 
|
593  | 
        # - join them
 | 
|
| 
1594.2.11
by Robert Collins
 Setup fast-code paths for copying into empty weaves and weave->empty knit.  | 
594  | 
if not self.target.versions():  | 
595  | 
target = self.target  | 
|
596  | 
else:  | 
|
597  | 
            # Make a new target-format versioned file. 
 | 
|
598  | 
temp_source = self.target.create_empty("temp", MemoryTransport())  | 
|
599  | 
target = temp_source  | 
|
| 
1684.3.2
by Robert Collins
 Factor out version_ids-to-join selection in InterVersionedfile.  | 
600  | 
version_ids = self._get_source_version_ids(version_ids, ignore_missing)  | 
| 
1684.3.1
by Robert Collins
 Fix versioned file joins with empty targets.  | 
601  | 
graph = self.source.get_graph(version_ids)  | 
| 
1996.3.7
by John Arbash Meinel
 lazy import versionedfile, late-load bzrlib.merge  | 
602  | 
order = tsort.topo_sort(graph.items())  | 
| 
1563.2.37
by Robert Collins
 Merge in nested progress bars  | 
603  | 
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.  | 
604  | 
parent_texts = {}  | 
| 
1563.2.37
by Robert Collins
 Merge in nested progress bars  | 
605  | 
try:  | 
| 
1596.2.28
by Robert Collins
 more knit profile based tuning.  | 
606  | 
            # TODO for incremental cross-format work:
 | 
| 
1596.2.27
by Robert Collins
 Note potential improvements in knit adds.  | 
607  | 
            # make a versioned file with the following content:
 | 
608  | 
            # all revisions we have been asked to join
 | 
|
609  | 
            # all their ancestors that are *not* in target already.
 | 
|
610  | 
            # the immediate parents of the above two sets, with 
 | 
|
611  | 
            # empty parent lists - these versions are in target already
 | 
|
612  | 
            # and the incorrect version data will be ignored.
 | 
|
613  | 
            # TODO: for all ancestors that are present in target already,
 | 
|
614  | 
            # 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.  | 
615  | 
            # 
 | 
616  | 
            # TODO: remove parent texts when they are not relevant any more for 
 | 
|
617  | 
            # memory pressure reduction. RBC 20060313
 | 
|
618  | 
            # pb.update('Converting versioned data', 0, len(order))
 | 
|
619  | 
            # deltas = self.source.get_deltas(order)
 | 
|
| 
1563.2.37
by Robert Collins
 Merge in nested progress bars  | 
620  | 
for index, version in enumerate(order):  | 
621  | 
pb.update('Converting versioned data', index, len(order))  | 
|
| 
1596.2.38
by Robert Collins
 rollback from using deltas to using fulltexts - deltas need more work to be ready.  | 
622  | 
parent_text = target.add_lines(version,  | 
623  | 
self.source.get_parents(version),  | 
|
624  | 
self.source.get_lines(version),  | 
|
625  | 
parent_texts=parent_texts)  | 
|
626  | 
parent_texts[version] = parent_text  | 
|
627  | 
                #delta_parent, sha1, noeol, delta = deltas[version]
 | 
|
628  | 
                #target.add_delta(version,
 | 
|
629  | 
                #                 self.source.get_parents(version),
 | 
|
630  | 
                #                 delta_parent,
 | 
|
631  | 
                #                 sha1,
 | 
|
632  | 
                #                 noeol,
 | 
|
633  | 
                #                 delta)
 | 
|
634  | 
                #target.get_lines(version)
 | 
|
| 
1563.2.37
by Robert Collins
 Merge in nested progress bars  | 
635  | 
|
636  | 
            # 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.  | 
637  | 
if target is not self.target:  | 
638  | 
return self.target.join(temp_source,  | 
|
639  | 
pb,  | 
|
640  | 
msg,  | 
|
641  | 
version_ids,  | 
|
642  | 
ignore_missing)  | 
|
| 
1563.2.37
by Robert Collins
 Merge in nested progress bars  | 
643  | 
finally:  | 
644  | 
pb.finished()  | 
|
| 
1563.2.13
by Robert Collins
 InterVersionedFile implemented.  | 
645  | 
|
| 
1684.3.2
by Robert Collins
 Factor out version_ids-to-join selection in InterVersionedfile.  | 
646  | 
def _get_source_version_ids(self, version_ids, ignore_missing):  | 
647  | 
"""Determine the version ids to be used from self.source.  | 
|
648  | 
||
649  | 
        :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.  | 
650  | 
                            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.  | 
651  | 
        :param ignore_missing: if True, remove missing ids from the version 
 | 
652  | 
                               list. If False, raise RevisionNotPresent on
 | 
|
653  | 
                               a missing version id.
 | 
|
654  | 
        :return: A set of version ids.
 | 
|
655  | 
        """
 | 
|
656  | 
if version_ids is None:  | 
|
| 
1684.3.3
by Robert Collins
 Add a special cased weaves to knit converter.  | 
657  | 
            # None cannot be in source.versions
 | 
| 
1684.3.2
by Robert Collins
 Factor out version_ids-to-join selection in InterVersionedfile.  | 
658  | 
return set(self.source.versions())  | 
659  | 
else:  | 
|
660  | 
if ignore_missing:  | 
|
661  | 
return set(self.source.versions()).intersection(set(version_ids))  | 
|
662  | 
else:  | 
|
663  | 
new_version_ids = set()  | 
|
664  | 
for version in version_ids:  | 
|
| 
1684.3.3
by Robert Collins
 Add a special cased weaves to knit converter.  | 
665  | 
if version is None:  | 
666  | 
                        continue
 | 
|
| 
1684.3.2
by Robert Collins
 Factor out version_ids-to-join selection in InterVersionedfile.  | 
667  | 
if not self.source.has_version(version):  | 
668  | 
raise errors.RevisionNotPresent(version, str(self.source))  | 
|
669  | 
else:  | 
|
670  | 
new_version_ids.add(version)  | 
|
671  | 
return new_version_ids  | 
|
672  | 
||
| 
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.  | 
673  | 
|
674  | 
class InterVersionedFileTestProviderAdapter(object):  | 
|
675  | 
"""A tool to generate a suite testing multiple inter versioned-file classes.  | 
|
676  | 
||
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
677  | 
    This is done by copying the test once for each InterVersionedFile provider
 | 
| 
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.  | 
678  | 
    and injecting the transport_server, transport_readonly_server,
 | 
679  | 
    versionedfile_factory and versionedfile_factory_to classes into each copy.
 | 
|
680  | 
    Each copy is also given a new id() to make it easy to identify.
 | 
|
681  | 
    """
 | 
|
682  | 
||
683  | 
def __init__(self, transport_server, transport_readonly_server, formats):  | 
|
684  | 
self._transport_server = transport_server  | 
|
685  | 
self._transport_readonly_server = transport_readonly_server  | 
|
686  | 
self._formats = formats  | 
|
687  | 
||
688  | 
def adapt(self, test):  | 
|
| 
1996.3.7
by John Arbash Meinel
 lazy import versionedfile, late-load bzrlib.merge  | 
689  | 
result = unittest.TestSuite()  | 
| 
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.  | 
690  | 
for (interversionedfile_class,  | 
691  | 
versionedfile_factory,  | 
|
692  | 
versionedfile_factory_to) in self._formats:  | 
|
693  | 
new_test = deepcopy(test)  | 
|
694  | 
new_test.transport_server = self._transport_server  | 
|
695  | 
new_test.transport_readonly_server = self._transport_readonly_server  | 
|
696  | 
new_test.interversionedfile_class = interversionedfile_class  | 
|
697  | 
new_test.versionedfile_factory = versionedfile_factory  | 
|
698  | 
new_test.versionedfile_factory_to = versionedfile_factory_to  | 
|
699  | 
def make_new_test_id():  | 
|
700  | 
new_id = "%s(%s)" % (new_test.id(), interversionedfile_class.__name__)  | 
|
701  | 
return lambda: new_id  | 
|
702  | 
new_test.id = make_new_test_id()  | 
|
703  | 
result.addTest(new_test)  | 
|
704  | 
return result  | 
|
705  | 
||
706  | 
    @staticmethod
 | 
|
707  | 
def default_test_list():  | 
|
708  | 
"""Generate the default list of interversionedfile permutations to test."""  | 
|
709  | 
from bzrlib.weave import WeaveFile  | 
|
| 
1563.2.16
by Robert Collins
 Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.  | 
710  | 
from bzrlib.knit import KnitVersionedFile  | 
| 
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.  | 
711  | 
result = []  | 
| 
1684.3.3
by Robert Collins
 Add a special cased weaves to knit converter.  | 
712  | 
        # test the fallback InterVersionedFile from annotated knits to weave
 | 
| 
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.  | 
713  | 
result.append((InterVersionedFile,  | 
| 
1684.3.3
by Robert Collins
 Add a special cased weaves to knit converter.  | 
714  | 
KnitVersionedFile,  | 
715  | 
WeaveFile))  | 
|
| 
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.  | 
716  | 
for optimiser in InterVersionedFile._optimisers:  | 
717  | 
result.append((optimiser,  | 
|
| 
1684.3.3
by Robert Collins
 Add a special cased weaves to knit converter.  | 
718  | 
optimiser._matching_file_from_factory,  | 
719  | 
optimiser._matching_file_to_factory  | 
|
| 
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.  | 
720  | 
                           ))
 | 
721  | 
        # if there are specific combinations we want to use, we can add them 
 | 
|
722  | 
        # here.
 | 
|
723  | 
return result  |