~bzr-pqm/bzr/bzr.dev

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