bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
1  | 
# (C) 2005 Canonical
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
2  | 
|
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
||
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
||
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
1185.16.40
by Martin Pool
 todo  | 
17  | 
# TODO: Some kind of command-line display of revision properties: 
 | 
18  | 
# perhaps show them in log -v and allow them as options to the commit command.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
19  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
20  | 
import bzrlib.errors  | 
| 
974.1.87
by Aaron Bentley
 Refactored and documented graph stuff  | 
21  | 
from bzrlib.graph import node_distances, select_farthest, all_descendants  | 
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
22  | 
from bzrlib.osutils import contains_whitespace  | 
| 
8
by mbp at sourcefrog
 store committer's timezone in revision and show  | 
23  | 
|
| 
974.1.90
by Aaron Bentley
 Switched NULL revision ID to 'null:' per robertc's suggestion  | 
24  | 
NULL_REVISION="null:"  | 
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
25  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
26  | 
class Revision(object):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
27  | 
"""Single revision on a branch.  | 
28  | 
||
29  | 
    Revisions may know their revision_hash, but only once they've been
 | 
|
30  | 
    written out.  This is not stored because you cannot write the hash
 | 
|
31  | 
    into the file it describes.
 | 
|
32  | 
||
| 
697
by Martin Pool
 - write out parent list for new revisions  | 
33  | 
    After bzr 0.0.5 revisions are allowed to have multiple parents.
 | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
34  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
35  | 
    parent_ids
 | 
36  | 
        List of parent revision_ids
 | 
|
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
37  | 
|
38  | 
    properties
 | 
|
39  | 
        Dictionary of revision properties.  These are attached to the
 | 
|
40  | 
        revision as extra metadata.  The name must be a single 
 | 
|
41  | 
        word; the value can be an arbitrary string.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
42  | 
    """
 | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
43  | 
|
| 
1185.16.35
by Martin Pool
 - stub for revision properties  | 
44  | 
def __init__(self, revision_id, properties=None, **args):  | 
| 
1092.2.25
by Robert Collins
 support ghosts in commits  | 
45  | 
self.revision_id = revision_id  | 
| 
1185.16.35
by Martin Pool
 - stub for revision properties  | 
46  | 
self.properties = properties or {}  | 
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
47  | 
self._check_properties()  | 
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
48  | 
self.parent_ids = []  | 
| 
1311
by Martin Pool
 - remove RevisionReference; just hold parent ids directly  | 
49  | 
self.parent_sha1s = []  | 
| 
1185.42.6
by Jelmer Vernooij
 Don't clear Revision.parent_ids after it has been set from the arguments  | 
50  | 
self.__dict__.update(args)  | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
51  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
52  | 
def __repr__(self):  | 
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
53  | 
return "<Revision id %s>" % self.revision_id  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
54  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
55  | 
def __eq__(self, other):  | 
56  | 
if not isinstance(other, Revision):  | 
|
57  | 
return False  | 
|
| 
1092.2.20
by Robert Collins
 symlink and weaves, whaddya know  | 
58  | 
        # FIXME: rbc 20050930 parent_ids are not being compared
 | 
59  | 
return (  | 
|
60  | 
self.inventory_sha1 == other.inventory_sha1  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
61  | 
and self.revision_id == other.revision_id  | 
62  | 
and self.timestamp == other.timestamp  | 
|
63  | 
and self.message == other.message  | 
|
64  | 
and self.timezone == other.timezone  | 
|
| 
1185.16.35
by Martin Pool
 - stub for revision properties  | 
65  | 
and self.committer == other.committer  | 
66  | 
and self.properties == other.properties)  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
67  | 
|
68  | 
def __ne__(self, other):  | 
|
69  | 
return not self.__eq__(other)  | 
|
70  | 
||
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
71  | 
def _check_properties(self):  | 
72  | 
"""Verify that all revision properties are OK.  | 
|
73  | 
        """
 | 
