~bzr-pqm/bzr/bzr.dev

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