/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
3377.4.5 by John Arbash Meinel
Several updates. A bit more debug logging, only step the all_unique searcher 1/10th of the time.
17
import time
18
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
19
from bzrlib import (
3377.3.33 by John Arbash Meinel
Add some logging with -Dgraph
20
    debug,
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
21
    errors,
3052.1.3 by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests.
22
    revision,
3099.3.3 by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map()
23
    symbol_versioning,
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
24
    trace,
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
25
    tsort,
26
    )
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
27
from bzrlib.deprecated_graph import (node_distances, select_farthest)
2490.2.1 by Aaron Bentley
Start work on GraphWalker
28
3377.4.9 by John Arbash Meinel
STEP every 5
29
STEP_UNIQUE_SEARCHER_EVERY = 5
3377.4.5 by John Arbash Meinel
Several updates. A bit more debug logging, only step the all_unique searcher 1/10th of the time.
30
2490.2.25 by Aaron Bentley
Update from review
31
# DIAGRAM of terminology
32
#       A
33
#       /\
34
#      B  C
35
#      |  |\
36
#      D  E F
37
#      |\/| |
38
#      |/\|/
39
#      G  H
40
#
41
# In this diagram, relative to G and H:
42
# A, B, C, D, E are common ancestors.
43
# C, D and E are border ancestors, because each has a non-common descendant.
44
# D and E are least common ancestors because none of their descendants are
45
# common ancestors.
46
# C is not a least common ancestor because its descendant, E, is a common
47
# ancestor.
48
#
49
# The find_unique_lca algorithm will pick A in two steps:
50
# 1. find_lca('G', 'H') => ['D', 'E']
51
# 2. Since len(['D', 'E']) > 1, find_lca('D', 'E') => ['A']
52
53
2988.1.3 by Robert Collins
Add a new repositoy method _generate_text_key_index for use by reconcile/check.
54
class DictParentsProvider(object):
3172.1.2 by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a
55
    """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.
56
57
    def __init__(self, ancestry):
58
        self.ancestry = ancestry
59
60
    def __repr__(self):
61
        return 'DictParentsProvider(%r)' % self.ancestry
62
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
63
    def get_parent_map(self, keys):
64
        """See _StackedParentsProvider.get_parent_map"""
65
        ancestry = self.ancestry
66
        return dict((k, ancestry[k]) for k in keys if k in ancestry)
67
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
68
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
69
class _StackedParentsProvider(object):
70
71
    def __init__(self, parent_providers):
72
        self._parent_providers = parent_providers
73
2490.2.28 by Aaron Bentley
Fix handling of null revision
74
    def __repr__(self):
75
        return "_StackedParentsProvider(%r)" % self._parent_providers
76
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
77
    def get_parent_map(self, keys):
78
        """Get a mapping of keys => parents
79
80
        A dictionary is returned with an entry for each key present in this
81
        source. If this source doesn't have information about a key, it should
82
        not include an entry.
83
84
        [NULL_REVISION] is used as the parent of the first user-committed
85
        revision.  Its parent list is empty.
86
87
        :param keys: An iterable returning keys to check (eg revision_ids)
88
        :return: A dictionary mapping each key to its parents
89
        """
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
90
        found = {}
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
91
        remaining = set(keys)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
92
        for parents_provider in self._parent_providers:
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
93
            new_found = parents_provider.get_parent_map(remaining)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
94
            found.update(new_found)
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
95
            remaining.difference_update(new_found)
96
            if not remaining:
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
97
                break
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
98
        return found
99
100
101
class CachingParentsProvider(object):
3835.1.13 by Aaron Bentley
Update documentation
102
    """A parents provider which will cache the revision => parents as a dict.
103
104
    This is useful for providers which have an expensive look up.
105
106
    Either a ParentsProvider or a get_parent_map-like callback may be
107
    supplied.  If it provides extra un-asked-for parents, they will be cached,
108
    but filtered out of get_parent_map.
3835.1.16 by Aaron Bentley
Updates from review
109
110
    The cache is enabled by default, but may be disabled and re-enabled.
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
111
    """
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
112
    def __init__(self, parent_provider=None, get_parent_map=None, debug=False):
3835.1.13 by Aaron Bentley
Update documentation
113
        """Constructor.
114
115
        :param parent_provider: The ParentProvider to use.  It or
116
            get_parent_map must be supplied.
117
        :param get_parent_map: The get_parent_map callback to use.  It or
118
            parent_provider must be supplied.
119
        :param debug: If true, mutter debugging messages.
120
        """
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
121
        self._real_provider = parent_provider
122
        if get_parent_map is None:
123
            self._get_parent_map = self._real_provider.get_parent_map
124
        else:
125
            self._get_parent_map = get_parent_map
3835.1.16 by Aaron Bentley
Updates from review
126
        self._cache = {}
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
127
        self._cache_misses = True
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
128
        self._debug = debug
129
        if self._debug:
130
            self._requested_parents = None
131
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
132
    def __repr__(self):
133
        return "%s(%r)" % (self.__class__.__name__, self._real_provider)
134
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
135
    def enable_cache(self, cache_misses=True):
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
136
        """Enable cache."""
3835.1.16 by Aaron Bentley
Updates from review
137
        self._cache = {}
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
138
        self._cache_misses = cache_misses
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
139
        if self._debug:
140
            self._requested_parents = set()
141
142
    def disable_cache(self):
3835.1.16 by Aaron Bentley
Updates from review
143
        """Disable and clear the cache."""
144
        self._cache = None
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
145
        if self._debug:
146
            self._requested_parents = None
147
148
    def get_cached_map(self):
149
        """Return any cached get_parent_map values."""
3835.1.16 by Aaron Bentley
Updates from review
150
        if self._cache is None:
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
151
            return None
3835.1.16 by Aaron Bentley
Updates from review
152
        return dict((k, v) for k, v in self._cache.items()
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
153
                    if v is not None)
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
154
155
    def get_parent_map(self, keys):
3835.1.16 by Aaron Bentley
Updates from review
156
        """See _StackedParentsProvider.get_parent_map."""
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
157
        # Hack to build up the caching logic.
3835.1.16 by Aaron Bentley
Updates from review
158
        ancestry = self._cache
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
159
        if ancestry is None:
160
            # Caching is disabled.
161
            missing_revisions = set(keys)
162
            ancestry = {}
163
        else:
164
            missing_revisions = set(key for key in keys if key not in ancestry)
165
        if missing_revisions:
166
            parent_map = self._get_parent_map(missing_revisions)
167
            if self._debug:
168
                mutter('re-retrieved revisions: %d of %d',
169
                        len(set(ancestry).intersection(parent_map)),
170
                        len(parent_map))
171
            ancestry.update(parent_map)
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
172
            if self._cache_misses:
3835.1.16 by Aaron Bentley
Updates from review
173
                # None is never a valid parents list, so it can be used to
174
                # record misses.
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
175
                ancestry.update(dict((k, None) for k in missing_revisions
176
                                     if k not in parent_map))
3835.1.12 by Aaron Bentley
Unify CachingExtraParentsProvider and CachingParentsProvider.
177
        present_keys = [k for k in keys if ancestry.get(k) is not None]
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
178
        if self._debug:
179
            if self._requested_parents is not None and len(ancestry) != 0:
180
                self._requested_parents.update(present_keys)
181
                mutter('Current hit rate: %d%%',
182
                    100.0 * len(self._requested_parents) / len(ancestry))
183
        return dict((k, ancestry[k]) for k in present_keys)
184
185
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
186
class Graph(object):
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
187
    """Provide incremental access to revision graphs.
188
189
    This is the generic implementation; it is intended to be subclassed to
190
    specialize it for other repository types.
191
    """
2490.2.1 by Aaron Bentley
Start work on GraphWalker
192
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
193
    def __init__(self, parents_provider):
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
194
        """Construct a Graph that uses several graphs as its input
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
195
196
        This should not normally be invoked directly, because there may be
197
        specialized implementations for particular repository types.  See
3172.1.2 by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a
198
        Repository.get_graph().
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
199
3172.1.2 by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a
200
        :param parents_provider: An object providing a get_parent_map call
201
            conforming to the behavior of
202
            StackedParentsProvider.get_parent_map.
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
203
        """
3172.1.2 by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a
204
        if getattr(parents_provider, 'get_parents', None) is not None:
205
            self.get_parents = parents_provider.get_parents
206
        if getattr(parents_provider, 'get_parent_map', None) is not None:
207
            self.get_parent_map = parents_provider.get_parent_map
2490.2.29 by Aaron Bentley
Make parents provider private
208
        self._parents_provider = parents_provider
2490.2.28 by Aaron Bentley
Fix handling of null revision
209
210
    def __repr__(self):
2490.2.29 by Aaron Bentley
Make parents provider private
211
        return 'Graph(%r)' % self._parents_provider
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
212
213
    def find_lca(self, *revisions):
214
        """Determine the lowest common ancestors of the provided revisions
215
216
        A lowest common ancestor is a common ancestor none of whose
217
        descendants are common ancestors.  In graphs, unlike trees, there may
218
        be multiple lowest common ancestors.
2490.2.12 by Aaron Bentley
Improve documentation
219
220
        This algorithm has two phases.  Phase 1 identifies border ancestors,
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
221
        and phase 2 filters border ancestors to determine lowest common
222
        ancestors.
2490.2.12 by Aaron Bentley
Improve documentation
223
224
        In phase 1, border ancestors are identified, using a breadth-first
225
        search starting at the bottom of the graph.  Searches are stopped
226
        whenever a node or one of its descendants is determined to be common
227
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
228
        In phase 2, the border ancestors are filtered to find the least