|
74  | 
for name, value in self.properties.iteritems():  | 
|
75  | 
if not isinstance(name, basestring) or contains_whitespace(name):  | 
|
76  | 
raise ValueError("invalid property name %r" % name)  | 
|
77  | 
if not isinstance(value, basestring):  | 
|
78  | 
raise ValueError("invalid property value %r for %r" %  | 
|
79  | 
(name, value))  | 
|
80  | 
||
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
81  | 
|
82  | 
def is_ancestor(revision_id, candidate_id, branch):  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
83  | 
"""Return true if candidate_id is an ancestor of revision_id.  | 
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
84  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
85  | 
    A false negative will be returned if any intermediate descendent of
 | 
86  | 
    candidate_id is not present in any of the revision_sources.
 | 
|
| 
810
by Martin Pool
 - New validate_revision_id function  | 
87  | 
    
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
88  | 
    revisions_source is an object supporting a get_revision operation that
 | 
89  | 
    behaves like Branch's.
 | 
|
90  | 
    """
 | 
|
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
91  | 
return candidate_id in branch.get_ancestry(revision_id)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
92  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
93  | 
|
94  | 
def iter_ancestors(revision_id, revision_source, only_present=False):  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
95  | 
ancestors = (revision_id,)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
96  | 
distance = 0  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
97  | 
while len(ancestors) > 0:  | 
98  | 
new_ancestors = []  | 
|
99  | 
for ancestor in ancestors:  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
100  | 
if not only_present:  | 
101  | 
yield ancestor, distance  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
102  | 
try:  | 
103  | 
revision = revision_source.get_revision(ancestor)  | 
|
104  | 
except bzrlib.errors.NoSuchRevision, e:  | 
|
105  | 
if e.revision == revision_id:  | 
|
106  | 
                    raise 
 | 
|
107  | 
else:  | 
|
108  | 
                    continue
 | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
109  | 
if only_present:  | 
110  | 
yield ancestor, distance  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
111  | 
new_ancestors.extend(revision.parent_ids)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
112  | 
ancestors = new_ancestors  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
113  | 
distance += 1  | 
114  | 
||
115  | 
||
116  | 
def find_present_ancestors(revision_id, revision_source):  | 
|
| 
1133
by Martin Pool
 doc  | 
117  | 
"""Return the ancestors of a revision present in a branch.  | 
118  | 
||
119  | 
    It's possible that a branch won't have the complete ancestry of
 | 
|
120  | 
    one of its revisions.  
 | 
|
121  | 
||
122  | 
    """
 | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
123  | 
found_ancestors = {}  | 
124  | 
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,  | 
|
125  | 
only_present=True))  | 
|
126  | 
for anc_order, (anc_id, anc_distance) in anc_iter:  | 
|
127  | 
if not found_ancestors.has_key(anc_id):  | 
|
128  | 
found_ancestors[anc_id] = (anc_order, anc_distance)  | 
|
129  | 
return found_ancestors  | 
|
130  | 
||
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
131  | 
|
132  | 
def __get_closest(intersection):  | 
|
133  | 
intersection.sort()  | 
|
134  | 
matches = []  | 
|
135  | 
for entry in intersection:  | 
|
136  | 
if entry[0] == intersection[0][0]:  | 
|
137  | 
matches.append(entry[2])  | 
|
138  | 
return matches  | 
|
139  | 
||
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
140  | 
|
| 
974.1.65
by Aaron Bentley
 Cleanup and test-fixing  | 
141  | 
def old_common_ancestor(revision_a, revision_b, revision_source):  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
142  | 
"""Find the ancestor common to both revisions that is closest to both.  | 
143  | 
    """
 | 
|
144  | 
from bzrlib.trace import mutter  | 
|
145  | 
a_ancestors = find_present_ancestors(revision_a, revision_source)  | 
|
146  | 
b_ancestors = find_present_ancestors(revision_b, revision_source)  | 
|
147  | 
a_intersection = []  | 
|
148  | 
b_intersection = []  | 
|
149  | 
    # a_order is used as a tie-breaker when two equally-good bases are found
 | 
