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