2490.2.12 by Aaron Bentley
Improve documentation
229
        common ancestors.  This is done by searching the ancestries of each
230
        border ancestor.
231
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
232
        Phase 2 is perfomed on the principle that a border ancestor that is
233
        not an ancestor of any other border ancestor is a least common
234
        ancestor.
2490.2.12 by Aaron Bentley
Improve documentation
235
236
        Searches are stopped when they find a node that is determined to be a
237
        common ancestor of all border ancestors, because this shows that it
238
        cannot be a descendant of any border ancestor.
239
240
        The scaling of this operation should be proportional to
241
        1. The number of uncommon ancestors
242
        2. The number of border ancestors
243
        3. The length of the shortest path between a border ancestor and an
244
           ancestor of all border ancestors.
2490.2.3 by Aaron Bentley
Implement new merge base picker
245
        """
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
246
        border_common, common, sides = self._find_border_ancestors(revisions)
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
247
        # We may have common ancestors that can be reached from each other.
248
        # - ask for the heads of them to filter it down to only ones that
249
        # cannot be reached from each other - phase 2.
250
        return self.heads(border_common)
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
251
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
252
    def find_difference(self, left_revision, right_revision):
2490.2.25 by Aaron Bentley
Update from review
253
        """Determine the graph difference between two revisions"""
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
254
        border, common, searchers = self._find_border_ancestors(
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
255
            [left_revision, right_revision])
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
256
        self._search_for_extra_common(common, searchers)
257
        left = searchers[0].seen
258
        right = searchers[1].seen
259
        return (left.difference(right), right.difference(left))
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
260
3445.1.4 by John Arbash Meinel
Change the function to be called 'find_distance_to_null'
261
    def find_distance_to_null(self, target_revision_id, known_revision_ids):
262
        """Find the left-hand distance to the NULL_REVISION.
263
264
        (This can also be considered the revno of a branch at
265
        target_revision_id.)
3445.1.1 by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster.
266
267
        :param target_revision_id: A revision_id which we would like to know
268
            the revno for.
269
        :param known_revision_ids: [(revision_id, revno)] A list of known
270
            revno, revision_id tuples. We'll use this to seed the search.
271
        """
272
        # Map from revision_ids to a known value for their revno
273
        known_revnos = dict(known_revision_ids)
274
        cur_tip = target_revision_id
275
        num_steps = 0
276
        NULL_REVISION = revision.NULL_REVISION
3445.1.2 by John Arbash Meinel
Handle when a known revision is an ancestor.
277
        known_revnos[NULL_REVISION] = 0
3445.1.1 by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster.
278
3445.1.3 by John Arbash Meinel
Search from all of the known revisions.
279
        searching_known_tips = list(known_revnos.keys())
280
281
        unknown_searched = {}
282
3445.1.2 by John Arbash Meinel
Handle when a known revision is an ancestor.
283
        while cur_tip not in known_revnos:
3445.1.3 by John Arbash Meinel
Search from all of the known revisions.
284
            unknown_searched[cur_tip] = num_steps
285
            num_steps += 1
3445.1.2 by John Arbash Meinel
Handle when a known revision is an ancestor.
286
            to_search = set([cur_tip])
3445.1.3 by John Arbash Meinel
Search from all of the known revisions.
287
            to_search.update(searching_known_tips)
3445.1.2 by John Arbash Meinel
Handle when a known revision is an ancestor.
288
            parent_map = self.get_parent_map(to_search)
3445.1.1 by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster.
289
            parents = parent_map.get(cur_tip, None)
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
290
            if not parents: # An empty list or None is a ghost
3445.1.1 by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster.
291
                raise errors.GhostRevisionsHaveNoRevno(target_revision_id,
292
                                                       cur_tip)
293
            cur_tip = parents[0]
3445.1.3 by John Arbash Meinel
Search from all of the known revisions.
294
            next_known_tips = []
295
            for revision_id in searching_known_tips:
296
                parents = parent_map.get(revision_id, None)
297
                if not parents:
298
                    continue
299
                next = parents[0]
300
                next_revno = known_revnos[revision_id] - 1
301
                if next in unknown_searched:
302
                    # We have enough information to return a value right now
303
                    return next_revno + unknown_searched[next]
304
                if next in known_revnos:
305
                    continue
306
                known_revnos[next] = next_revno
307
                next_known_tips.append(next)
308
            searching_known_tips = next_known_tips
3445.1.1 by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster.
309
3445.1.2 by John Arbash Meinel
Handle when a known revision is an ancestor.
310
        # We reached a known revision, so just add in how many steps it took to
311
        # get there.
312
        return known_revnos[cur_tip] + num_steps
3445.1.1 by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster.
313
3377.3.21 by John Arbash Meinel
Simple brute-force implementation of find_unique_ancestors
314
    def find_unique_ancestors(self, unique_revision, common_revisions):
315
        """Find the unique ancestors for a revision versus others.
316
317
        This returns the ancestry of unique_revision, excluding all revisions
318
        in the ancestry of common_revisions. If unique_revision is in the
319
        ancestry, then the empty set will be returned.
320
321
        :param unique_revision: The revision_id whose ancestry we are
322
            interested in.
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
323
            XXX: Would this API be better if we allowed multiple revisions on
324
                 to be searched here?
3377.3.21 by John Arbash Meinel
Simple brute-force implementation of find_unique_ancestors
325
        :param common_revisions: Revision_ids of ancestries to exclude.
326
        :return: A set of revisions in the ancestry of unique_revision
327
        """
328
        if unique_revision in common_revisions:
329
            return set()
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
330
331
        # Algorithm description
332
        # 1) Walk backwards from the unique node and all common nodes.
333
        # 2) When a node is seen by both sides, stop searching it in the unique
334
        #    walker, include it in the common walker.
335
        # 3) Stop searching when there are no nodes left for the unique walker.
336
        #    At this point, you have a maximal set of unique nodes. Some of
337
        #    them may actually be common, and you haven't reached them yet.
338
        # 4) Start new searchers for the unique nodes, seeded with the
339
        #    information you have so far.
340
        # 5) Continue searching, stopping the common searches when the search
341
        #    tip is an ancestor of all unique nodes.
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
342
        # 6) Aggregate together unique searchers when they are searching the
343
        #    same tips. When all unique searchers are searching the same node,
344
        #    stop move it to a single 'all_unique_searcher'.
345
        # 7) The 'all_unique_searcher' represents the very 'tip' of searching.
346
        #    Most of the time this produces very little important information.
347
        #    So don't step it as quickly as the other searchers.
348
        # 8) Search is done when all common searchers have completed.
349
350
        unique_searcher, common_searcher = self._find_initial_unique_nodes(
351
            [unique_revision], common_revisions)
352
353
        unique_nodes = unique_searcher.seen.difference(common_searcher.seen)
354
        if not unique_nodes:
355
            return unique_nodes
356
357
        (all_unique_searcher,
358
         unique_tip_searchers) = self._make_unique_searchers(unique_nodes,
359
                                    unique_searcher, common_searcher)
360
361
        self._refine_unique_nodes(unique_searcher, all_unique_searcher,
362
                                  unique_tip_searchers, common_searcher)
363
        true_unique_nodes = unique_nodes.difference(common_searcher.seen)
3377.3.33 by John Arbash Meinel
Add some logging with -Dgraph
364
        if 'graph' in debug.debug_flags:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
365
            trace.mutter('Found %d truly unique nodes out of %d',
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
366
                         len(true_unique_nodes), len(unique_nodes))
367
        return true_unique_nodes
368
369
    def _find_initial_unique_nodes(self, unique_revisions, common_revisions):
370
        """Steps 1-3 of find_unique_ancestors.
371
372
        Find the maximal set of unique nodes. Some of these might actually
373
        still be common, but we are sure that there are no other unique nodes.
374
375
        :return: (unique_searcher, common_searcher)
376
        """
377
378
        unique_searcher = self._make_breadth_first_searcher(unique_revisions)
379
        # we know that unique_revisions aren't in common_revisions, so skip
380
        # past them.
3377.3.27 by John Arbash Meinel
some simple updates
381
        unique_searcher.next()
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
382
        common_searcher = self._make_breadth_first_searcher(common_revisions)
383
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
384
        # As long as we are still finding unique nodes, keep searching
3377.3.27 by John Arbash Meinel
some simple updates
385
        while unique_searcher._next_query:
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
386
            next_unique_nodes = set(unique_searcher.step())
387
            next_common_nodes = set(common_searcher.step())
388
389
            # Check if either searcher encounters new nodes seen by the other
390
            # side.
391
            unique_are_common_nodes = next_unique_nodes.intersection(
392
                common_searcher.seen)
393
            unique_are_common_nodes.update(
394
                next_common_nodes.intersection(unique_searcher.seen))
395
            if unique_are_common_nodes:
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
396
                ancestors = unique_searcher.find_seen_ancestors(
397
                                unique_are_common_nodes)
3377.4.5 by John Arbash Meinel
Several updates. A bit more debug logging, only step the all_unique searcher 1/10th of the time.
398
                # TODO: This is a bit overboard, we only really care about
399
                #       the ancestors of the tips because the rest we
400
                #       already know. This is *correct* but causes us to
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
401
                #       search too much ancestry.
3377.3.29 by John Arbash Meinel
Revert the _find_any_seen change.
402
                ancestors.update(common_searcher.find_seen_ancestors(ancestors))
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
403
                unique_searcher.stop_searching_any(ancestors)
404
                common_searcher.start_searching(ancestors)
405
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
406
        return unique_searcher, common_searcher
407
408
    def _make_unique_searchers(self, unique_nodes, unique_searcher,
409
                               common_searcher):
410
        """Create a searcher for all the unique search tips (step 4).
