~bzr-pqm/bzr/bzr.dev

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