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