|
150  | 
for revision, (a_order, a_distance) in a_ancestors.iteritems():  | 
|
151  | 
if b_ancestors.has_key(revision):  | 
|
152  | 
a_intersection.append((a_distance, a_order, revision))  | 
|
153  | 
b_intersection.append((b_ancestors[revision][1], a_order, revision))  | 
|
| 
1185.31.4
by John Arbash Meinel
 Fixing mutter() calls to not have to do string processing.  | 
154  | 
mutter("a intersection: %r", a_intersection)  | 
155  | 
mutter("b intersection: %r", b_intersection)  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
156  | 
|
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
157  | 
a_closest = __get_closest(a_intersection)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
158  | 
if len(a_closest) == 0:  | 
159  | 
return None  | 
|
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
160  | 
b_closest = __get_closest(b_intersection)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
161  | 
assert len(b_closest) != 0  | 
| 
1185.31.4
by John Arbash Meinel
 Fixing mutter() calls to not have to do string processing.  | 
162  | 
mutter ("a_closest %r", a_closest)  | 
163  | 
mutter ("b_closest %r", b_closest)  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
164  | 
if a_closest[0] in b_closest:  | 
165  | 
return a_closest[0]  | 
|
166  | 
elif b_closest[0] in a_closest:  | 
|
167  | 
return b_closest[0]  | 
|
168  | 
else:  | 
|
| 
1154
by Martin Pool
 - fix imports for moved errors  | 
169  | 
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
170  | 
return a_closest[0]  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
171  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
172  | 
def revision_graph(revision, revision_source):  | 
| 
974.1.66
by Aaron Bentley
 more cleanups, docs, sorting stuff  | 
173  | 
"""Produce a graph of the ancestry of the specified revision.  | 
174  | 
    Return root, ancestors map, descendants map
 | 
|
175  | 
||
176  | 
    TODO: Produce graphs with the NULL revision as root, so that we can find
 | 
|
177  | 
    a common even when trees are not branches don't represent a single line
 | 
|
178  | 
    of descent.
 | 
|
| 
1482
by Robert Collins
 'revision.revision_graph can handle having only partial history.  | 
179  | 
    RBC: 20051024: note that when we have two partial histories, this may not
 | 
180  | 
         be possible. But if we are willing to pretend :)... sure.
 | 
|
| 
974.1.66
by Aaron Bentley
 more cleanups, docs, sorting stuff  | 
181  | 
    """
 | 
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
182  | 
ancestors = {}  | 
183  | 
descendants = {}  | 
|
184  | 
lines = [revision]  | 
|
185  | 
root = None  | 
|
| 
974.1.61
by abentley
 fixes for common ancestor picker  | 
186  | 
descendants[revision] = {}  | 
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
187  | 
while len(lines) > 0:  | 
188  | 
new_lines = set()  | 
|
189  | 
for line in lines:  | 
|
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
190  | 
if line == NULL_REVISION:  | 
191  | 
parents = []  | 
|
192  | 
root = NULL_REVISION  | 
|
193  | 
else:  | 
|
194  | 
try:  | 
|
195  | 
rev = revision_source.get_revision(line)  | 
|
| 
1390
by Robert Collins
 pair programming worx... merge integration and weave  | 
196  | 
parents = list(rev.parent_ids)  | 
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
197  | 
if len(parents) == 0:  | 
198  | 
parents = [NULL_REVISION]  | 
|
199  | 
except bzrlib.errors.NoSuchRevision:  | 
|
200  | 
if line == revision:  | 
|
201  | 
                        raise
 | 
|
202  | 
parents = None  | 
|
| 
974.1.64
by Aaron Bentley
 Handled ancestors that are missing when finding a base  | 