411
412
        As a side effect, the common_searcher will stop searching any nodes
413
        that are ancestors of the unique searcher tips.
414
415
        :return: (all_unique_searcher, unique_tip_searchers)
416
        """
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
417
        unique_tips = self._remove_simple_descendants(unique_nodes,
418
                        self.get_parent_map(unique_nodes))
419
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
420
        if len(unique_tips) == 1:
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
421
            unique_tip_searchers = []
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
422
            ancestor_all_unique = unique_searcher.find_seen_ancestors(unique_tips)
423
        else:
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
424
            unique_tip_searchers = []
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
425
            for tip in unique_tips:
426
                revs_to_search = unique_searcher.find_seen_ancestors([tip])
427
                revs_to_search.update(
428
                    common_searcher.find_seen_ancestors(revs_to_search))
429
                searcher = self._make_breadth_first_searcher(revs_to_search)
430
                # We don't care about the starting nodes.
431
                searcher._label = tip
432
                searcher.step()
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
433
                unique_tip_searchers.append(searcher)
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
434
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
435
            ancestor_all_unique = None
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
436
            for searcher in unique_tip_searchers:
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
437
                if ancestor_all_unique is None:
438
                    ancestor_all_unique = set(searcher.seen)
439
                else:
440
                    ancestor_all_unique = ancestor_all_unique.intersection(
441
                                                searcher.seen)
3377.3.33 by John Arbash Meinel
Add some logging with -Dgraph
442
        # Collapse all the common nodes into a single searcher
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
443
        all_unique_searcher = self._make_breadth_first_searcher(
444
                                ancestor_all_unique)
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
445
        if ancestor_all_unique:
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
446
            # We've seen these nodes in all the searchers, so we'll just go to
447
            # the next
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
448
            all_unique_searcher.step()
449
450
            # Stop any search tips that are already known as ancestors of the
451
            # unique nodes
452
            stopped_common = common_searcher.stop_searching_any(
453
                common_searcher.find_seen_ancestors(ancestor_all_unique))
454
455
            total_stopped = 0
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
456
            for searcher in unique_tip_searchers:
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
457
                total_stopped += len(searcher.stop_searching_any(
458
                    searcher.find_seen_ancestors(ancestor_all_unique)))
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
459
        if 'graph' in debug.debug_flags:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
460
            trace.mutter('For %d unique nodes, created %d + 1 unique searchers'
461
                         ' (%d stopped search tips, %d common ancestors'
462
                         ' (%d stopped common)',
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
463
                         len(unique_nodes), len(unique_tip_searchers),
464
                         total_stopped, len(ancestor_all_unique),
465
                         len(stopped_common))
466
        return all_unique_searcher, unique_tip_searchers
467
468
    def _step_unique_and_common_searchers(self, common_searcher,
469
                                          unique_tip_searchers,
470
                                          unique_searcher):
3377.4.7 by John Arbash Meinel
Small documentation and code wrapping cleanup
471
        """Step all the searchers"""
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
472
        newly_seen_common = set(common_searcher.step())
473
        newly_seen_unique = set()
474
        for searcher in unique_tip_searchers:
475
            next = set(searcher.step())
476
            next.update(unique_searcher.find_seen_ancestors(next))
477
            next.update(common_searcher.find_seen_ancestors(next))
478
            for alt_searcher in unique_tip_searchers:
479
                if alt_searcher is searcher:
480
                    continue
481
                next.update(alt_searcher.find_seen_ancestors(next))
482
            searcher.start_searching(next)
483
            newly_seen_unique.update(next)
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
484
        return newly_seen_common, newly_seen_unique
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
485
486
    def _find_nodes_common_to_all_unique(self, unique_tip_searchers,
487
                                         all_unique_searcher,
488
                                         newly_seen_unique, step_all_unique):
489
        """Find nodes that are common to all unique_tip_searchers.
490
491
        If it is time, step the all_unique_searcher, and add its nodes to the
492
        result.
493
        """
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
494
        common_to_all_unique_nodes = newly_seen_unique.copy()
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
495
        for searcher in unique_tip_searchers:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
496
            common_to_all_unique_nodes.intersection_update(searcher.seen)
497
        common_to_all_unique_nodes.intersection_update(
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
498
                                    all_unique_searcher.seen)
499
        # Step all-unique less frequently than the other searchers.
500
        # In the common case, we don't need to spider out far here, so
501
        # avoid doing extra work.
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
502
        if step_all_unique:
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
503
            tstart = time.clock()
504
            nodes = all_unique_searcher.step()
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
505
            common_to_all_unique_nodes.update(nodes)
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
506
            if 'graph' in debug.debug_flags:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
507
                tdelta = time.clock() - tstart
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
508
                trace.mutter('all_unique_searcher step() took %.3fs'
509
                             'for %d nodes (%d total), iteration: %s',
510
                             tdelta, len(nodes), len(all_unique_searcher.seen),
511
                             all_unique_searcher._iterations)
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
512
        return common_to_all_unique_nodes
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
513
514
    def _collapse_unique_searchers(self, unique_tip_searchers,
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
515
                                   common_to_all_unique_nodes):
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
516
        """Combine searchers that are searching the same tips.
517
518
        When two searchers are searching the same tips, we can stop one of the
519
        searchers. We also know that the maximal set of common ancestors is the
520
        intersection of the two original searchers.
521
522
        :return: A list of searchers that are searching unique nodes.
523
        """
524
        # Filter out searchers that don't actually search different
525
        # nodes. We already have the ancestry intersection for them
526
        unique_search_tips = {}
527
        for searcher in unique_tip_searchers:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
528
            stopped = searcher.stop_searching_any(common_to_all_unique_nodes)
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
529
            will_search_set = frozenset(searcher._next_query)
530
            if not will_search_set:
531
                if 'graph' in debug.debug_flags:
532
                    trace.mutter('Unique searcher %s was stopped.'
533
                                 ' (%s iterations) %d nodes stopped',
534
                                 searcher._label,
535
                                 searcher._iterations,
536
                                 len(stopped))
537
            elif will_search_set not in unique_search_tips:
538
                # This searcher is searching a unique set of nodes, let it
539
                unique_search_tips[will_search_set] = [searcher]
540
            else:
541
                unique_search_tips[will_search_set].append(searcher)
542
        # TODO: it might be possible to collapse searchers faster when they
543
        #       only have *some* search tips in common.
544
        next_unique_searchers = []
545
        for searchers in unique_search_tips.itervalues():
546
            if len(searchers) == 1:
547
                # Searching unique tips, go for it
548
                next_unique_searchers.append(searchers[0])
549
            else:
550
                # These searchers have started searching the same tips, we
551
                # don't need them to cover the same ground. The
552
                # intersection of their ancestry won't change, so create a
553
                # new searcher, combining their histories.
554
                next_searcher = searchers[0]
555
                for searcher in searchers[1:]:
556
                    next_searcher.seen.intersection_update(searcher.seen)
557
                if 'graph' in debug.debug_flags:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
558
                    trace.mutter('Combining %d searchers into a single'
559
                                 ' searcher searching %d nodes with'
560
                                 ' %d ancestry',
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
561
                                 len(searchers),
562
                                 len(next_searcher._next_query),
563
                                 len(next_searcher.seen))
564
                next_unique_searchers.append(next_searcher)
565
        return next_unique_searchers
566
567
    def _refine_unique_nodes(self, unique_searcher, all_unique_searcher,
568
                             unique_tip_searchers, common_searcher):
569
        """Steps 5-8 of find_unique_ancestors.
570
        
571
        This function returns when common_searcher has stopped searching for
572
        more nodes.
573
        """
574
        # We step the ancestor_all_unique searcher only every
575
        # STEP_UNIQUE_SEARCHER_EVERY steps.
576
        step_all_unique_counter = 0
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
577
        # While we still have common nodes to search
578
        while common_searcher._next_query:
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
579
            (newly_seen_common,
580
             newly_seen_unique) = self._step_unique_and_common_searchers(
581
                common_searcher, unique_tip_searchers, unique_searcher)
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
582
            # These nodes are common ancestors of all unique nodes
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
583
            common_to_all_unique_nodes = self._find_nodes_common_to_all_unique(
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
584
                unique_tip_searchers, all_unique_searcher, newly_seen_unique,
585
                step_all_unique_counter==0)
586
            step_all_unique_counter = ((step_all_unique_counter + 1)
587
                                       % STEP_UNIQUE_SEARCHER_EVERY)
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
588
589
            if newly_seen_common:
590
                # If a 'common' node is an ancestor of all unique searchers, we
591
                # can stop searching it.
592
                common_searcher.stop_searching_any(
593
                    all_unique_searcher.seen.intersection(newly_seen_common))
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
594
            if common_to_all_unique_nodes:
595
                common_to_all_unique_nodes.update(
3377.4.7 by John Arbash Meinel
Small documentation and code wrapping cleanup
596
                    common_searcher.find_seen_ancestors(
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
597
                        common_to_all_unique_nodes))
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
598
                # The all_unique searcher can start searching the common nodes
599
                # but everyone else can stop.
3377.4.7 by John Arbash Meinel
Small documentation and code wrapping cleanup
600
                # This is the sort of thing where we would like to not have it
601
                # start_searching all of the nodes, but only mark all of them
602
                # as seen, and have it search only the actual tips. Otherwise
603
                # it is another get_parent_map() traversal for it to figure out
604
                # what we already should know.
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
605
                all_unique_searcher.start_searching(common_to_all_unique_nodes)
606
                common_searcher.stop_searching_any(common_to_all_unique_nodes)
3377.4.4 by John Arbash Meinel
Restore the previous code, but bring in a couple changes. Including an update to have lsprof show where the time is spent.
607
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
608
            next_unique_searchers = self._collapse_unique_searchers(
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
609
                unique_tip_searchers, common_to_all_unique_nodes)
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
610
            if len(unique_tip_searchers) != len(next_unique_searchers):
611
                if 'graph' in debug.debug_flags:
3377.4.8 by John Arbash Meinel
Final tweaks from Ian
612
                    trace.mutter('Collapsed %d unique searchers => %d'
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
613
                                 ' at %s iterations',
614
                                 len(unique_tip_searchers),
615
                                 len(next_unique_searchers),
616
                                 all_unique_searcher._iterations)
617
            unique_tip_searchers = next_unique_searchers
3377.3.21 by John Arbash Meinel
Simple brute-force implementation of find_unique_ancestors
618
3172.1.2 by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a
619
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
620
    def get_parents(self, revisions):
621
        """Find revision ids of the parents of a list of revisions
