/brz/remove-bazaar

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