203  | 
if parents is not None:  | 
204  | 
for parent in parents:  | 
|
205  | 
if parent not in ancestors:  | 
|
206  | 
new_lines.add(parent)  | 
|
207  | 
if parent not in descendants:  | 
|
208  | 
descendants[parent] = {}  | 
|
209  | 
descendants[parent][line] = 1  | 
|
210  | 
if parents is not None:  | 
|
211  | 
ancestors[line] = set(parents)  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
212  | 
lines = new_lines  | 
| 
1482
by Robert Collins
 'revision.revision_graph can handle having only partial history.  | 
213  | 
if root is None:  | 
214  | 
        # The history for revision becomes inaccessible without
 | 
|
215  | 
        # actually hitting a no-parents revision. This then
 | 
|
216  | 
        # makes these asserts below trigger. So, if root is None
 | 
|
217  | 
        # determine the actual root by walking the accessible tree
 | 
|
218  | 
        # and then stash NULL_REVISION at the end.
 | 
|
219  | 
root = NULL_REVISION  | 
|
220  | 
descendants[root] = {}  | 
|
221  | 
        # for every revision, check we can access at least
 | 
|
222  | 
        # one parent, if we cant, add NULL_REVISION and
 | 
|
223  | 
        # a link
 | 
|
224  | 
for rev in ancestors:  | 
|
225  | 
if len(ancestors[rev]) == 0:  | 
|
226  | 
raise RuntimeError('unreachable code ?!')  | 
|
227  | 
ok = False  | 
|
228  | 
for parent in ancestors[rev]:  | 
|
229  | 
if parent in ancestors:  | 
|
230  | 
ok = True  | 
|
231  | 
if ok:  | 
|
232  | 
                continue
 | 
|
233  | 
descendants[root][rev] = 1  | 
|
234  | 
ancestors[rev].add(root)  | 
|
235  | 
ancestors[root] = set()  | 
|
| 
974.1.63
by Aaron Bentley
 Fixed graph-generation  | 
236  | 
assert root not in descendants[root]  | 
237  | 
assert root not in ancestors[root]  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
238  | 
return root, ancestors, descendants  | 
239  | 
||
| 
1092.3.4
by Robert Collins
 update symlink branch to integration  | 
240  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
241  | 
def combined_graph(revision_a, revision_b, revision_source):  | 
| 
974.1.66
by Aaron Bentley
 more cleanups, docs, sorting stuff  | 
242  | 
"""Produce a combined ancestry graph.  | 
243  | 
    Return graph root, ancestors map, descendants map, set of common nodes"""
 | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
244  | 
root, ancestors, descendants = revision_graph(revision_a, revision_source)  | 
245  | 
root_b, ancestors_b, descendants_b = revision_graph(revision_b,  | 
|
246  | 
revision_source)  | 
|
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
247  | 
if root != root_b:  | 
248  | 
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
249  | 
common = set()  | 
250  | 
for node, node_anc in ancestors_b.iteritems():  | 
|
251  | 
if node in ancestors:  | 
|
252  | 
common.add(node)  | 
|
253  | 
else:  | 
|
254  | 
ancestors[node] = set()  | 
|
255  | 
ancestors[node].update(node_anc)  | 
|
256  | 
for node, node_dec in descendants_b.iteritems():  | 
|
257  | 
if node not in descendants:  | 
|
| 
1185.8.1
by Aaron Bentley
 Ensured combined_graph is order-insensitive  | 
258  | 
descendants[node] = {}  | 
| 
974.1.63
by Aaron Bentley
 Fixed graph-generation  | 
259  | 
descendants[node].update(node_dec)  | 
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
260  | 
return root, ancestors, descendants, common  | 
261  | 
||
| 
1092.3.4
by Robert Collins
 update symlink branch to integration  | 