622
623
        A list is returned of the same length as the input.  Each entry
624
        is a list of parent ids for the corresponding input revision.
625
626
        [NULL_REVISION] is used as the parent of the first user-committed
627
        revision.  Its parent list is empty.
628
629
        If the revision is not present (i.e. a ghost), None is used in place
630
        of the list of parents.
631
632
        Deprecated in bzr 1.2 - please see get_parent_map.
633
        """
634
        parents = self.get_parent_map(revisions)
3377.3.5 by John Arbash Meinel
Fix a latent bug in Graph.get_parents()
635
        return [parents.get(r, None) for r in revisions]
3172.1.2 by Robert Collins
Parent Providers should now implement ``get_parent_map`` returning a
636
637
    def get_parent_map(self, revisions):
638
        """Get a map of key:parent_list for revisions.
639
640
        This implementation delegates to get_parents, for old parent_providers
641
        that do not supply get_parent_map.
642
        """
643
        result = {}
644
        for rev, parents in self.get_parents(revisions):
645
            if parents is not None:
646
                result[rev] = parents
647
        return result
648
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
649
    def _make_breadth_first_searcher(self, revisions):
650
        return _BreadthFirstSearcher(revisions, self)
651
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
652
    def _find_border_ancestors(self, revisions):
2490.2.12 by Aaron Bentley
Improve documentation
653
        """Find common ancestors with at least one uncommon descendant.
654
655
        Border ancestors are identified using a breadth-first
656
        search starting at the bottom of the graph.  Searches are stopped
657
        whenever a node or one of its descendants is determined to be common.
658
659
        This will scale with the number of uncommon ancestors.
2490.2.25 by Aaron Bentley
Update from review
660
661
        As well as the border ancestors, a set of seen common ancestors and a
662
        list of sets of seen ancestors for each input revision is returned.
663
        This allows calculation of graph difference from the results of this
664
        operation.
2490.2.12 by Aaron Bentley
Improve documentation
665
        """
2490.2.28 by Aaron Bentley
Fix handling of null revision
666
        if None in revisions:
667
            raise errors.InvalidRevisionId(None, self)
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
668
        common_ancestors = set()
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
669
        searchers = [self._make_breadth_first_searcher([r])
670
                     for r in revisions]
671
        active_searchers = searchers[:]
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
672
        border_ancestors = set()
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
673
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
674
        while True:
675
            newly_seen = set()
3377.3.2 by John Arbash Meinel
find_difference is fixed by updating _find_border_ancestors.... is that reasonable?
676
            for searcher in searchers:
677
                new_ancestors = searcher.step()
678
                if new_ancestors:
679
                    newly_seen.update(new_ancestors)
680
            new_common = set()
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
681
            for revision in newly_seen:
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
682
                if revision in common_ancestors:
3377.3.2 by John Arbash Meinel
find_difference is fixed by updating _find_border_ancestors.... is that reasonable?
683
                    # Not a border ancestor because it was seen as common
684
                    # already
685
                    new_common.add(revision)
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
686
                    continue
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
687
                for searcher in searchers:
688
                    if revision not in searcher.seen:
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
689
                        break
690
                else:
3377.3.2 by John Arbash Meinel
find_difference is fixed by updating _find_border_ancestors.... is that reasonable?
691
                    # This is a border because it is a first common that we see
692
                    # after walking for a while.
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
693
                    border_ancestors.add(revision)
3377.3.2 by John Arbash Meinel
find_difference is fixed by updating _find_border_ancestors.... is that reasonable?
694
                    new_common.add(revision)
695
            if new_common:
696
                for searcher in searchers:
697
                    new_common.update(searcher.find_seen_ancestors(new_common))
698
                for searcher in searchers:
699
                    searcher.start_searching(new_common)
700
                common_ancestors.update(new_common)
701
702
            # Figure out what the searchers will be searching next, and if
703
            # there is only 1 set being searched, then we are done searching,
704
            # since all searchers would have to be searching the same data,
705
            # thus it *must* be in common.
706
            unique_search_sets = set()
707
            for searcher in searchers:
708
                will_search_set = frozenset(searcher._next_query)
709
                if will_search_set not in unique_search_sets:
710
                    # This searcher is searching a unique set of nodes, let it
711
                    unique_search_sets.add(will_search_set)
712
713
            if len(unique_search_sets) == 1:
714
                nodes = unique_search_sets.pop()
715
                uncommon_nodes = nodes.difference(common_ancestors)
3376.2.14 by Martin Pool
Remove recently-introduced assert statements
716
                if uncommon_nodes:
717
                    raise AssertionError("Somehow we ended up converging"
718
                                         " without actually marking them as"
719
                                         " in common."
720
                                         "\nStart_nodes: %s"
721
                                         "\nuncommon_nodes: %s"
722
                                         % (revisions, uncommon_nodes))
3377.3.2 by John Arbash Meinel
find_difference is fixed by updating _find_border_ancestors.... is that reasonable?
723
                break
724
        return border_ancestors, common_ancestors, searchers
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
725
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
726
    def heads(self, keys):
727
        """Return the heads from amongst keys.
728
729
        This is done by searching the ancestries of each key.  Any key that is
730
        reachable from another key is not returned; all the others are.
731
732
        This operation scales with the relative depth between any two keys. If
733
        any two keys are completely disconnected all ancestry of both sides
734
        will be retrieved.
735
736
        :param keys: An iterable of keys.
2776.1.4 by Robert Collins
Trivial review feedback changes.
737
        :return: A set of the heads. Note that as a set there is no ordering
738
            information. Callers will need to filter their input to create
739
            order if they need it.
2490.2.12 by Aaron Bentley
Improve documentation
740
        """
2776.1.4 by Robert Collins
Trivial review feedback changes.
741
        candidate_heads = set(keys)
3052.5.5 by John Arbash Meinel
Special case Graph.heads() for NULL_REVISION rather than is_ancestor.
742
        if revision.NULL_REVISION in candidate_heads:
743
            # NULL_REVISION is only a head if it is the only entry
744
            candidate_heads.remove(revision.NULL_REVISION)
745
            if not candidate_heads:
746
                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)
747
        if len(candidate_heads) < 2:
748
            return candidate_heads
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
749
        searchers = dict((c, self._make_breadth_first_searcher([c]))
2776.1.4 by Robert Collins
Trivial review feedback changes.
750
                          for c in candidate_heads)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
751
        active_searchers = dict(searchers)
752
        # skip over the actual candidate for each searcher
753
        for searcher in active_searchers.itervalues():
1551.15.81 by Aaron Bentley
Remove testing code
754
            searcher.next()
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
755
        # The common walker finds nodes that are common to two or more of the
756
        # input keys, so that we don't access all history when a currently
757
        # uncommon search point actually meets up with something behind a
758
        # common search point. Common search points do not keep searches
759
        # active; they just allow us to make searches inactive without
760
        # accessing all history.
761
        common_walker = self._make_breadth_first_searcher([])
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
762
        while len(active_searchers) > 0:
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
763
            ancestors = set()
764
            # advance searches
765
            try:
766
                common_walker.next()
767
            except StopIteration:
2921.3.4 by Robert Collins
Review feedback.
768
                # 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
769
                pass
1551.15.78 by Aaron Bentley
Fix KeyError in filter_candidate_lca
770
            for candidate in active_searchers.keys():
771
                try:
772
                    searcher = active_searchers[candidate]
773
                except KeyError:
774
                    # rare case: we deleted candidate in a previous iteration
775
                    # through this for loop, because it was determined to be
776
                    # a descendant of another candidate.
777
                    continue
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
778
                try:
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
779
                    ancestors.update(searcher.next())
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
780
                except StopIteration:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
781
                    del active_searchers[candidate]
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
782
                    continue
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
783
            # process found nodes
784
            new_common = set()
785
            for ancestor in ancestors:
786
                if ancestor in candidate_heads:
787
                    candidate_heads.remove(ancestor)
788
                    del searchers[ancestor]
789
                    if ancestor in active_searchers:
790
                        del active_searchers[ancestor]
791
                # it may meet up with a known common node
2921.3.4 by Robert Collins
Review feedback.
792
                if ancestor in common_walker.seen:
793
                    # some searcher has encountered our known common nodes:
794
                    # just stop it
795
                    ancestor_set = set([ancestor])
796
                    for searcher in searchers.itervalues():
797
                        searcher.stop_searching_any(ancestor_set)
798
                else:
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
799
                    # or it may have been just reached by all the searchers:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
800
                    for searcher in searchers.itervalues():
801
                        if ancestor not in searcher.seen:
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
802
                            break
803
                    else:
2921.3.4 by Robert Collins
Review feedback.
804
                        # The final active searcher has just reached this node,
805
                        # making it be known as a descendant of all candidates,
806
                        # so we can stop searching it, and any seen ancestors
807
                        new_common.add(ancestor)
808
                        for searcher in searchers.itervalues():
809
                            seen_ancestors =\
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
810
                                searcher.find_seen_ancestors([ancestor])
2921.3.4 by Robert Collins
Review feedback.
811
                            searcher.stop_searching_any(seen_ancestors)
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
812
            common_walker.start_searching(new_common)
2776.1.4 by Robert Collins
Trivial review feedback changes.
813
        return candidate_heads
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
814
3514.2.8 by John Arbash Meinel
The insertion ordering into the weave has an impact on conflicts.
815
    def find_merge_order(self, tip_revision_id, lca_revision_ids):
816
        """Find the order that each revision was merged into tip.
