/brz/remove-bazaar

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