262  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
263  | 
def common_ancestor(revision_a, revision_b, revision_source):  | 
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
264  | 
try:  | 
265  | 
root, ancestors, descendants, common = \  | 
|
266  | 
combined_graph(revision_a, revision_b, revision_source)  | 
|
267  | 
except bzrlib.errors.NoCommonRoot:  | 
|
268  | 
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)  | 
|
269  | 
||
| 
974.1.87
by Aaron Bentley
 Refactored and documented graph stuff  | 
270  | 
distances = node_distances (descendants, ancestors, root)  | 
271  | 
farthest = select_farthest(distances, common)  | 
|
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
272  | 
if farthest is None or farthest == NULL_REVISION:  | 
| 
974.1.87
by Aaron Bentley
 Refactored and documented graph stuff  | 
273  | 
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)  | 
274  | 
return farthest  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
275  | 
|
276  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
277  | 
class MultipleRevisionSources(object):  | 
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
278  | 
"""Proxy that looks in multiple branches for revisions."""  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
279  | 
def __init__(self, *args):  | 
280  | 
object.__init__(self)  | 
|
281  | 
assert len(args) != 0  | 
|
282  | 
self._revision_sources = args  | 
|
283  | 
||
284  | 
def get_revision(self, revision_id):  | 
|
285  | 
for source in self._revision_sources:  | 
|
286  | 
try:  | 
|
287  | 
return source.get_revision(revision_id)  | 
|
288  | 
except bzrlib.errors.NoSuchRevision, e:  | 
|
289  | 
                pass
 | 
|
290  | 
raise e  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
291  | 
|
292  | 
def get_intervening_revisions(ancestor_id, rev_id, rev_source,  | 
|
293  | 
revision_history=None):  | 
|
294  | 
"""Find the longest line of descent from maybe_ancestor to revision.  | 
|
295  | 
    Revision history is followed where possible.
 | 
|
296  | 
||
297  | 
    If ancestor_id == rev_id, list will be empty.
 | 
|
298  | 
    Otherwise, rev_id will be the last entry.  ancestor_id will never appear.
 | 
|
299  | 
    If ancestor_id is not an ancestor, NotAncestor will be thrown
 | 
|
300  | 
    """
 | 
|
| 
974.1.73
by Aaron Bentley
 Reimplemented get_intervening_revisions for better scalability  | 
301  | 
root, ancestors, descendants = revision_graph(rev_id, rev_source)  | 
302  | 
if len(descendants) == 0:  | 
|
303  | 
raise NoSuchRevision(rev_source, rev_id)  | 
|
304  | 
if ancestor_id not in descendants:  | 
|
305  | 
rev_source.get_revision(ancestor_id)  | 
|
306  | 
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)  | 
|
307  | 
root_descendants = all_descendants(descendants, ancestor_id)  | 
|
308  | 
root_descendants.add(ancestor_id)  | 
|
309  | 
if rev_id not in root_descendants:  | 
|
310  | 
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)  | 
|
311  | 
distances = node_distances(descendants, ancestors, ancestor_id,  | 
|
312  | 
root_descendants=root_descendants)  | 
|
313  | 
||
314  | 
def best_ancestor(rev_id):  | 
|
315  | 
best = None  | 
|
316  | 
for anc_id in ancestors[rev_id]:  | 
|
317  | 
try:  | 
|
318  | 
distance = distances[anc_id]  | 
|
319  | 
except KeyError:  | 
|
320  | 
                continue
 | 
|
321  | 
if revision_history is not None and anc_id in revision_history:  | 
|
322  | 
return anc_id  | 
|
323  | 
elif best is None or distance > best[1]:  | 
|
324  | 
best = (anc_id, distance)  | 
|
325  | 
return best[0]  | 
|
326  | 
||
327  | 
next = rev_id  | 
|
328  | 
path = []  | 
|
329  | 
while next != ancestor_id:  | 
|
330  | 
path.append(next)  | 
|
331  | 
next = best_ancestor(next)  | 
|
332  | 
path.reverse()  | 
|
333  | 
return path  |