817
818
        This basically just walks backwards with a stack, and walks left-first
819
        until it finds a node to stop.
820
        """
821
        if len(lca_revision_ids) == 1:
822
            return list(lca_revision_ids)
823
        looking_for = set(lca_revision_ids)
824
        # TODO: Is there a way we could do this "faster" by batching up the
825
        # get_parent_map requests?
826
        # TODO: Should we also be culling the ancestry search right away? We
827
        # could add looking_for to the "stop" list, and walk their
828
        # ancestry in batched mode. The flip side is it might mean we walk a
829
        # lot of "stop" nodes, rather than only the minimum.
830
        # Then again, without it we may trace back into ancestry we could have
831
        # stopped early.
832
        stack = [tip_revision_id]
833
        found = []
834
        stop = set()
835
        while stack and looking_for:
836
            next = stack.pop()
837
            stop.add(next)
838
            if next in looking_for:
839
                found.append(next)
840
                looking_for.remove(next)
841
                if len(looking_for) == 1:
842
                    found.append(looking_for.pop())
843
                    break
844
                continue
845
            parent_ids = self.get_parent_map([next]).get(next, None)
846
            if not parent_ids: # Ghost, nothing to search here
847
                continue
848
            for parent_id in reversed(parent_ids):
849
                # TODO: (performance) We see the parent at this point, but we
850
                #       wait to mark it until later to make sure we get left
851
                #       parents before right parents. However, instead of
852
                #       waiting until we have traversed enough parents, we
853
                #       could instead note that we've found it, and once all
854
                #       parents are in the stack, just reverse iterate the
855
                #       stack for them.
856
                if parent_id not in stop:
857
                    # this will need to be searched
858
                    stack.append(parent_id)
859
                stop.add(parent_id)
860
        return found
861
1551.19.10 by Aaron Bentley
Merge now warns when it encounters a criss-cross
862
    def find_unique_lca(self, left_revision, right_revision,
863
                        count_steps=False):
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
864
        """Find a unique LCA.
865
866
        Find lowest common ancestors.  If there is no unique  common
867
        ancestor, find the lowest common ancestors of those ancestors.
868
869
        Iteration stops when a unique lowest common ancestor is found.
870
        The graph origin is necessarily a unique lowest common ancestor.
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
871
872
        Note that None is not an acceptable substitute for NULL_REVISION.
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
873
        in the input for this method.
1551.19.12 by Aaron Bentley
Add documentation for the count_steps parameter of Graph.find_unique_lca
874
875
        :param count_steps: If True, the return value will be a tuple of
876
            (unique_lca, steps) where steps is the number of times that
877
            find_lca was run.  If False, only unique_lca is returned.
2490.2.3 by Aaron Bentley
Implement new merge base picker
878
        """
879
        revisions = [left_revision, right_revision]
1551.19.10 by Aaron Bentley
Merge now warns when it encounters a criss-cross
880
        steps = 0
2490.2.3 by Aaron Bentley
Implement new merge base picker
881
        while True:
1551.19.10 by Aaron Bentley
Merge now warns when it encounters a criss-cross
882
            steps += 1
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
883
            lca = self.find_lca(*revisions)
884
            if len(lca) == 1:
1551.19.10 by Aaron Bentley
Merge now warns when it encounters a criss-cross
885
                result = lca.pop()
886
                if count_steps:
887
                    return result, steps
888
                else:
889
                    return result
2520.4.104 by Aaron Bentley
Avoid infinite loop when there is no unique lca
890
            if len(lca) == 0:
891
                raise errors.NoCommonAncestor(left_revision, right_revision)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
892
            revisions = lca
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
893
3228.4.4 by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node,
894
    def iter_ancestry(self, revision_ids):
3228.4.2 by John Arbash Meinel
Add a Graph.iter_ancestry()
895
        """Iterate the ancestry of this revision.
896
3228.4.4 by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node,
897
        :param revision_ids: Nodes to start the search
3228.4.2 by John Arbash Meinel
Add a Graph.iter_ancestry()
898
        :return: Yield tuples mapping a revision_id to its parents for the
899
            ancestry of revision_id.
3228.4.10 by John Arbash Meinel
Respond to abentley's review comments.
900
            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,
901
            with no parents will have NULL_REVISION as their only parent. (As
902
            defined by get_parent_map.)
3228.4.10 by John Arbash Meinel
Respond to abentley's review comments.
903
            There will also be a node for (NULL_REVISION, ())
3228.4.2 by John Arbash Meinel
Add a Graph.iter_ancestry()
904
        """
3228.4.4 by John Arbash Meinel
Change iter_ancestry to take a group instead of a single node,
905
        pending = set(revision_ids)
3228.4.2 by John Arbash Meinel
Add a Graph.iter_ancestry()
906
        processed = set()
907
        while pending:
908
            processed.update(pending)
909
            next_map = self.get_parent_map(pending)
910
            next_pending = set()
911
            for item in next_map.iteritems():
912
                yield item
913
                next_pending.update(p for p in item[1] if p not in processed)
914
            ghosts = pending.difference(next_map)
915
            for ghost in ghosts:
3228.4.10 by John Arbash Meinel
Respond to abentley's review comments.
916
                yield (ghost, None)
3228.4.2 by John Arbash Meinel
Add a Graph.iter_ancestry()
917
            pending = next_pending
918
2490.2.31 by Aaron Bentley
Fix iter_topo_order to permit un-included parents
919
    def iter_topo_order(self, revisions):
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
920
        """Iterate through the input revisions in topological order.
921
922
        This sorting only ensures that parents come before their children.
923
        An ancestor may sort after a descendant if the relationship is not
924
        visible in the supplied list of revisions.
925
        """
3099.3.3 by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map()
926
        sorter = tsort.TopoSorter(self.get_parent_map(revisions))
2490.2.34 by Aaron Bentley
Update NEWS and change implementation to return an iterator
927
        return sorter.iter_topo_order()
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
928
2653.2.1 by Aaron Bentley
Implement Graph.is_ancestor
929
    def is_ancestor(self, candidate_ancestor, candidate_descendant):
2653.2.5 by Aaron Bentley
Update to clarify algorithm
930
        """Determine whether a revision is an ancestor of another.
931
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
932
        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
933
        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
934
        relationship between N revisions.
2653.2.5 by Aaron Bentley
Update to clarify algorithm
935
        """
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
936
        return set([candidate_descendant]) == self.heads(
937
            [candidate_ancestor, candidate_descendant])
2653.2.1 by Aaron Bentley
Implement Graph.is_ancestor
938
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
939
    def _search_for_extra_common(self, common, searchers):
940
        """Make sure that unique nodes are genuinely unique.
941
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
942
        After _find_border_ancestors, all nodes marked "common" are indeed
943
        common. Some of the nodes considered unique are not, due to history
944
        shortcuts stopping the searches early.
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
945
946
        We know that we have searched enough when all common search tips are
947
        descended from all unique (uncommon) nodes because we know that a node
948
        cannot be an ancestor of its own ancestor.
949
950
        :param common: A set of common nodes
951
        :param searchers: The searchers returned from _find_border_ancestors
952
        :return: None
