2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
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 |
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
20 |
|
2598.5.5
by Aaron Bentley
Convert assertion to deprecation warning |
21 |
from bzrlib import ( |
22 |
errors, |
|
3228.4.1
by John Arbash Meinel
deprecate get_revision_graph_with_ghosts and its only caller, common_ancestor. |
23 |
symbol_versioning, |
2598.5.5
by Aaron Bentley
Convert assertion to deprecation warning |
24 |
)
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
25 |
from bzrlib.deprecated_graph import ( |
26 |
all_descendants, |
|
27 |
Graph, |
|
28 |
node_distances, |
|
29 |
select_farthest, |
|
30 |
)
|
|
1185.16.39
by Martin Pool
- constraints on revprops |
31 |
from bzrlib.osutils import contains_whitespace |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
32 |
from bzrlib.progress import DummyProgress |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
33 |
from bzrlib.symbol_versioning import (deprecated_function, |
34 |
)
|
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
35 |
|
974.1.90
by Aaron Bentley
Switched NULL revision ID to 'null:' per robertc's suggestion |
36 |
NULL_REVISION="null:" |
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
37 |
CURRENT_REVISION="current:" |
974.1.89
by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root. |
38 |
|
1911.2.1
by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate |
39 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
40 |
class Revision(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
41 |
"""Single revision on a branch.
|
42 |
||
43 |
Revisions may know their revision_hash, but only once they've been
|
|
44 |
written out. This is not stored because you cannot write the hash
|
|
45 |
into the file it describes.
|
|
46 |
||
697
by Martin Pool
- write out parent list for new revisions |
47 |
After bzr 0.0.5 revisions are allowed to have multiple parents.
|
696
by Martin Pool
- Refactor revision deserialization code |
48 |
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
49 |
parent_ids
|
50 |
List of parent revision_ids
|
|
1185.16.39
by Martin Pool
- constraints on revprops |
51 |
|
52 |
properties
|
|
53 |
Dictionary of revision properties. These are attached to the
|
|
54 |
revision as extra metadata. The name must be a single
|
|
55 |
word; the value can be an arbitrary string.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
56 |
"""
|
696
by Martin Pool
- Refactor revision deserialization code |
57 |
|
1185.16.35
by Martin Pool
- stub for revision properties |
58 |
def __init__(self, revision_id, properties=None, **args): |
1092.2.25
by Robert Collins
support ghosts in commits |
59 |
self.revision_id = revision_id |
1185.16.35
by Martin Pool
- stub for revision properties |
60 |
self.properties = properties or {} |
1185.16.39
by Martin Pool
- constraints on revprops |
61 |
self._check_properties() |
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
62 |
self.parent_ids = [] |
1311
by Martin Pool
- remove RevisionReference; just hold parent ids directly |
63 |
self.parent_sha1s = [] |
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
64 |
"""Not used anymore - legacy from for 4."""
|
1185.42.6
by Jelmer Vernooij
Don't clear Revision.parent_ids after it has been set from the arguments |
65 |
self.__dict__.update(args) |
696
by Martin Pool
- Refactor revision deserialization code |
66 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
67 |
def __repr__(self): |
184
by mbp at sourcefrog
pychecker fixups |
68 |
return "<Revision id %s>" % self.revision_id |
1
by mbp at sourcefrog
import from baz patch-364 |
69 |
|
1185
by Martin Pool
- add xml round-trip test for revisions |
70 |
def __eq__(self, other): |
71 |
if not isinstance(other, Revision): |
|
72 |
return False |
|
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
73 |
# FIXME: rbc 20050930 parent_ids are not being compared
|
74 |
return ( |
|
75 |
self.inventory_sha1 == other.inventory_sha1 |
|
1185
by Martin Pool
- add xml round-trip test for revisions |
76 |
and self.revision_id == other.revision_id |
77 |
and self.timestamp == other.timestamp |
|
78 |
and self.message == other.message |
|
79 |
and self.timezone == other.timezone |
|
1185.16.35
by Martin Pool
- stub for revision properties |
80 |
and self.committer == other.committer |
81 |
and self.properties == other.properties) |
|
1185
by Martin Pool
- add xml round-trip test for revisions |
82 |
|
83 |
def __ne__(self, other): |
|
84 |
return not self.__eq__(other) |
|
85 |
||
1185.16.39
by Martin Pool
- constraints on revprops |
86 |
def _check_properties(self): |
1732.3.2
by Matthieu Moy
merge |
87 |
"""Verify that all revision properties are OK."""
|
1185.16.39
by Martin Pool
- constraints on revprops |
88 |
for name, value in self.properties.iteritems(): |
89 |
if not isinstance(name, basestring) or contains_whitespace(name): |
|
90 |
raise ValueError("invalid property name %r" % name) |
|
91 |
if not isinstance(value, basestring): |
|
92 |
raise ValueError("invalid property value %r for %r" % |
|
93 |
(name, value)) |
|
94 |
||
1534.4.49
by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history. |
95 |
def get_history(self, repository): |
96 |
"""Return the canonical line-of-history for this revision.
|
|
97 |
||
98 |
If ghosts are present this may differ in result from a ghost-free
|
|
99 |
repository.
|
|
100 |
"""
|
|
101 |
current_revision = self |
|
102 |
reversed_result = [] |
|
103 |
while current_revision is not None: |
|
104 |
reversed_result.append(current_revision.revision_id) |
|
105 |
if not len (current_revision.parent_ids): |
|
106 |
reversed_result.append(None) |
|
107 |
current_revision = None |
|
108 |
else: |
|
109 |
next_revision_id = current_revision.parent_ids[0] |
|
110 |
current_revision = repository.get_revision(next_revision_id) |
|
111 |
reversed_result.reverse() |
|
112 |
return reversed_result |
|
113 |
||
1740.2.5
by Aaron Bentley
Merge from bzr.dev |
114 |
def get_summary(self): |
115 |
"""Get the first line of the log message for this revision.
|
|
116 |
"""
|
|
2671.5.1
by Lukáš Lalinsky
Strip leading whitespace from the commit message before using the first line as a commit summary. |
117 |
return self.message.lstrip().split('\n', 1)[0] |
1740.2.5
by Aaron Bentley
Merge from bzr.dev |
118 |
|
2671.5.7
by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer. |
119 |
def get_apparent_author(self): |
120 |
"""Return the apparent author of this revision.
|
|
121 |
||
122 |
If the revision properties contain the author name,
|
|
123 |
return it. Otherwise return the committer name.
|
|
2671.5.2
by Lukáš Lalinsky
Add Revision.get_author to return the author's name, either from the property 'author' or the name of the committer. |
124 |
"""
|
125 |
return self.properties.get('author', self.committer) |
|
126 |
||
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
127 |
|
3123.1.2
by John Arbash Meinel
Aaron caught one more one_zero deprecation. |
128 |
@deprecated_function(symbol_versioning.one_zero) |
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
129 |
def is_ancestor(revision_id, candidate_id, branch): |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
130 |
"""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 |
131 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
132 |
A false negative will be returned if any intermediate descendent of
|
133 |
candidate_id is not present in any of the revision_sources.
|
|
810
by Martin Pool
- New validate_revision_id function |
134 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
135 |
revisions_source is an object supporting a get_revision operation that
|
136 |
behaves like Branch's.
|
|
3052.1.3
by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests. |
137 |
|
138 |
This function is deprecated, it is better for callers to directly use
|
|
139 |
Graph.is_ancestor() (just watch out that the parameter order is switched)
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
140 |
"""
|
3052.1.1
by John Arbash Meinel
(bug #172970) Switch revision.is_ancestor to use a graph search |
141 |
return branch.repository.get_graph().is_ancestor(candidate_id, revision_id) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
142 |
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
143 |
|
144 |
def iter_ancestors(revision_id, revision_source, only_present=False): |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
145 |
ancestors = (revision_id,) |
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
146 |
distance = 0 |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
147 |
while len(ancestors) > 0: |
148 |
new_ancestors = [] |
|
149 |
for ancestor in ancestors: |
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
150 |
if not only_present: |
151 |
yield ancestor, distance |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
152 |
try: |
153 |
revision = revision_source.get_revision(ancestor) |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
154 |
except errors.NoSuchRevision, e: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
155 |
if e.revision == revision_id: |
156 |
raise
|
|
157 |
else: |
|
158 |
continue
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
159 |
if only_present: |
160 |
yield ancestor, distance |
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
161 |
new_ancestors.extend(revision.parent_ids) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
162 |
ancestors = new_ancestors |
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
163 |
distance += 1 |
164 |
||
165 |
||
166 |
def find_present_ancestors(revision_id, revision_source): |
|
1133
by Martin Pool
doc |
167 |
"""Return the ancestors of a revision present in a branch.
|
168 |
||
169 |
It's possible that a branch won't have the complete ancestry of
|
|
170 |
one of its revisions.
|
|
171 |
||
172 |
"""
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
173 |
found_ancestors = {} |
174 |
anc_iter = enumerate(iter_ancestors(revision_id, revision_source, |
|
175 |
only_present=True)) |
|
176 |
for anc_order, (anc_id, anc_distance) in anc_iter: |
|
1963.2.1
by Robey Pointer
remove usage of has_key() |
177 |
if anc_id not in found_ancestors: |
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
178 |
found_ancestors[anc_id] = (anc_order, anc_distance) |
179 |
return found_ancestors |
|
180 |
||
1153
by Martin Pool
- clean up some code in revision.py |
181 |
|
182 |
def __get_closest(intersection): |
|
183 |
intersection.sort() |
|
184 |
matches = [] |
|
185 |
for entry in intersection: |
|
186 |
if entry[0] == intersection[0][0]: |
|
187 |
matches.append(entry[2]) |
|
188 |
return matches |
|
189 |
||
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
190 |
|
3287.6.1
by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method. |
191 |
@deprecated_function(symbol_versioning.one_four) |
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
192 |
def revision_graph(revision, revision_source): |
974.1.66
by Aaron Bentley
more cleanups, docs, sorting stuff |
193 |
"""Produce a graph of the ancestry of the specified revision.
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
194 |
|
195 |
:return: root, ancestors map, descendants map
|
|
974.1.66
by Aaron Bentley
more cleanups, docs, sorting stuff |
196 |
"""
|
1587.1.4
by Robert Collins
Quick, urgent fix for common_ancestor performance. |
197 |
revision_source.lock_read() |
198 |
try: |
|
199 |
return _revision_graph(revision, revision_source) |
|
200 |
finally: |
|
201 |
revision_source.unlock() |
|
202 |
||
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
203 |
|
1587.1.4
by Robert Collins
Quick, urgent fix for common_ancestor performance. |
204 |
def _revision_graph(revision, revision_source): |
205 |
"""See revision_graph."""
|
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
206 |
from bzrlib.tsort import topo_sort |
207 |
graph = revision_source.get_revision_graph(revision) |
|
208 |
# mark all no-parent revisions as being NULL_REVISION parentage.
|
|
209 |
for node, parents in graph.items(): |
|
210 |
if len(parents) == 0: |
|
211 |
graph[node] = [NULL_REVISION] |
|
212 |
# add NULL_REVISION to the graph
|
|
213 |
graph[NULL_REVISION] = [] |
|
214 |
||
215 |
# pick a root. If there are multiple roots
|
|
216 |
# this could pick a random one.
|
|
217 |
topo_order = topo_sort(graph.items()) |
|
218 |
root = topo_order[0] |
|
219 |
||
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
220 |
ancestors = {} |
221 |
descendants = {} |
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
222 |
|
223 |
# map the descendants of the graph.
|
|
224 |
# and setup our set based return graph.
|
|
225 |
for node in graph.keys(): |
|
226 |
descendants[node] = {} |
|
227 |
for node, parents in graph.items(): |
|
228 |
for parent in parents: |
|
229 |
descendants[parent][node] = 1 |
|
230 |
ancestors[node] = set(parents) |
|
231 |
||
974.1.63
by Aaron Bentley
Fixed graph-generation |
232 |
assert root not in descendants[root] |
233 |
assert root not in ancestors[root] |
|
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
234 |
return root, ancestors, descendants |
235 |
||
1092.3.4
by Robert Collins
update symlink branch to integration |
236 |
|
3228.4.11
by John Arbash Meinel
Deprecations abound. |
237 |
@deprecated_function(symbol_versioning.one_three) |
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
238 |
def combined_graph(revision_a, revision_b, revision_source): |
974.1.66
by Aaron Bentley
more cleanups, docs, sorting stuff |
239 |
"""Produce a combined ancestry graph.
|
240 |
Return graph root, ancestors map, descendants map, set of common nodes"""
|
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
241 |
root, ancestors, descendants = revision_graph( |
242 |
revision_a, revision_source) |
|
243 |
root_b, ancestors_b, descendants_b = revision_graph( |
|
244 |
revision_b, revision_source) |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
245 |
if root != root_b: |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
246 |
raise errors.NoCommonRoot(revision_a, revision_b) |
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
247 |
common = set() |
248 |
for node, node_anc in ancestors_b.iteritems(): |
|
249 |
if node in ancestors: |
|
250 |
common.add(node) |
|
251 |
else: |
|
252 |
ancestors[node] = set() |
|
253 |
ancestors[node].update(node_anc) |
|
254 |
for node, node_dec in descendants_b.iteritems(): |
|
255 |
if node not in descendants: |
|
1185.8.1
by Aaron Bentley
Ensured combined_graph is order-insensitive |
256 |
descendants[node] = {} |
974.1.63
by Aaron Bentley
Fixed graph-generation |
257 |
descendants[node].update(node_dec) |
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
258 |
return root, ancestors, descendants, common |
259 |
||
1092.3.4
by Robert Collins
update symlink branch to integration |
260 |
|
3228.4.1
by John Arbash Meinel
deprecate get_revision_graph_with_ghosts and its only caller, common_ancestor. |
261 |
@deprecated_function(symbol_versioning.one_three) |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
262 |
def common_ancestor(revision_a, revision_b, revision_source, |
263 |
pb=DummyProgress()): |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
264 |
if None in (revision_a, revision_b): |
265 |
return None |
|
1836.3.1
by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION. |
266 |
if NULL_REVISION in (revision_a, revision_b): |
267 |
return NULL_REVISION |
|
1594.2.15
by Robert Collins
Unfuck performance. |
268 |
# trivial optimisation
|
269 |
if revision_a == revision_b: |
|
270 |
return revision_a |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
271 |
try: |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
272 |
try: |
273 |
pb.update('Picking ancestor', 1, 3) |
|
1594.2.15
by Robert Collins
Unfuck performance. |
274 |
graph = revision_source.get_revision_graph_with_ghosts( |
275 |
[revision_a, revision_b]) |
|
2401.1.1
by John Arbash Meinel
Shortcut the common_ancestor code when one tip is in the ancestry of the other. |
276 |
# Shortcut the case where one of the tips is already included in
|
277 |
# the other graphs ancestry.
|
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
278 |
ancestry_a = graph.get_ancestry(revision_a, topo_sorted=False) |
2401.1.1
by John Arbash Meinel
Shortcut the common_ancestor code when one tip is in the ancestry of the other. |
279 |
if revision_b in ancestry_a: |
280 |
return revision_b |
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
281 |
ancestry_b = graph.get_ancestry(revision_b, topo_sorted=False) |
2401.1.1
by John Arbash Meinel
Shortcut the common_ancestor code when one tip is in the ancestry of the other. |
282 |
if revision_a in ancestry_b: |
283 |
return revision_a |
|
1594.2.15
by Robert Collins
Unfuck performance. |
284 |
# convert to a NULL_REVISION based graph.
|
285 |
ancestors = graph.get_ancestors() |
|
286 |
descendants = graph.get_descendants() |
|
2401.1.2
by John Arbash Meinel
Ancestry checks can be done using the dictionaries |
287 |
common = set(ancestry_a) |
288 |
common.intersection_update(ancestry_b) |
|
1594.2.15
by Robert Collins
Unfuck performance. |
289 |
descendants[NULL_REVISION] = {} |
290 |
ancestors[NULL_REVISION] = [] |
|
291 |
for root in graph.roots: |
|
292 |
descendants[NULL_REVISION][root] = 1 |
|
293 |
ancestors[root].append(NULL_REVISION) |
|
1607.1.12
by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are |
294 |
for ghost in graph.ghosts: |
295 |
# ghosts act as roots for the purpose of finding
|
|
296 |
# the longest paths from the root: any ghost *might*
|
|
297 |
# be directly attached to the root, so we treat them
|
|
298 |
# as being such.
|
|
299 |
# ghost now descends from NULL
|
|
300 |
descendants[NULL_REVISION][ghost] = 1 |
|
301 |
# that is it has an ancestor of NULL
|
|
302 |
ancestors[ghost] = [NULL_REVISION] |
|
303 |
# ghost is common if any of ghosts descendants are common:
|
|
304 |
for ghost_descendant in descendants[ghost]: |
|
305 |
if ghost_descendant in common: |
|
306 |
common.add(ghost) |
|
307 |
||
1594.2.15
by Robert Collins
Unfuck performance. |
308 |
root = NULL_REVISION |
309 |
common.add(NULL_REVISION) |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
310 |
except errors.NoCommonRoot: |
311 |
raise errors.NoCommonAncestor(revision_a, revision_b) |
|
1534.9.1
by Aaron Bentley
Added progress bars to merge |
312 |
|
313 |
pb.update('Picking ancestor', 2, 3) |
|
314 |
distances = node_distances (descendants, ancestors, root) |
|
315 |
pb.update('Picking ancestor', 3, 2) |
|
316 |
farthest = select_farthest(distances, common) |
|
317 |
if farthest is None or farthest == NULL_REVISION: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
318 |
raise errors.NoCommonAncestor(revision_a, revision_b) |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
319 |
finally: |
320 |
pb.clear() |
|
974.1.87
by Aaron Bentley
Refactored and documented graph stuff |
321 |
return farthest |
974.1.60
by aaron.bentley at utoronto
Initial import of common-ancestor detection |
322 |
|
323 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
324 |
class MultipleRevisionSources(object): |
1153
by Martin Pool
- clean up some code in revision.py |
325 |
"""Proxy that looks in multiple branches for revisions."""
|
3228.4.11
by John Arbash Meinel
Deprecations abound. |
326 |
|
327 |
@symbol_versioning.deprecated_method(symbol_versioning.one_three) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
328 |
def __init__(self, *args): |
329 |
object.__init__(self) |
|
330 |
assert len(args) != 0 |
|
331 |
self._revision_sources = args |
|
332 |
||
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
333 |
def revision_parents(self, revision_id): |
334 |
for source in self._revision_sources: |
|
335 |
try: |
|
336 |
return source.revision_parents(revision_id) |
|
337 |
except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e: |
|
338 |
pass
|
|
339 |
raise e |
|
340 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
341 |
def get_revision(self, revision_id): |
342 |
for source in self._revision_sources: |
|
343 |
try: |
|
344 |
return source.get_revision(revision_id) |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
345 |
except errors.NoSuchRevision, e: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
346 |
pass
|
347 |
raise e |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
348 |
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
349 |
def get_revision_graph(self, revision_id): |
1594.2.3
by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits. |
350 |
# we could probe incrementally until the pending
|
351 |
# ghosts list stop growing, but its cheaper for now
|
|
352 |
# to just ask for the complete graph for each repository.
|
|
353 |
graphs = [] |
|
354 |
for source in self._revision_sources: |
|
355 |
ghost_graph = source.get_revision_graph_with_ghosts() |
|
356 |
graphs.append(ghost_graph) |
|
357 |
absent = 0 |
|
358 |
for graph in graphs: |
|
359 |
if not revision_id in graph.get_ancestors(): |
|
360 |
absent += 1 |
|
361 |
if absent == len(graphs): |
|
362 |
raise errors.NoSuchRevision(self._revision_sources[0], revision_id) |
|
363 |
||
364 |
# combine the graphs
|
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
365 |
result = {} |
1594.2.3
by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits. |
366 |
pending = set([revision_id]) |
367 |
def find_parents(node_id): |
|
368 |
"""find the parents for node_id."""
|
|
369 |
for graph in graphs: |
|
370 |
ancestors = graph.get_ancestors() |
|
371 |
try: |
|
372 |
return ancestors[node_id] |
|
373 |
except KeyError: |
|
374 |
pass
|
|
375 |
raise errors.NoSuchRevision(self._revision_sources[0], node_id) |
|
376 |
while len(pending): |
|
377 |
# all the graphs should have identical parent lists
|
|
378 |
node_id = pending.pop() |
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
379 |
try: |
1594.2.3
by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits. |
380 |
result[node_id] = find_parents(node_id) |
381 |
for parent_node in result[node_id]: |
|
382 |
if not parent_node in result: |
|
383 |
pending.add(parent_node) |
|
384 |
except errors.NoSuchRevision: |
|
385 |
# ghost, ignore it.
|
|
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
386 |
pass
|
1594.2.3
by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits. |
387 |
return result |
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
388 |
|
1594.2.15
by Robert Collins
Unfuck performance. |
389 |
def get_revision_graph_with_ghosts(self, revision_ids): |
390 |
# query all the sources for their entire graphs
|
|
391 |
# and then build a combined graph for just
|
|
392 |
# revision_ids.
|
|
393 |
graphs = [] |
|
394 |
for source in self._revision_sources: |
|
395 |
ghost_graph = source.get_revision_graph_with_ghosts() |
|
396 |
graphs.append(ghost_graph.get_ancestors()) |
|
397 |
for revision_id in revision_ids: |
|
398 |
absent = 0 |
|
399 |
for graph in graphs: |
|
400 |
if not revision_id in graph: |
|
401 |
absent += 1 |
|
402 |
if absent == len(graphs): |
|
403 |
raise errors.NoSuchRevision(self._revision_sources[0], |
|
404 |
revision_id) |
|
405 |
||
406 |
# combine the graphs
|
|
407 |
result = Graph() |
|
408 |
pending = set(revision_ids) |
|
409 |
done = set() |
|
410 |
def find_parents(node_id): |
|
411 |
"""find the parents for node_id."""
|
|
412 |
for graph in graphs: |
|
413 |
try: |
|
414 |
return graph[node_id] |
|
415 |
except KeyError: |
|
416 |
pass
|
|
417 |
raise errors.NoSuchRevision(self._revision_sources[0], node_id) |
|
418 |
while len(pending): |
|
419 |
# all the graphs should have identical parent lists
|
|
420 |
node_id = pending.pop() |
|
421 |
try: |
|
422 |
parents = find_parents(node_id) |
|
423 |
for parent_node in parents: |
|
424 |
# queued or done?
|
|
425 |
if (parent_node not in pending and |
|
426 |
parent_node not in done): |
|
427 |
# no, queue
|
|
428 |
pending.add(parent_node) |
|
429 |
result.add_node(node_id, parents) |
|
430 |
done.add(node_id) |
|
431 |
except errors.NoSuchRevision: |
|
432 |
# ghost
|
|
433 |
result.add_ghost(node_id) |
|
434 |
continue
|
|
435 |
return result |
|
436 |
||
1587.1.4
by Robert Collins
Quick, urgent fix for common_ancestor performance. |
437 |
def lock_read(self): |
438 |
for source in self._revision_sources: |
|
439 |
source.lock_read() |
|
440 |
||
441 |
def unlock(self): |
|
442 |
for source in self._revision_sources: |
|
443 |
source.unlock() |
|
444 |
||
1590.1.1
by Robert Collins
Improve common_ancestor performance. |
445 |
|
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
446 |
def is_reserved_id(revision_id): |
2229.2.2
by Aaron Bentley
Update docs |
447 |
"""Determine whether a revision id is reserved
|
448 |
||
449 |
:return: True if the revision is is reserved, False otherwise
|
|
450 |
"""
|
|
451 |
return isinstance(revision_id, basestring) and revision_id.endswith(':') |
|
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
452 |
|
453 |
||
454 |
def check_not_reserved_id(revision_id): |
|
455 |
"""Raise ReservedId if the supplied revision_id is reserved"""
|
|
456 |
if is_reserved_id(revision_id): |
|
457 |
raise errors.ReservedId(revision_id) |
|
2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
458 |
|
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
459 |
|
2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
460 |
def ensure_null(revision_id): |
2999.1.2
by Ian Clatworthy
incorporate review feedback including basic blackbox tests |
461 |
"""Ensure only NULL_REVISION is used to represent the null revision"""
|
2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
462 |
if revision_id is None: |
2598.5.16
by Aaron Bentley
Replace exception with deprecation warning |
463 |
symbol_versioning.warn('NULL_REVISION should be used for the null' |
464 |
' revision instead of None, as of bzr 0.91.', |
|
465 |
DeprecationWarning, stacklevel=2) |
|
2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
466 |
return NULL_REVISION |
467 |
else: |
|
468 |
return revision_id |
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
469 |
|
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
470 |
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
471 |
def is_null(revision_id): |
2598.5.5
by Aaron Bentley
Convert assertion to deprecation warning |
472 |
if revision_id is None: |
473 |
symbol_versioning.warn('NULL_REVISION should be used for the null' |
|
2687.2.2
by Martin Pool
Fix up other references to 0.19 |
474 |
' revision instead of None, as of bzr 0.90.', |
2598.5.5
by Aaron Bentley
Convert assertion to deprecation warning |
475 |
DeprecationWarning, stacklevel=2) |
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
476 |
return revision_id in (None, NULL_REVISION) |