2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
1 |
# Copyright (C) 2007 Canonical Ltd
|
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 |
||
2490.2.30
by Aaron Bentley
Add functionality for tsorting graphs |
17 |
from bzrlib import ( |
18 |
errors, |
|
3052.1.3
by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests. |
19 |
revision, |
3099.3.3
by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map() |
20 |
symbol_versioning, |
2490.2.30
by Aaron Bentley
Add functionality for tsorting graphs |
21 |
tsort, |
22 |
)
|
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
23 |
from bzrlib.deprecated_graph import (node_distances, select_farthest) |
2490.2.1
by Aaron Bentley
Start work on GraphWalker |
24 |
|
2490.2.25
by Aaron Bentley
Update from review |
25 |
# DIAGRAM of terminology
|
26 |
# A
|
|
27 |
# /\
|
|
28 |
# B C
|
|
29 |
# | |\
|
|
30 |
# D E F
|
|
31 |
# |\/| |
|
|
32 |
# |/\|/
|
|
33 |
# G H
|
|
34 |
#
|
|
35 |
# In this diagram, relative to G and H:
|
|
36 |
# A, B, C, D, E are common ancestors.
|
|
37 |
# C, D and E are border ancestors, because each has a non-common descendant.
|
|
38 |
# D and E are least common ancestors because none of their descendants are
|
|
39 |
# common ancestors.
|
|
40 |
# C is not a least common ancestor because its descendant, E, is a common
|
|
41 |
# ancestor.
|
|
42 |
#
|
|
43 |
# The find_unique_lca algorithm will pick A in two steps:
|
|
44 |
# 1. find_lca('G', 'H') => ['D', 'E']
|
|
45 |
# 2. Since len(['D', 'E']) > 1, find_lca('D', 'E') => ['A']
|
|
46 |
||
47 |
||
2988.1.3
by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check. |
48 |
class DictParentsProvider(object): |
3172.1.2
by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a |
49 |
"""A parents provider for Graph objects."""
|
2988.1.3
by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check. |
50 |
|
51 |
def __init__(self, ancestry): |
|
52 |
self.ancestry = ancestry |
|
53 |
||
54 |
def __repr__(self): |
|
55 |
return 'DictParentsProvider(%r)' % self.ancestry |
|
56 |
||
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
57 |
def get_parent_map(self, keys): |
58 |
"""See _StackedParentsProvider.get_parent_map"""
|
|
59 |
ancestry = self.ancestry |
|
60 |
return dict((k, ancestry[k]) for k in keys if k in ancestry) |
|
61 |
||
2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
62 |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
63 |
class _StackedParentsProvider(object): |
64 |
||
65 |
def __init__(self, parent_providers): |
|
66 |
self._parent_providers = parent_providers |
|
67 |
||
2490.2.28
by Aaron Bentley
Fix handling of null revision |
68 |
def __repr__(self): |
69 |
return "_StackedParentsProvider(%r)" % self._parent_providers |
|
70 |
||
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
71 |
def get_parent_map(self, keys): |
72 |
"""Get a mapping of keys => parents
|
|
73 |
||
74 |
A dictionary is returned with an entry for each key present in this
|
|
75 |
source. If this source doesn't have information about a key, it should
|
|
76 |
not include an entry.
|
|
77 |
||
78 |
[NULL_REVISION] is used as the parent of the first user-committed
|
|
79 |
revision. Its parent list is empty.
|
|
80 |
||
81 |
:param keys: An iterable returning keys to check (eg revision_ids)
|
|
82 |
:return: A dictionary mapping each key to its parents
|
|
83 |
"""
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
84 |
found = {} |
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
85 |
remaining = set(keys) |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
86 |
for parents_provider in self._parent_providers: |
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
87 |
new_found = parents_provider.get_parent_map(remaining) |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
88 |
found.update(new_found) |
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
89 |
remaining.difference_update(new_found) |
90 |
if not remaining: |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
91 |
break
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
92 |
return found |
93 |
||
94 |
||
95 |
class CachingParentsProvider(object): |
|
96 |
"""A parents provider which will cache the revision => parents in a dict.
|
|
97 |
||
98 |
This is useful for providers that have an expensive lookup.
|
|
99 |
"""
|
|
100 |
||
101 |
def __init__(self, parent_provider): |
|
102 |
self._real_provider = parent_provider |
|
103 |
# Theoretically we could use an LRUCache here
|
|
104 |
self._cache = {} |
|
105 |
||
106 |
def __repr__(self): |
|
107 |
return "%s(%r)" % (self.__class__.__name__, self._real_provider) |
|
108 |
||
109 |
def get_parent_map(self, keys): |
|
110 |
"""See _StackedParentsProvider.get_parent_map"""
|
|
111 |
needed = set() |
|
112 |
# If the _real_provider doesn't have a key, we cache a value of None,
|
|
113 |
# which we then later use to realize we cannot provide a value for that
|
|
114 |
# key.
|
|
115 |
parent_map = {} |
|
116 |
cache = self._cache |
|
117 |
for key in keys: |
|
118 |
if key in cache: |
|
119 |
value = cache[key] |
|
120 |
if value is not None: |
|
121 |
parent_map[key] = value |
|
122 |
else: |
|
123 |
needed.add(key) |
|
124 |
||
125 |
if needed: |
|
126 |
new_parents = self._real_provider.get_parent_map(needed) |
|
127 |
cache.update(new_parents) |
|
128 |
parent_map.update(new_parents) |
|
129 |
needed.difference_update(new_parents) |
|
130 |
cache.update(dict.fromkeys(needed, None)) |
|
131 |
return parent_map |
|
132 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
133 |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
134 |
class Graph(object): |
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
135 |
"""Provide incremental access to revision graphs.
|
136 |
||
137 |
This is the generic implementation; it is intended to be subclassed to
|
|
138 |
specialize it for other repository types.
|
|
139 |
"""
|
|
2490.2.1
by Aaron Bentley
Start work on GraphWalker |
140 |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
141 |
def __init__(self, parents_provider): |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
142 |
"""Construct a Graph that uses several graphs as its input
|
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
143 |
|
144 |
This should not normally be invoked directly, because there may be
|
|
145 |
specialized implementations for particular repository types. See
|
|
3172.1.2
by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a |
146 |
Repository.get_graph().
|
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
147 |
|
3172.1.2
by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a |
148 |
:param parents_provider: An object providing a get_parent_map call
|
149 |
conforming to the behavior of
|
|
150 |
StackedParentsProvider.get_parent_map.
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
151 |
"""
|
3172.1.2
by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a |
152 |
if getattr(parents_provider, 'get_parents', None) is not None: |
153 |
self.get_parents = parents_provider.get_parents |
|
154 |
if getattr(parents_provider, 'get_parent_map', None) is not None: |
|
155 |
self.get_parent_map = parents_provider.get_parent_map |
|
2490.2.29
by Aaron Bentley
Make parents provider private |
156 |
self._parents_provider = parents_provider |
2490.2.28
by Aaron Bentley
Fix handling of null revision |
157 |
|
158 |
def __repr__(self): |
|
2490.2.29
by Aaron Bentley
Make parents provider private |
159 |
return 'Graph(%r)' % self._parents_provider |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
160 |
|
161 |
def find_lca(self, *revisions): |
|
162 |
"""Determine the lowest common ancestors of the provided revisions
|
|
163 |
||
164 |
A lowest common ancestor is a common ancestor none of whose
|
|
165 |
descendants are common ancestors. In graphs, unlike trees, there may
|
|
166 |
be multiple lowest common ancestors.
|
|
2490.2.12
by Aaron Bentley
Improve documentation |
167 |
|
168 |
This algorithm has two phases. Phase 1 identifies border ancestors,
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
169 |
and phase 2 filters border ancestors to determine lowest common
|
170 |
ancestors.
|
|
2490.2.12
by Aaron Bentley
Improve documentation |
171 |
|
172 |
In phase 1, border ancestors are identified, using a breadth-first
|
|
173 |
search starting at the bottom of the graph. Searches are stopped
|
|
174 |
whenever a node or one of its descendants is determined to be common
|
|
175 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
176 |
In phase 2, the border ancestors are filtered to find the least
|
2490.2.12
by Aaron Bentley
Improve documentation |
177 |
common ancestors. This is done by searching the ancestries of each
|
178 |
border ancestor.
|
|
179 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
180 |
Phase 2 is perfomed on the principle that a border ancestor that is
|
181 |
not an ancestor of any other border ancestor is a least common
|
|
182 |
ancestor.
|
|
2490.2.12
by Aaron Bentley
Improve documentation |
183 |
|
184 |
Searches are stopped when they find a node that is determined to be a
|
|
185 |
common ancestor of all border ancestors, because this shows that it
|
|
186 |
cannot be a descendant of any border ancestor.
|
|
187 |
||
188 |
The scaling of this operation should be proportional to
|
|
189 |
1. The number of uncommon ancestors
|
|
190 |
2. The number of border ancestors
|
|
191 |
3. The length of the shortest path between a border ancestor and an
|
|
192 |
ancestor of all border ancestors.
|
|
2490.2.3
by Aaron Bentley
Implement new merge base picker |
193 |
"""
|
2490.2.23
by Aaron Bentley
Adapt find_borders to produce a graph difference |
194 |
border_common, common, sides = self._find_border_ancestors(revisions) |
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
195 |
# We may have common ancestors that can be reached from each other.
|
196 |
# - ask for the heads of them to filter it down to only ones that
|
|
197 |
# cannot be reached from each other - phase 2.
|
|
198 |
return self.heads(border_common) |
|
2490.2.9
by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors |
199 |
|
2490.2.23
by Aaron Bentley
Adapt find_borders to produce a graph difference |
200 |
def find_difference(self, left_revision, right_revision): |
2490.2.25
by Aaron Bentley
Update from review |
201 |
"""Determine the graph difference between two revisions"""
|
2490.2.23
by Aaron Bentley
Adapt find_borders to produce a graph difference |
202 |
border, common, (left, right) = self._find_border_ancestors( |
203 |
[left_revision, right_revision]) |
|
204 |
return (left.difference(right).difference(common), |
|
205 |
right.difference(left).difference(common)) |
|
206 |
||
3172.1.2
by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a |
207 |
@symbol_versioning.deprecated_method(symbol_versioning.one_one) |
208 |
def get_parents(self, revisions): |
|
209 |
"""Find revision ids of the parents of a list of revisions
|
|
210 |
||
211 |
A list is returned of the same length as the input. Each entry
|
|
212 |
is a list of parent ids for the corresponding input revision.
|
|
213 |
||
214 |
[NULL_REVISION] is used as the parent of the first user-committed
|
|
215 |
revision. Its parent list is empty.
|
|
216 |
||
217 |
If the revision is not present (i.e. a ghost), None is used in place
|
|
218 |
of the list of parents.
|
|
219 |
||
220 |
Deprecated in bzr 1.2 - please see get_parent_map.
|
|
221 |
"""
|
|
222 |
parents = self.get_parent_map(revisions) |
|
223 |
return [parent.get(r, None) for r in revisions] |
|
224 |
||
225 |
def get_parent_map(self, revisions): |
|
226 |
"""Get a map of key:parent_list for revisions.
|
|
227 |
||
228 |
This implementation delegates to get_parents, for old parent_providers
|
|
229 |
that do not supply get_parent_map.
|
|
230 |
"""
|
|
231 |
result = {} |
|
232 |
for rev, parents in self.get_parents(revisions): |
|
233 |
if parents is not None: |
|
234 |
result[rev] = parents |
|
235 |
return result |
|
236 |
||
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
237 |
def _make_breadth_first_searcher(self, revisions): |
238 |
return _BreadthFirstSearcher(revisions, self) |
|
239 |
||
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
240 |
def _find_border_ancestors(self, revisions): |
2490.2.12
by Aaron Bentley
Improve documentation |
241 |
"""Find common ancestors with at least one uncommon descendant.
|
242 |
||
243 |
Border ancestors are identified using a breadth-first
|
|
244 |
search starting at the bottom of the graph. Searches are stopped
|
|
245 |
whenever a node or one of its descendants is determined to be common.
|
|
246 |
||
247 |
This will scale with the number of uncommon ancestors.
|
|
2490.2.25
by Aaron Bentley
Update from review |
248 |
|
249 |
As well as the border ancestors, a set of seen common ancestors and a
|
|
250 |
list of sets of seen ancestors for each input revision is returned.
|
|
251 |
This allows calculation of graph difference from the results of this
|
|
252 |
operation.
|
|
2490.2.12
by Aaron Bentley
Improve documentation |
253 |
"""
|
2490.2.28
by Aaron Bentley
Fix handling of null revision |
254 |
if None in revisions: |
255 |
raise errors.InvalidRevisionId(None, self) |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
256 |
common_searcher = self._make_breadth_first_searcher([]) |
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
257 |
common_ancestors = set() |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
258 |
searchers = [self._make_breadth_first_searcher([r]) |
259 |
for r in revisions] |
|
260 |
active_searchers = searchers[:] |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
261 |
border_ancestors = set() |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
262 |
def update_common(searcher, revisions): |
263 |
w_seen_ancestors = searcher.find_seen_ancestors( |
|
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
264 |
revision) |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
265 |
stopped = searcher.stop_searching_any(w_seen_ancestors) |
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
266 |
common_ancestors.update(w_seen_ancestors) |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
267 |
common_searcher.start_searching(stopped) |
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
268 |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
269 |
while True: |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
270 |
if len(active_searchers) == 0: |
2490.2.23
by Aaron Bentley
Adapt find_borders to produce a graph difference |
271 |
return border_ancestors, common_ancestors, [s.seen for s in |
272 |
searchers] |
|
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
273 |
try: |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
274 |
new_common = common_searcher.next() |
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
275 |
common_ancestors.update(new_common) |
276 |
except StopIteration: |
|
277 |
pass
|
|
278 |
else: |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
279 |
for searcher in active_searchers: |
280 |
for revision in new_common.intersection(searcher.seen): |
|
281 |
update_common(searcher, revision) |
|
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
282 |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
283 |
newly_seen = set() |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
284 |
new_active_searchers = [] |
285 |
for searcher in active_searchers: |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
286 |
try: |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
287 |
newly_seen.update(searcher.next()) |
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
288 |
except StopIteration: |
289 |
pass
|
|
290 |
else: |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
291 |
new_active_searchers.append(searcher) |
292 |
active_searchers = new_active_searchers |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
293 |
for revision in newly_seen: |
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
294 |
if revision in common_ancestors: |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
295 |
for searcher in searchers: |
296 |
update_common(searcher, revision) |
|
2490.2.19
by Aaron Bentley
Implement common-ancestor-based culling |
297 |
continue
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
298 |
for searcher in searchers: |
299 |
if revision not in searcher.seen: |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
300 |
break
|
301 |
else: |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
302 |
border_ancestors.add(revision) |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
303 |
for searcher in searchers: |
304 |
update_common(searcher, revision) |
|
2490.2.9
by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors |
305 |
|
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
306 |
def heads(self, keys): |
307 |
"""Return the heads from amongst keys.
|
|
308 |
||
309 |
This is done by searching the ancestries of each key. Any key that is
|
|
310 |
reachable from another key is not returned; all the others are.
|
|
311 |
||
312 |
This operation scales with the relative depth between any two keys. If
|
|
313 |
any two keys are completely disconnected all ancestry of both sides
|
|
314 |
will be retrieved.
|
|
315 |
||
316 |
:param keys: An iterable of keys.
|
|
2776.1.4
by Robert Collins
Trivial review feedback changes. |
317 |
:return: A set of the heads. Note that as a set there is no ordering
|
318 |
information. Callers will need to filter their input to create
|
|
319 |
order if they need it.
|
|
2490.2.12
by Aaron Bentley
Improve documentation |
320 |
"""
|
2776.1.4
by Robert Collins
Trivial review feedback changes. |
321 |
candidate_heads = set(keys) |
3052.5.5
by John Arbash Meinel
Special case Graph.heads() for NULL_REVISION rather than is_ancestor. |
322 |
if revision.NULL_REVISION in candidate_heads: |
323 |
# NULL_REVISION is only a head if it is the only entry
|
|
324 |
candidate_heads.remove(revision.NULL_REVISION) |
|
325 |
if not candidate_heads: |
|
326 |
return set([revision.NULL_REVISION]) |
|
2850.2.1
by Robert Collins
(robertc) Special case the zero-or-no-heads case for Graph.heads(). (Robert Collins) |
327 |
if len(candidate_heads) < 2: |
328 |
return candidate_heads |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
329 |
searchers = dict((c, self._make_breadth_first_searcher([c])) |
2776.1.4
by Robert Collins
Trivial review feedback changes. |
330 |
for c in candidate_heads) |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
331 |
active_searchers = dict(searchers) |
332 |
# skip over the actual candidate for each searcher
|
|
333 |
for searcher in active_searchers.itervalues(): |
|
1551.15.81
by Aaron Bentley
Remove testing code |
334 |
searcher.next() |
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
335 |
# The common walker finds nodes that are common to two or more of the
|
336 |
# input keys, so that we don't access all history when a currently
|
|
337 |
# uncommon search point actually meets up with something behind a
|
|
338 |
# common search point. Common search points do not keep searches
|
|
339 |
# active; they just allow us to make searches inactive without
|
|
340 |
# accessing all history.
|
|
341 |
common_walker = self._make_breadth_first_searcher([]) |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
342 |
while len(active_searchers) > 0: |
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
343 |
ancestors = set() |
344 |
# advance searches
|
|
345 |
try: |
|
346 |
common_walker.next() |
|
347 |
except StopIteration: |
|
2921.3.4
by Robert Collins
Review feedback. |
348 |
# No common points being searched at this time.
|
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
349 |
pass
|
1551.15.78
by Aaron Bentley
Fix KeyError in filter_candidate_lca |
350 |
for candidate in active_searchers.keys(): |
351 |
try: |
|
352 |
searcher = active_searchers[candidate] |
|
353 |
except KeyError: |
|
354 |
# rare case: we deleted candidate in a previous iteration
|
|
355 |
# through this for loop, because it was determined to be
|
|
356 |
# a descendant of another candidate.
|
|
357 |
continue
|
|
2490.2.9
by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors |
358 |
try: |
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
359 |
ancestors.update(searcher.next()) |
2490.2.9
by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors |
360 |
except StopIteration: |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
361 |
del active_searchers[candidate] |
2490.2.9
by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors |
362 |
continue
|
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
363 |
# process found nodes
|
364 |
new_common = set() |
|
365 |
for ancestor in ancestors: |
|
366 |
if ancestor in candidate_heads: |
|
367 |
candidate_heads.remove(ancestor) |
|
368 |
del searchers[ancestor] |
|
369 |
if ancestor in active_searchers: |
|
370 |
del active_searchers[ancestor] |
|
371 |
# it may meet up with a known common node
|
|
2921.3.4
by Robert Collins
Review feedback. |
372 |
if ancestor in common_walker.seen: |
373 |
# some searcher has encountered our known common nodes:
|
|
374 |
# just stop it
|
|
375 |
ancestor_set = set([ancestor]) |
|
376 |
for searcher in searchers.itervalues(): |
|
377 |
searcher.stop_searching_any(ancestor_set) |
|
378 |
else: |
|
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
379 |
# or it may have been just reached by all the searchers:
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
380 |
for searcher in searchers.itervalues(): |
381 |
if ancestor not in searcher.seen: |
|
2490.2.9
by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors |
382 |
break
|
383 |
else: |
|
2921.3.4
by Robert Collins
Review feedback. |
384 |
# The final active searcher has just reached this node,
|
385 |
# making it be known as a descendant of all candidates,
|
|
386 |
# so we can stop searching it, and any seen ancestors
|
|
387 |
new_common.add(ancestor) |
|
388 |
for searcher in searchers.itervalues(): |
|
389 |
seen_ancestors =\ |
|
390 |
searcher.find_seen_ancestors(ancestor) |
|
391 |
searcher.stop_searching_any(seen_ancestors) |
|
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
392 |
common_walker.start_searching(new_common) |
2776.1.4
by Robert Collins
Trivial review feedback changes. |
393 |
return candidate_heads |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
394 |
|
1551.19.10
by Aaron Bentley
Merge now warns when it encounters a criss-cross |
395 |
def find_unique_lca(self, left_revision, right_revision, |
396 |
count_steps=False): |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
397 |
"""Find a unique LCA.
|
398 |
||
399 |
Find lowest common ancestors. If there is no unique common
|
|
400 |
ancestor, find the lowest common ancestors of those ancestors.
|
|
401 |
||
402 |
Iteration stops when a unique lowest common ancestor is found.
|
|
403 |
The graph origin is necessarily a unique lowest common ancestor.
|
|
2490.2.5
by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base |
404 |
|
405 |
Note that None is not an acceptable substitute for NULL_REVISION.
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
406 |
in the input for this method.
|
1551.19.12
by Aaron Bentley
Add documentation for the count_steps parameter of Graph.find_unique_lca |
407 |
|
408 |
:param count_steps: If True, the return value will be a tuple of
|
|
409 |
(unique_lca, steps) where steps is the number of times that
|
|
410 |
find_lca was run. If False, only unique_lca is returned.
|
|
2490.2.3
by Aaron Bentley
Implement new merge base picker |
411 |
"""
|
412 |
revisions = [left_revision, right_revision] |
|
1551.19.10
by Aaron Bentley
Merge now warns when it encounters a criss-cross |
413 |
steps = 0 |
2490.2.3
by Aaron Bentley
Implement new merge base picker |
414 |
while True: |
1551.19.10
by Aaron Bentley
Merge now warns when it encounters a criss-cross |
415 |
steps += 1 |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
416 |
lca = self.find_lca(*revisions) |
417 |
if len(lca) == 1: |
|
1551.19.10
by Aaron Bentley
Merge now warns when it encounters a criss-cross |
418 |
result = lca.pop() |
419 |
if count_steps: |
|
420 |
return result, steps |
|
421 |
else: |
|
422 |
return result |
|
2520.4.104
by Aaron Bentley
Avoid infinite loop when there is no unique lca |
423 |
if len(lca) == 0: |
424 |
raise errors.NoCommonAncestor(left_revision, right_revision) |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
425 |
revisions = lca |
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
426 |
|
3228.4.4
by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node, |
427 |
def iter_ancestry(self, revision_ids): |
3228.4.2
by John Arbash Meinel
Add a Graph.iter_ancestry() |
428 |
"""Iterate the ancestry of this revision.
|
429 |
||
3228.4.4
by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node, |
430 |
:param revision_ids: Nodes to start the search
|
3228.4.2
by John Arbash Meinel
Add a Graph.iter_ancestry() |
431 |
:return: Yield tuples mapping a revision_id to its parents for the
|
432 |
ancestry of revision_id.
|
|
3228.4.10
by John Arbash Meinel
Respond to abentley's review comments. |
433 |
Ghosts will be returned with None as their parents, and nodes
|
3228.4.4
by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node, |
434 |
with no parents will have NULL_REVISION as their only parent. (As
|
435 |
defined by get_parent_map.)
|
|
3228.4.10
by John Arbash Meinel
Respond to abentley's review comments. |
436 |
There will also be a node for (NULL_REVISION, ())
|
3228.4.2
by John Arbash Meinel
Add a Graph.iter_ancestry() |
437 |
"""
|
3228.4.4
by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node, |
438 |
pending = set(revision_ids) |
3228.4.2
by John Arbash Meinel
Add a Graph.iter_ancestry() |
439 |
processed = set() |
440 |
while pending: |
|
441 |
processed.update(pending) |
|
442 |
next_map = self.get_parent_map(pending) |
|
443 |
next_pending = set() |
|
444 |
for item in next_map.iteritems(): |
|
445 |
yield item |
|
446 |
next_pending.update(p for p in item[1] if p not in processed) |
|
447 |
ghosts = pending.difference(next_map) |
|
448 |
for ghost in ghosts: |
|
3228.4.10
by John Arbash Meinel
Respond to abentley's review comments. |
449 |
yield (ghost, None) |
3228.4.2
by John Arbash Meinel
Add a Graph.iter_ancestry() |
450 |
pending = next_pending |
451 |
||
2490.2.31
by Aaron Bentley
Fix iter_topo_order to permit un-included parents |
452 |
def iter_topo_order(self, revisions): |
2490.2.30
by Aaron Bentley
Add functionality for tsorting graphs |
453 |
"""Iterate through the input revisions in topological order.
|
454 |
||
455 |
This sorting only ensures that parents come before their children.
|
|
456 |
An ancestor may sort after a descendant if the relationship is not
|
|
457 |
visible in the supplied list of revisions.
|
|
458 |
"""
|
|
3099.3.3
by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map() |
459 |
sorter = tsort.TopoSorter(self.get_parent_map(revisions)) |
2490.2.34
by Aaron Bentley
Update NEWS and change implementation to return an iterator |
460 |
return sorter.iter_topo_order() |
2490.2.30
by Aaron Bentley
Add functionality for tsorting graphs |
461 |
|
2653.2.1
by Aaron Bentley
Implement Graph.is_ancestor |
462 |
def is_ancestor(self, candidate_ancestor, candidate_descendant): |
2653.2.5
by Aaron Bentley
Update to clarify algorithm |
463 |
"""Determine whether a revision is an ancestor of another.
|
464 |
||
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
465 |
We answer this using heads() as heads() has the logic to perform the
|
3078.2.6
by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review |
466 |
smallest number of parent lookups to determine the ancestral
|
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
467 |
relationship between N revisions.
|
2653.2.5
by Aaron Bentley
Update to clarify algorithm |
468 |
"""
|
2921.3.1
by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all |
469 |
return set([candidate_descendant]) == self.heads( |
470 |
[candidate_ancestor, candidate_descendant]) |
|
2653.2.1
by Aaron Bentley
Implement Graph.is_ancestor |
471 |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
472 |
|
2911.4.1
by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit. |
473 |
class HeadsCache(object): |
474 |
"""A cache of results for graph heads calls."""
|
|
475 |
||
476 |
def __init__(self, graph): |
|
477 |
self.graph = graph |
|
478 |
self._heads = {} |
|
479 |
||
480 |
def heads(self, keys): |
|
481 |
"""Return the heads of keys.
|
|
482 |
||
2911.4.3
by Robert Collins
Make the contract of HeadsCache.heads() more clear. |
483 |
This matches the API of Graph.heads(), specifically the return value is
|
484 |
a set which can be mutated, and ordering of the input is not preserved
|
|
485 |
in the output.
|
|
486 |
||
2911.4.1
by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit. |
487 |
:see also: Graph.heads.
|
488 |
:param keys: The keys to calculate heads for.
|
|
489 |
:return: A set containing the heads, which may be mutated without
|
|
490 |
affecting future lookups.
|
|
491 |
"""
|
|
2911.4.2
by Robert Collins
Make HeadsCache actually work. |
492 |
keys = frozenset(keys) |
2911.4.1
by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit. |
493 |
try: |
494 |
return set(self._heads[keys]) |
|
495 |
except KeyError: |
|
496 |
heads = self.graph.heads(keys) |
|
497 |
self._heads[keys] = heads |
|
498 |
return set(heads) |
|
499 |
||
500 |
||
3224.1.20
by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers |
501 |
class FrozenHeadsCache(object): |
502 |
"""Cache heads() calls, assuming the caller won't modify them."""
|
|
503 |
||
504 |
def __init__(self, graph): |
|
505 |
self.graph = graph |
|
506 |
self._heads = {} |
|
507 |
||
508 |
def heads(self, keys): |
|
509 |
"""Return the heads of keys.
|
|
510 |
||
3224.1.24
by John Arbash Meinel
Fix up docstring since FrozenHeadsCache doesn't let you mutate the result. |
511 |
Similar to Graph.heads(). The main difference is that the return value
|
512 |
is a frozen set which cannot be mutated.
|
|
3224.1.20
by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers |
513 |
|
514 |
:see also: Graph.heads.
|
|
515 |
:param keys: The keys to calculate heads for.
|
|
3224.1.24
by John Arbash Meinel
Fix up docstring since FrozenHeadsCache doesn't let you mutate the result. |
516 |
:return: A frozenset containing the heads.
|
3224.1.20
by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers |
517 |
"""
|
518 |
keys = frozenset(keys) |
|
519 |
try: |
|
520 |
return self._heads[keys] |
|
521 |
except KeyError: |
|
522 |
heads = frozenset(self.graph.heads(keys)) |
|
523 |
self._heads[keys] = heads |
|
524 |
return heads |
|
525 |
||
526 |
def cache(self, keys, heads): |
|
527 |
"""Store a known value."""
|
|
528 |
self._heads[frozenset(keys)] = frozenset(heads) |
|
529 |
||
530 |
||
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
531 |
class _BreadthFirstSearcher(object): |
2921.3.4
by Robert Collins
Review feedback. |
532 |
"""Parallel search breadth-first the ancestry of revisions.
|
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
533 |
|
534 |
This class implements the iterator protocol, but additionally
|
|
535 |
1. provides a set of seen ancestors, and
|
|
536 |
2. allows some ancestries to be unsearched, via stop_searching_any
|
|
537 |
"""
|
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
538 |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
539 |
def __init__(self, revisions, parents_provider): |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
540 |
self._iterations = 0 |
541 |
self._next_query = set(revisions) |
|
542 |
self.seen = set() |
|
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
543 |
self._started_keys = set(self._next_query) |
544 |
self._stopped_keys = set() |
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
545 |
self._parents_provider = parents_provider |
3177.3.3
by Robert Collins
Review feedback. |
546 |
self._returning = 'next_with_ghosts' |
3184.1.2
by Robert Collins
Add tests for starting and stopping searches in combination with get_recipe. |
547 |
self._current_present = set() |
548 |
self._current_ghosts = set() |
|
549 |
self._current_parents = {} |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
550 |
|
551 |
def __repr__(self): |
|
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
552 |
if self._iterations: |
553 |
prefix = "searching" |
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
554 |
else: |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
555 |
prefix = "starting" |
556 |
search = '%s=%r' % (prefix, list(self._next_query)) |
|
557 |
return ('_BreadthFirstSearcher(iterations=%d, %s,' |
|
558 |
' seen=%r)' % (self._iterations, search, list(self.seen))) |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
559 |
|
3184.1.6
by Robert Collins
Create a SearchResult object which can be used as a replacement for sets. |
560 |
def get_result(self): |
561 |
"""Get a SearchResult for the current state of this searcher.
|
|
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
562 |
|
3184.1.6
by Robert Collins
Create a SearchResult object which can be used as a replacement for sets. |
563 |
:return: A SearchResult for this search so far. The SearchResult is
|
564 |
static - the search can be advanced and the search result will not
|
|
565 |
be invalidated or altered.
|
|
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
566 |
"""
|
567 |
if self._returning == 'next': |
|
568 |
# We have to know the current nodes children to be able to list the
|
|
569 |
# exclude keys for them. However, while we could have a second
|
|
570 |
# look-ahead result buffer and shuffle things around, this method
|
|
571 |
# is typically only called once per search - when memoising the
|
|
3211.5.1
by Robert Collins
Change the smart server get_parents method to take a graph search to exclude already recieved parents from. This prevents history shortcuts causing huge numbers of duplicates. |
572 |
# results of the search.
|
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
573 |
found, ghosts, next, parents = self._do_query(self._next_query) |
574 |
# pretend we didn't query: perhaps we should tweak _do_query to be
|
|
575 |
# entirely stateless?
|
|
576 |
self.seen.difference_update(next) |
|
3184.1.3
by Robert Collins
Automatically exclude ghosts. |
577 |
next_query = next.union(ghosts) |
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
578 |
else: |
579 |
next_query = self._next_query |
|
3184.1.5
by Robert Collins
Record the number of found revisions for cross checking. |
580 |
excludes = self._stopped_keys.union(next_query) |
3184.1.6
by Robert Collins
Create a SearchResult object which can be used as a replacement for sets. |
581 |
included_keys = self.seen.difference(excludes) |
582 |
return SearchResult(self._started_keys, excludes, len(included_keys), |
|
583 |
included_keys) |
|
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
584 |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
585 |
def next(self): |
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
586 |
"""Return the next ancestors of this revision.
|
587 |
||
2490.2.12
by Aaron Bentley
Improve documentation |
588 |
Ancestors are returned in the order they are seen in a breadth-first
|
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
589 |
traversal. No ancestor will be returned more than once. Ancestors are
|
590 |
returned before their parentage is queried, so ghosts and missing
|
|
591 |
revisions (including the start revisions) are included in the result.
|
|
592 |
This can save a round trip in LCA style calculation by allowing
|
|
593 |
convergence to be detected without reading the data for the revision
|
|
594 |
the convergence occurs on.
|
|
595 |
||
596 |
:return: A set of revision_ids.
|
|
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
597 |
"""
|
3177.3.3
by Robert Collins
Review feedback. |
598 |
if self._returning != 'next': |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
599 |
# switch to returning the query, not the results.
|
3177.3.3
by Robert Collins
Review feedback. |
600 |
self._returning = 'next' |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
601 |
self._iterations += 1 |
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
602 |
else: |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
603 |
self._advance() |
604 |
if len(self._next_query) == 0: |
|
605 |
raise StopIteration() |
|
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
606 |
# We have seen what we're querying at this point as we are returning
|
607 |
# the query, not the results.
|
|
608 |
self.seen.update(self._next_query) |
|
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
609 |
return self._next_query |
610 |
||
611 |
def next_with_ghosts(self): |
|
612 |
"""Return the next found ancestors, with ghosts split out.
|
|
613 |
|
|
614 |
Ancestors are returned in the order they are seen in a breadth-first
|
|
615 |
traversal. No ancestor will be returned more than once. Ancestors are
|
|
3177.3.3
by Robert Collins
Review feedback. |
616 |
returned only after asking for their parents, which allows us to detect
|
617 |
which revisions are ghosts and which are not.
|
|
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
618 |
|
619 |
:return: A tuple with (present ancestors, ghost ancestors) sets.
|
|
620 |
"""
|
|
3177.3.3
by Robert Collins
Review feedback. |
621 |
if self._returning != 'next_with_ghosts': |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
622 |
# switch to returning the results, not the current query.
|
3177.3.3
by Robert Collins
Review feedback. |
623 |
self._returning = 'next_with_ghosts' |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
624 |
self._advance() |
625 |
if len(self._next_query) == 0: |
|
626 |
raise StopIteration() |
|
627 |
self._advance() |
|
628 |
return self._current_present, self._current_ghosts |
|
629 |
||
630 |
def _advance(self): |
|
631 |
"""Advance the search.
|
|
632 |
||
633 |
Updates self.seen, self._next_query, self._current_present,
|
|
3177.3.3
by Robert Collins
Review feedback. |
634 |
self._current_ghosts, self._current_parents and self._iterations.
|
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
635 |
"""
|
636 |
self._iterations += 1 |
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
637 |
found, ghosts, next, parents = self._do_query(self._next_query) |
638 |
self._current_present = found |
|
639 |
self._current_ghosts = ghosts |
|
640 |
self._next_query = next |
|
641 |
self._current_parents = parents |
|
3184.1.3
by Robert Collins
Automatically exclude ghosts. |
642 |
# ghosts are implicit stop points, otherwise the search cannot be
|
643 |
# repeated when ghosts are filled.
|
|
644 |
self._stopped_keys.update(ghosts) |
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
645 |
|
646 |
def _do_query(self, revisions): |
|
647 |
"""Query for revisions.
|
|
648 |
||
3184.1.4
by Robert Collins
Correctly exclude ghosts when ghosts are started on an existing search. |
649 |
Adds revisions to the seen set.
|
650 |
||
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
651 |
:param revisions: Revisions to query.
|
652 |
:return: A tuple: (set(found_revisions), set(ghost_revisions),
|
|
653 |
set(parents_of_found_revisions), dict(found_revisions:parents)).
|
|
654 |
"""
|
|
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
655 |
found_parents = set() |
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
656 |
parents_of_found = set() |
3184.1.1
by Robert Collins
Add basic get_recipe to the graph breadth first searcher. |
657 |
# revisions may contain nodes that point to other nodes in revisions:
|
658 |
# we want to filter them out.
|
|
659 |
self.seen.update(revisions) |
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
660 |
parent_map = self._parents_provider.get_parent_map(revisions) |
3177.3.1
by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects |
661 |
for rev_id, parents in parent_map.iteritems(): |
662 |
found_parents.add(rev_id) |
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
663 |
parents_of_found.update(p for p in parents if p not in self.seen) |
664 |
ghost_parents = revisions - found_parents |
|
665 |
return found_parents, ghost_parents, parents_of_found, parent_map |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
666 |
|
2490.2.8
by Aaron Bentley
fix iteration stuff |
667 |
def __iter__(self): |
668 |
return self |
|
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
669 |
|
670 |
def find_seen_ancestors(self, revision): |
|
2490.2.25
by Aaron Bentley
Update from review |
671 |
"""Find ancestors of this revision that have already been seen."""
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
672 |
searcher = _BreadthFirstSearcher([revision], self._parents_provider) |
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
673 |
seen_ancestors = set() |
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
674 |
for ancestors in searcher: |
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
675 |
for ancestor in ancestors: |
676 |
if ancestor not in self.seen: |
|
2490.2.22
by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher |
677 |
searcher.stop_searching_any([ancestor]) |
2490.2.7
by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors |
678 |
else: |
679 |
seen_ancestors.add(ancestor) |
|
680 |
return seen_ancestors |
|
681 |
||
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
682 |
def stop_searching_any(self, revisions): |
683 |
"""
|
|
684 |
Remove any of the specified revisions from the search list.
|
|
685 |
||
686 |
None of the specified revisions are required to be present in the
|
|
2490.2.12
by Aaron Bentley
Improve documentation |
687 |
search list. In this case, the call is a no-op.
|
2490.2.10
by Aaron Bentley
Clarify text, remove unused _get_ancestry method |
688 |
"""
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
689 |
revisions = frozenset(revisions) |
3177.3.3
by Robert Collins
Review feedback. |
690 |
if self._returning == 'next': |
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
691 |
stopped = self._next_query.intersection(revisions) |
692 |
self._next_query = self._next_query.difference(revisions) |
|
693 |
else: |
|
3184.2.1
by Robert Collins
Handle stopping ghosts in searches properly. |
694 |
stopped_present = self._current_present.intersection(revisions) |
695 |
stopped = stopped_present.union( |
|
696 |
self._current_ghosts.intersection(revisions)) |
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
697 |
self._current_present.difference_update(stopped) |
698 |
self._current_ghosts.difference_update(stopped) |
|
699 |
# stopping 'x' should stop returning parents of 'x', but
|
|
700 |
# not if 'y' always references those same parents
|
|
701 |
stop_rev_references = {} |
|
3184.2.1
by Robert Collins
Handle stopping ghosts in searches properly. |
702 |
for rev in stopped_present: |
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
703 |
for parent_id in self._current_parents[rev]: |
704 |
if parent_id not in stop_rev_references: |
|
705 |
stop_rev_references[parent_id] = 0 |
|
706 |
stop_rev_references[parent_id] += 1 |
|
707 |
# if only the stopped revisions reference it, the ref count will be
|
|
708 |
# 0 after this loop
|
|
3177.3.3
by Robert Collins
Review feedback. |
709 |
for parents in self._current_parents.itervalues(): |
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
710 |
for parent_id in parents: |
711 |
try: |
|
712 |
stop_rev_references[parent_id] -= 1 |
|
713 |
except KeyError: |
|
714 |
pass
|
|
715 |
stop_parents = set() |
|
716 |
for rev_id, refs in stop_rev_references.iteritems(): |
|
717 |
if refs == 0: |
|
718 |
stop_parents.add(rev_id) |
|
719 |
self._next_query.difference_update(stop_parents) |
|
3184.1.2
by Robert Collins
Add tests for starting and stopping searches in combination with get_recipe. |
720 |
self._stopped_keys.update(stopped) |
2490.2.25
by Aaron Bentley
Update from review |
721 |
return stopped |
2490.2.17
by Aaron Bentley
Add start_searching, tweak stop_searching_any |
722 |
|
723 |
def start_searching(self, revisions): |
|
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
724 |
"""Add revisions to the search.
|
725 |
||
726 |
The parents of revisions will be returned from the next call to next()
|
|
727 |
or next_with_ghosts(). If next_with_ghosts was the most recently used
|
|
728 |
next* call then the return value is the result of looking up the
|
|
729 |
ghost/not ghost status of revisions. (A tuple (present, ghosted)).
|
|
730 |
"""
|
|
731 |
revisions = frozenset(revisions) |
|
3184.1.2
by Robert Collins
Add tests for starting and stopping searches in combination with get_recipe. |
732 |
self._started_keys.update(revisions) |
3184.1.4
by Robert Collins
Correctly exclude ghosts when ghosts are started on an existing search. |
733 |
new_revisions = revisions.difference(self.seen) |
734 |
revs, ghosts, query, parents = self._do_query(revisions) |
|
735 |
self._stopped_keys.update(ghosts) |
|
3177.3.3
by Robert Collins
Review feedback. |
736 |
if self._returning == 'next': |
3184.1.4
by Robert Collins
Correctly exclude ghosts when ghosts are started on an existing search. |
737 |
self._next_query.update(new_revisions) |
3177.3.2
by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts. |
738 |
else: |
739 |
# perform a query on revisions
|
|
740 |
self._current_present.update(revs) |
|
741 |
self._current_ghosts.update(ghosts) |
|
742 |
self._next_query.update(query) |
|
743 |
self._current_parents.update(parents) |
|
744 |
return revs, ghosts |
|
3184.1.6
by Robert Collins
Create a SearchResult object which can be used as a replacement for sets. |
745 |
|
746 |
||
747 |
class SearchResult(object): |
|
748 |
"""The result of a breadth first search.
|
|
749 |
||
750 |
A SearchResult provides the ability to reconstruct the search or access a
|
|
751 |
set of the keys the search found.
|
|
752 |
"""
|
|
753 |
||
754 |
def __init__(self, start_keys, exclude_keys, key_count, keys): |
|
755 |
"""Create a SearchResult.
|
|
756 |
||
757 |
:param start_keys: The keys the search started at.
|
|
758 |
:param exclude_keys: The keys the search excludes.
|
|
759 |
:param key_count: The total number of keys (from start to but not
|
|
760 |
including exclude).
|
|
761 |
:param keys: The keys the search found. Note that in future we may get
|
|
762 |
a SearchResult from a smart server, in which case the keys list is
|
|
763 |
not necessarily immediately available.
|
|
764 |
"""
|
|
765 |
self._recipe = (start_keys, exclude_keys, key_count) |
|
766 |
self._keys = frozenset(keys) |
|
767 |
||
768 |
def get_recipe(self): |
|
769 |
"""Return a recipe that can be used to replay this search.
|
|
770 |
|
|
771 |
The recipe allows reconstruction of the same results at a later date
|
|
772 |
without knowing all the found keys. The essential elements are a list
|
|
773 |
of keys to start and and to stop at. In order to give reproducible
|
|
774 |
results when ghosts are encountered by a search they are automatically
|
|
775 |
added to the exclude list (or else ghost filling may alter the
|
|
776 |
results).
|
|
777 |
||
778 |
:return: A tuple (start_keys_set, exclude_keys_set, revision_count). To
|
|
779 |
recreate the results of this search, create a breadth first
|
|
780 |
searcher on the same graph starting at start_keys. Then call next()
|
|
781 |
(or next_with_ghosts()) repeatedly, and on every result, call
|
|
782 |
stop_searching_any on any keys from the exclude_keys set. The
|
|
783 |
revision_count value acts as a trivial cross-check - the found
|
|
784 |
revisions of the new search should have as many elements as
|
|
785 |
revision_count. If it does not, then additional revisions have been
|
|
786 |
ghosted since the search was executed the first time and the second
|
|
787 |
time.
|
|
788 |
"""
|
|
789 |
return self._recipe |
|
790 |
||
791 |
def get_keys(self): |
|
792 |
"""Return the keys found in this search.
|
|
793 |
||
794 |
:return: A set of keys.
|
|
795 |
"""
|
|
796 |
return self._keys |
|
797 |