953
        """
954
        # Basic algorithm...
955
        #   A) The passed in searchers should all be on the same tips, thus
956
        #      they should be considered the "common" searchers.
957
        #   B) We find the difference between the searchers, these are the
958
        #      "unique" nodes for each side.
959
        #   C) We do a quick culling so that we only start searching from the
960
        #      more interesting unique nodes. (A unique ancestor is more
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
961
        #      interesting than any of its children.)
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
962
        #   D) We start searching for ancestors common to all unique nodes.
963
        #   E) We have the common searchers stop searching any ancestors of
964
        #      nodes found by (D)
965
        #   F) When there are no more common search tips, we stop
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
966
967
        # TODO: We need a way to remove unique_searchers when they overlap with
968
        #       other unique searchers.
3376.2.14 by Martin Pool
Remove recently-introduced assert statements
969
        if len(searchers) != 2:
970
            raise NotImplementedError(
971
                "Algorithm not yet implemented for > 2 searchers")
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
972
        common_searchers = searchers
973
        left_searcher = searchers[0]
974
        right_searcher = searchers[1]
3377.3.15 by John Arbash Meinel
minor update
975
        unique = left_searcher.seen.symmetric_difference(right_searcher.seen)
3377.3.17 by John Arbash Meinel
Keep track of the intersection of unique ancestry,
976
        if not unique: # No unique nodes, nothing to do
977
            return
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
978
        total_unique = len(unique)
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
979
        unique = self._remove_simple_descendants(unique,
980
                    self.get_parent_map(unique))
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
981
        simple_unique = len(unique)
3377.3.14 by John Arbash Meinel
Take another tack on _search_for_extra
982
983
        unique_searchers = []
984
        for revision_id in unique:
3377.3.15 by John Arbash Meinel
minor update
985
            if revision_id in left_searcher.seen:
3377.3.14 by John Arbash Meinel
Take another tack on _search_for_extra
986
                parent_searcher = left_searcher
987
            else:
988
                parent_searcher = right_searcher
989
            revs_to_search = parent_searcher.find_seen_ancestors([revision_id])
990
            if not revs_to_search: # XXX: This shouldn't be possible
991
                revs_to_search = [revision_id]
3377.3.15 by John Arbash Meinel
minor update
992
            searcher = self._make_breadth_first_searcher(revs_to_search)
993
            # We don't care about the starting nodes.
994
            searcher.step()
995
            unique_searchers.append(searcher)
3377.3.14 by John Arbash Meinel
Take another tack on _search_for_extra
996
3377.3.16 by John Arbash Meinel
small cleanups
997
        # possible todo: aggregate the common searchers into a single common
998
        #   searcher, just make sure that we include the nodes into the .seen
999
        #   properties of the original searchers
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1000
3377.3.17 by John Arbash Meinel
Keep track of the intersection of unique ancestry,
1001
        ancestor_all_unique = None
1002
        for searcher in unique_searchers:
1003
            if ancestor_all_unique is None:
1004
                ancestor_all_unique = set(searcher.seen)
1005
            else:
1006
                ancestor_all_unique = ancestor_all_unique.intersection(
1007
                                            searcher.seen)
1008
3377.3.23 by John Arbash Meinel
Implement find_unique_ancestors using more explicit graph searching.
1009
        trace.mutter('Started %s unique searchers for %s unique revisions',
1010
                     simple_unique, total_unique)
3377.3.19 by John Arbash Meinel
Start culling unique searchers once they converge.
1011
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1012
        while True: # If we have no more nodes we have nothing to do
1013
            newly_seen_common = set()
1014
            for searcher in common_searchers:
1015
                newly_seen_common.update(searcher.step())
1016
            newly_seen_unique = set()
1017
            for searcher in unique_searchers:
1018
                newly_seen_unique.update(searcher.step())
1019
            new_common_unique = set()
1020
            for revision in newly_seen_unique:
1021
                for searcher in unique_searchers:
1022
                    if revision not in searcher.seen:
1023
                        break
1024
                else:
1025
                    # This is a border because it is a first common that we see
1026
                    # after walking for a while.
1027
                    new_common_unique.add(revision)
1028
            if newly_seen_common:
1029
                # These are nodes descended from one of the 'common' searchers.
1030
                # Make sure all searchers are on the same page
1031
                for searcher in common_searchers:
3377.3.16 by John Arbash Meinel
small cleanups
1032
                    newly_seen_common.update(
1033
                        searcher.find_seen_ancestors(newly_seen_common))
3377.3.14 by John Arbash Meinel
Take another tack on _search_for_extra
1034
                # We start searching the whole ancestry. It is a bit wasteful,
1035
                # though. We really just want to mark all of these nodes as
1036
                # 'seen' and then start just the tips. However, it requires a
1037
                # get_parent_map() call to figure out the tips anyway, and all
1038
                # redundant requests should be fairly fast.
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1039
                for searcher in common_searchers:
1040
                    searcher.start_searching(newly_seen_common)
3377.3.13 by John Arbash Meinel
Change _search_for_extra_common slightly.
1041
3377.3.17 by John Arbash Meinel
Keep track of the intersection of unique ancestry,
1042
                # If a 'common' node is an ancestor of all unique searchers, we
3377.3.13 by John Arbash Meinel
Change _search_for_extra_common slightly.
1043
                # can stop searching it.
3377.3.17 by John Arbash Meinel
Keep track of the intersection of unique ancestry,
1044
                stop_searching_common = ancestor_all_unique.intersection(
1045
                                            newly_seen_common)
3377.3.13 by John Arbash Meinel
Change _search_for_extra_common slightly.
1046
                if stop_searching_common:
1047
                    for searcher in common_searchers:
1048
                        searcher.stop_searching_any(stop_searching_common)
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1049
            if new_common_unique:
3377.3.20 by John Arbash Meinel
comment cleanups.
1050
                # We found some ancestors that are common
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
1051
                for searcher in unique_searchers:
3377.3.16 by John Arbash Meinel
small cleanups
1052
                    new_common_unique.update(
1053
                        searcher.find_seen_ancestors(new_common_unique))
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1054
                # Since these are common, we can grab another set of ancestors
1055
                # that we have seen
1056
                for searcher in common_searchers:
3377.3.16 by John Arbash Meinel
small cleanups
1057
                    new_common_unique.update(
1058
                        searcher.find_seen_ancestors(new_common_unique))
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1059
1060
                # We can tell all of the unique searchers to start at these
1061
                # nodes, and tell all of the common searchers to *stop*
1062
                # searching these nodes
1063
                for searcher in unique_searchers:
1064
                    searcher.start_searching(new_common_unique)
1065
                for searcher in common_searchers:
1066
                    searcher.stop_searching_any(new_common_unique)
3377.3.17 by John Arbash Meinel
Keep track of the intersection of unique ancestry,
1067
                ancestor_all_unique.update(new_common_unique)
3377.3.19 by John Arbash Meinel
Start culling unique searchers once they converge.
1068
3377.3.20 by John Arbash Meinel
comment cleanups.
1069
                # Filter out searchers that don't actually search different
1070
                # nodes. We already have the ancestry intersection for them
3377.3.19 by John Arbash Meinel
Start culling unique searchers once they converge.
1071
                next_unique_searchers = []
1072
                unique_search_sets = set()
1073
                for searcher in unique_searchers:
1074
                    will_search_set = frozenset(searcher._next_query)
1075
                    if will_search_set not in unique_search_sets:
1076
                        # This searcher is searching a unique set of nodes, let it
1077
                        unique_search_sets.add(will_search_set)
1078
                        next_unique_searchers.append(searcher)
1079
                unique_searchers = next_unique_searchers
3377.3.2 by John Arbash Meinel
find_difference is fixed by updating _find_border_ancestors.... is that reasonable?
1080
            for searcher in common_searchers:
1081
                if searcher._next_query:
1082
                    break
1083
            else:
1084
                # All common searcher have stopped searching
3377.3.16 by John Arbash Meinel
small cleanups
1085
                return
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1086
1087
    def _remove_simple_descendants(self, revisions, parent_map):
1088
        """remove revisions which are children of other ones in the set
1089
1090
        This doesn't do any graph searching, it just checks the immediate
1091
        parent_map to find if there are any children which can be removed.
1092
1093
        :param revisions: A set of revision_ids
1094
        :return: A set of revision_ids with the children removed
1095
        """
1096
        simple_ancestors = revisions.copy()
1097
        # TODO: jam 20071214 we *could* restrict it to searching only the
1098
        #       parent_map of revisions already present in 'revisions', but
1099
        #       considering the general use case, I think this is actually
1100
        #       better.
1101
1102
        # This is the same as the following loop. I don't know that it is any
1103
        # faster.
1104
        ## simple_ancestors.difference_update(r for r, p_ids in parent_map.iteritems()
1105
        ##     if p_ids is not None and revisions.intersection(p_ids))
1106
        ## return simple_ancestors
1107
1108
        # Yet Another Way, invert the parent map (which can be cached)
1109
        ## descendants = {}
1110
        ## for revision_id, parent_ids in parent_map.iteritems():
1111
        ##   for p_id in parent_ids:
1112
        ##       descendants.setdefault(p_id, []).append(revision_id)
1113
        ## for revision in revisions.intersection(descendants):
1114
        ##   simple_ancestors.difference_update(descendants[revision])
1115
        ## return simple_ancestors
1116
        for revision, parent_ids in parent_map.iteritems():
1117
            if parent_ids is None:
1118
                continue
1119
            for parent_id in parent_ids:
1120
                if parent_id in revisions:
1121
                    # This node has a parent present in the set, so we can
1122
                    # remove it
1123
                    simple_ancestors.discard(revision)
1124
                    break
1125
        return simple_ancestors
1126
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1127
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
1128
class HeadsCache(object):
1129
    """A cache of results for graph heads calls."""
1130
1131
    def __init__(self, graph):
1132
        self.graph = graph
1133
        self._heads = {}
1134
1135
    def heads(self, keys):
1136
        """Return the heads of keys.
1137
2911.4.3 by Robert Collins
Make the contract of HeadsCache.heads() more clear.
1138
        This matches the API of Graph.heads(), specifically the return value is
1139
        a set which can be mutated, and ordering of the input is not preserved
1140
        in the output.
1141
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
1142
        :see also: Graph.heads.
1143
        :param keys: The keys to calculate heads for.
1144
        :return: A set containing the heads, which may be mutated without
1145
            affecting future lookups.
1146
        """
2911.4.2 by Robert Collins
Make HeadsCache actually work.
1147
        keys = frozenset(keys)
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
1148
        try:
1149
            return set(self._heads[keys])
1150
        except KeyError:
1151
            heads = self.graph.heads(keys)
1152
            self._heads[keys] = heads
1153
            return set(heads)
1154
1155
3224.1.20 by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers
1156
class FrozenHeadsCache(object):
1157
    """Cache heads() calls, assuming the caller won't modify them."""
1158
1159
    def __init__(self, graph):
1160
        self.graph = graph
1161
        self._heads = {}
1162
1163
    def heads(self, keys):
1164
        """Return the heads of keys.
1165
3224.1.24 by John Arbash Meinel
Fix up docstring since FrozenHeadsCache doesn't let you mutate the result.
1166
        Similar to Graph.heads(). The main difference is that the return value
1167
        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
1168
1169
        :see also: Graph.heads.
1170
        :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.
1171
        :return: A frozenset containing the heads.
3224.1.20 by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers
1172
        """
1173
        keys = frozenset(keys)
1174
        try:
1175
            return self._heads[keys]
1176
        except KeyError:
1177
            heads = frozenset(self.graph.heads(keys))
1178
            self._heads[keys] = heads
1179
            return heads
1180
1181
    def cache(self, keys, heads):
1182
        """Store a known value."""
1183
        self._heads[frozenset(keys)] = frozenset(heads)
1184
1185
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1186
class _BreadthFirstSearcher(object):
2921.3.4 by Robert Collins
Review feedback.
1187
    """Parallel search breadth-first the ancestry of revisions.
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
1188
1189
    This class implements the iterator protocol, but additionally
1190
    1. provides a set of seen ancestors, and
1191
    2. allows some ancestries to be unsearched, via stop_searching_any
1192
    """
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1193
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
1194
    def __init__(self, revisions, parents_provider):
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1195
        self._iterations = 0
1196
        self._next_query = set(revisions)
1197
        self.seen = set()
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1198
        self._started_keys = set(self._next_query)
1199
        self._stopped_keys = set()
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
1200
        self._parents_provider = parents_provider
3177.3.3 by Robert Collins
Review feedback.
1201
        self._returning = 'next_with_ghosts'
3184.1.2 by Robert Collins
Add tests for starting and stopping searches in combination with get_recipe.
1202
        self._current_present = set()
1203
        self._current_ghosts = set()
1204
        self._current_parents = {}
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1205
1206
    def __repr__(self):
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1207
        if self._iterations:
1208
            prefix = "searching"
3099.3.1 by John Arbash Meinel
Implement get_parent_map for ParentProviders
1209
        else:
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1210
            prefix = "starting"
1211
        search = '%s=%r' % (prefix, list(self._next_query))
1212
        return ('_BreadthFirstSearcher(iterations=%d, %s,'
1213
                ' seen=%r)' % (self._iterations, search, list(self.seen)))
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1214
3184.1.6 by Robert Collins
Create a SearchResult object which can be used as a replacement for sets.
1215
    def get_result(self):
1216
        """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.
1217
        
3184.1.6 by Robert Collins
Create a SearchResult object which can be used as a replacement for sets.
1218
        :return: A SearchResult for this search so far. The SearchResult is
1219
            static - the search can be advanced and the search result will not
1220
            be invalidated or altered.
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1221
        """
1222
        if self._returning == 'next':
1223
            # We have to know the current nodes children to be able to list the
1224
            # exclude keys for them. However, while we could have a second
1225
            # look-ahead result buffer and shuffle things around, this method
1226
            # 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.
1227
            # results of the search. 
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1228
            found, ghosts, next, parents = self._do_query(self._next_query)
1229
            # pretend we didn't query: perhaps we should tweak _do_query to be
1230
            # entirely stateless?
1231
            self.seen.difference_update(next)
3184.1.3 by Robert Collins
Automatically exclude ghosts.
1232
            next_query = next.union(ghosts)
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1233
        else:
1234
            next_query = self._next_query
3184.1.5 by Robert Collins
Record the number of found revisions for cross checking.
1235
        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.
1236
        included_keys = self.seen.difference(excludes)
1237
        return SearchResult(self._started_keys, excludes, len(included_keys),
1238
            included_keys)
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1239
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1240
    def step(self):
1241
        try:
1242
            return self.next()
1243
        except StopIteration:
1244
            return ()
1245
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1246
    def next(self):
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
1247
        """Return the next ancestors of this revision.
1248
2490.2.12 by Aaron Bentley
Improve documentation
1249
        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
1250
        traversal.  No ancestor will be returned more than once. Ancestors are
1251
        returned before their parentage is queried, so ghosts and missing
1252
        revisions (including the start revisions) are included in the result.
1253
        This can save a round trip in LCA style calculation by allowing
1254
        convergence to be detected without reading the data for the revision
1255
        the convergence occurs on.
1256
1257
        :return: A set of revision_ids.
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
1258
        """
3177.3.3 by Robert Collins
Review feedback.
1259
        if self._returning != 'next':
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1260
            # switch to returning the query, not the results.
3177.3.3 by Robert Collins
Review feedback.
1261
            self._returning = 'next'
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1262
            self._iterations += 1
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1263
        else:
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1264
            self._advance()
1265
        if len(self._next_query) == 0:
1266
            raise StopIteration()
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1267
        # We have seen what we're querying at this point as we are returning
1268
        # the query, not the results.
1269
        self.seen.update(self._next_query)
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1270
        return self._next_query
1271
1272
    def next_with_ghosts(self):
1273
        """Return the next found ancestors, with ghosts split out.
1274
        
1275
        Ancestors are returned in the order they are seen in a breadth-first
1276
        traversal.  No ancestor will be returned more than once. Ancestors are
3177.3.3 by Robert Collins
Review feedback.
1277
        returned only after asking for their parents, which allows us to detect
1278
        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
1279
1280
        :return: A tuple with (present ancestors, ghost ancestors) sets.
1281
        """
3177.3.3 by Robert Collins
Review feedback.
1282
        if self._returning != 'next_with_ghosts':
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1283
            # switch to returning the results, not the current query.
3177.3.3 by Robert Collins
Review feedback.
1284
            self._returning = 'next_with_ghosts'
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1285
            self._advance()
1286
        if len(self._next_query) == 0:
1287
            raise StopIteration()
1288
        self._advance()
1289
        return self._current_present, self._current_ghosts
1290
1291
    def _advance(self):
1292
        """Advance the search.
1293
1294
        Updates self.seen, self._next_query, self._current_present,
3177.3.3 by Robert Collins
Review feedback.
1295
        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
1296
        """
1297
        self._iterations += 1
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1298
        found, ghosts, next, parents = self._do_query(self._next_query)
1299
        self._current_present = found
1300
        self._current_ghosts = ghosts
1301
        self._next_query = next
1302
        self._current_parents = parents
3184.1.3 by Robert Collins
Automatically exclude ghosts.
1303
        # ghosts are implicit stop points, otherwise the search cannot be
1304
        # repeated when ghosts are filled.
1305
        self._stopped_keys.update(ghosts)
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1306
1307
    def _do_query(self, revisions):
1308
        """Query for revisions.
1309
3184.1.4 by Robert Collins
Correctly exclude ghosts when ghosts are started on an existing search.
1310
        Adds revisions to the seen set.
1311
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1312
        :param revisions: Revisions to query.
1313
        :return: A tuple: (set(found_revisions), set(ghost_revisions),
1314
           set(parents_of_found_revisions), dict(found_revisions:parents)).
1315
        """
3377.3.9 by John Arbash Meinel
Small tweaks to _do_query
1316
        found_revisions = set()
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1317
        parents_of_found = set()
3184.1.1 by Robert Collins
Add basic get_recipe to the graph breadth first searcher.
1318
        # revisions may contain nodes that point to other nodes in revisions:
1319
        # we want to filter them out.
1320
        self.seen.update(revisions)
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1321
        parent_map = self._parents_provider.get_parent_map(revisions)
3377.3.9 by John Arbash Meinel
Small tweaks to _do_query
1322
        found_revisions.update(parent_map)
3177.3.1 by Robert Collins
* New method ``next_with_ghosts`` on the Graph breadth-first-search objects
1323
        for rev_id, parents in parent_map.iteritems():
3517.4.2 by Martin Pool
Make simple-annotation and graph code more tolerant of knits with no graph
1324
            if parents is None:
1325
                continue
3377.3.9 by John Arbash Meinel
Small tweaks to _do_query
1326
            new_found_parents = [p for p in parents if p not in self.seen]
1327
            if new_found_parents:
1328
                # Calling set.update() with an empty generator is actually
1329
                # rather expensive.
1330
                parents_of_found.update(new_found_parents)
1331
        ghost_revisions = revisions - found_revisions
1332
        return found_revisions, ghost_revisions, parents_of_found, parent_map
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1333
2490.2.8 by Aaron Bentley
fix iteration stuff
1334
    def __iter__(self):
1335
        return self
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1336
3377.3.1 by John Arbash Meinel
Bring in some of the changes from graph_update and graph_optimization
1337
    def find_seen_ancestors(self, revisions):
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
1338
        """Find ancestors of these revisions that have already been seen.
1339
        
1340
        This function generally makes the assumption that querying for the
1341
        parents of a node that has already been queried is reasonably cheap.
1342
        (eg, not a round trip to a remote host).
1343
        """
1344
        # TODO: Often we might ask one searcher for its seen ancestors, and
1345
        #       then ask another searcher the same question. This can result in
1346
        #       searching the same revisions repeatedly if the two searchers
1347
        #       have a lot of overlap.
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
1348
        all_seen = self.seen
1349
        pending = set(revisions).intersection(all_seen)
1350
        seen_ancestors = set(pending)
1351
1352
        if self._returning == 'next':
1353
            # self.seen contains what nodes have been returned, not what nodes
1354
            # have been queried. We don't want to probe for nodes that haven't
1355
            # been searched yet.
1356
            not_searched_yet = self._next_query
1357
        else:
1358
            not_searched_yet = ()
3377.3.11 by John Arbash Meinel
Committing a debug thunk that was very helpful
1359
        pending.difference_update(not_searched_yet)
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
1360
        get_parent_map = self._parents_provider.get_parent_map
3377.3.12 by John Arbash Meinel
Remove the helpful but ugly thunk
1361
        while pending:
1362
            parent_map = get_parent_map(pending)
1363
            all_parents = []
1364
            # We don't care if it is a ghost, since it can't be seen if it is
1365
            # a ghost
1366
            for parent_ids in parent_map.itervalues():
1367
                all_parents.extend(parent_ids)
1368
            next_pending = all_seen.intersection(all_parents).difference(seen_ancestors)
1369
            seen_ancestors.update(next_pending)
1370
            next_pending.difference_update(not_searched_yet)
1371
            pending = next_pending
3377.3.10 by John Arbash Meinel
Tweak _BreadthFirstSearcher.find_seen_ancestors()
1372
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
1373
        return seen_ancestors
1374
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
1375
    def stop_searching_any(self, revisions):
1376
        """
1377
        Remove any of the specified revisions from the search list.
1378
1379
        None of the specified revisions are required to be present in the
3808.1.4 by John Arbash Meinel
make _walk_to_common responsible for stopping ancestors
1380
        search list.
3808.1.1 by Andrew Bennetts
Possible fix for bug in new _walk_to_common_revisions.
1381
3808.1.4 by John Arbash Meinel
make _walk_to_common responsible for stopping ancestors
1382
        It is okay to call stop_searching_any() for revisions which were seen
1383
        in previous iterations. It is the callers responsibility to call
1384
        find_seen_ancestors() to make sure that current search tips that are
1385
        ancestors of those revisions are also stopped.  All explicitly stopped
1386
        revisions will be excluded from the search result's get_keys(), though.
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
1387
        """
3377.4.6 by John Arbash Meinel
Lots of refactoring for find_unique_ancestors.
1388
        # TODO: does this help performance?
1389
        # if not revisions:
1390
        #     return set()
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1391
        revisions = frozenset(revisions)
3177.3.3 by Robert Collins
Review feedback.
1392
        if self._returning == 'next':
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1393
            stopped = self._next_query.intersection(revisions)
1394
            self._next_query = self._next_query.difference(revisions)
1395
        else:
3184.2.1 by Robert Collins
Handle stopping ghosts in searches properly.
1396
            stopped_present = self._current_present.intersection(revisions)
1397
            stopped = stopped_present.union(
1398
                self._current_ghosts.intersection(revisions))
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1399
            self._current_present.difference_update(stopped)
1400
            self._current_ghosts.difference_update(stopped)
1401
            # stopping 'x' should stop returning parents of 'x', but 
1402
            # not if 'y' always references those same parents
1403
            stop_rev_references = {}
3184.2.1 by Robert Collins
Handle stopping ghosts in searches properly.
1404
            for rev in stopped_present:
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1405
                for parent_id in self._current_parents[rev]:
1406
                    if parent_id not in stop_rev_references:
1407
                        stop_rev_references[parent_id] = 0
1408
                    stop_rev_references[parent_id] += 1
1409
            # if only the stopped revisions reference it, the ref count will be
1410
            # 0 after this loop
3177.3.3 by Robert Collins
Review feedback.
1411
            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.
1412
                for parent_id in parents:
1413
                    try:
1414
                        stop_rev_references[parent_id] -= 1
1415
                    except KeyError:
1416
                        pass
1417
            stop_parents = set()
1418
            for rev_id, refs in stop_rev_references.iteritems():
1419
                if refs == 0:
1420
                    stop_parents.add(rev_id)
1421
            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.
1422
        self._stopped_keys.update(stopped)
3808.1.1 by Andrew Bennetts
Possible fix for bug in new _walk_to_common_revisions.
1423
        self._stopped_keys.update(revisions - set([revision.NULL_REVISION]))
2490.2.25 by Aaron Bentley
Update from review
1424
        return stopped
2490.2.17 by Aaron Bentley
Add start_searching, tweak stop_searching_any
1425
1426
    def start_searching(self, revisions):
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1427
        """Add revisions to the search.
1428
1429
        The parents of revisions will be returned from the next call to next()
1430
        or next_with_ghosts(). If next_with_ghosts was the most recently used
1431
        next* call then the return value is the result of looking up the
1432
        ghost/not ghost status of revisions. (A tuple (present, ghosted)).
1433
        """
1434
        revisions = frozenset(revisions)
3184.1.2 by Robert Collins
Add tests for starting and stopping searches in combination with get_recipe.
1435
        self._started_keys.update(revisions)
3184.1.4 by Robert Collins
Correctly exclude ghosts when ghosts are started on an existing search.
1436
        new_revisions = revisions.difference(self.seen)
3177.3.3 by Robert Collins
Review feedback.
1437
        if self._returning == 'next':
3184.1.4 by Robert Collins
Correctly exclude ghosts when ghosts are started on an existing search.
1438
            self._next_query.update(new_revisions)
3377.3.30 by John Arbash Meinel
Can we avoid the extra _do_query in start_searching?
1439
            self.seen.update(new_revisions)
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1440
        else:
1441
            # perform a query on revisions
3377.3.30 by John Arbash Meinel
Can we avoid the extra _do_query in start_searching?
1442
            revs, ghosts, query, parents = self._do_query(revisions)
1443
            self._stopped_keys.update(ghosts)
3177.3.2 by Robert Collins
Update graph searchers stop_searching_any and start_searching for next_with_ghosts.
1444
            self._current_present.update(revs)
1445
            self._current_ghosts.update(ghosts)
1446
            self._next_query.update(query)
1447
            self._current_parents.update(parents)
1448
            return revs, ghosts
3184.1.6 by Robert Collins
Create a SearchResult object which can be used as a replacement for sets.
1449
1450
1451
class SearchResult(object):
1452
    """The result of a breadth first search.
1453
1454
    A SearchResult provides the ability to reconstruct the search or access a
1455
    set of the keys the search found.
1456
    """
1457
1458
    def __init__(self, start_keys, exclude_keys, key_count, keys):
1459
        """Create a SearchResult.
1460
1461
        :param start_keys: The keys the search started at.
1462
        :param exclude_keys: The keys the search excludes.
1463
        :param key_count: The total number of keys (from start to but not
1464
            including exclude).
1465
        :param keys: The keys the search found. Note that in future we may get
1466
            a SearchResult from a smart server, in which case the keys list is
1467
            not necessarily immediately available.
1468
        """
1469
        self._recipe = (start_keys, exclude_keys, key_count)
1470
        self._keys = frozenset(keys)
1471
1472
    def get_recipe(self):
1473
        """Return a recipe that can be used to replay this search.
1474
        
1475
        The recipe allows reconstruction of the same results at a later date
1476
        without knowing all the found keys. The essential elements are a list
1477
        of keys to start and and to stop at. In order to give reproducible
1478
        results when ghosts are encountered by a search they are automatically
1479
        added to the exclude list (or else ghost filling may alter the
1480
        results).
1481
1482
        :return: A tuple (start_keys_set, exclude_keys_set, revision_count). To
1483
            recreate the results of this search, create a breadth first
1484
            searcher on the same graph starting at start_keys. Then call next()
1485
            (or next_with_ghosts()) repeatedly, and on every result, call
1486
            stop_searching_any on any keys from the exclude_keys set. The
1487
            revision_count value acts as a trivial cross-check - the found
1488
            revisions of the new search should have as many elements as
1489
            revision_count. If it does not, then additional revisions have been
1490
            ghosted since the search was executed the first time and the second
1491
            time.
1492
        """
1493
        return self._recipe
1494
1495
    def get_keys(self):
1496
        """Return the keys found in this search.
1497
1498
        :return: A set of keys.
1499
        """
1500
        return self._keys
1501
3514.2.14 by John Arbash Meinel
Bring in the code to collapse linear portions of the graph.
1502
1503
def collapse_linear_regions(parent_map):
1504
    """Collapse regions of the graph that are 'linear'.
1505
1506
    For example::
1507
1508
      A:[B], B:[C]
1509
1510
    can be collapsed by removing B and getting::
1511
1512
      A:[C]
1513
1514
    :param parent_map: A dictionary mapping children to their parents
1515
    :return: Another dictionary with 'linear' chains collapsed
1516
    """
1517
    # Note: this isn't a strictly minimal collapse. For example:
1518
    #   A
1519
    #  / \
1520
    # B   C
1521
    #  \ /
1522
    #   D
1523
    #   |
1524
    #   E
1525
    # Will not have 'D' removed, even though 'E' could fit. Also:
1526
    #   A
1527
    #   |    A
1528
    #   B => |
1529
    #   |    C
1530
    #   C
1531
    # A and C are both kept because they are edges of the graph. We *could* get
1532
    # rid of A if we wanted.
1533
    #   A
1534
    #  / \
1535
    # B   C
1536
    # |   |
1537
    # D   E
1538
    #  \ /
1539
    #   F
1540
    # Will not have any nodes removed, even though you do have an
1541
    # 'uninteresting' linear D->B and E->C
1542
    children = {}
1543
    for child, parents in parent_map.iteritems():
1544
        children.setdefault(child, [])
1545
        for p in parents:
1546
            children.setdefault(p, []).append(child)
1547
1548
    orig_children = dict(children)
1549
    removed = set()
1550
    result = dict(parent_map)
1551
    for node in parent_map:
1552
        parents = result[node]
1553
        if len(parents) == 1:
1554
            parent_children = children[parents[0]]
1555
            if len(parent_children) != 1:
1556
                # This is not the only child
1557
                continue
1558
            node_children = children[node]
1559
            if len(node_children) != 1:
1560
                continue
1561
            child_parents = result.get(node_children[0], None)
1562
            if len(child_parents) != 1:
1563
                # This is not its only parent
1564
                continue
1565
            # The child of this node only points at it, and the parent only has
1566
            # this as a child. remove this node, and join the others together
1567
            result[node_children[0]] = parents
1568
            children[parents[0]] = node_children
1569
            del result[node]
1570
            del children[node]
1571
            removed.add(node)
1572
1573
    return result