/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
1
# Copyright (C) 2007 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
17
from bzrlib import (
18
    errors,
19
    tsort,
20
    )
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
21
from bzrlib.deprecated_graph import (node_distances, select_farthest)
2490.2.1 by Aaron Bentley
Start work on GraphWalker
22
2490.2.25 by Aaron Bentley
Update from review
23
# DIAGRAM of terminology
24
#       A
25
#       /\
26
#      B  C
27
#      |  |\
28
#      D  E F
29
#      |\/| |
30
#      |/\|/
31
#      G  H
32
#
33
# In this diagram, relative to G and H:
34
# A, B, C, D, E are common ancestors.
35
# C, D and E are border ancestors, because each has a non-common descendant.
36
# D and E are least common ancestors because none of their descendants are
37
# common ancestors.
38
# C is not a least common ancestor because its descendant, E, is a common
39
# ancestor.
40
#
41
# The find_unique_lca algorithm will pick A in two steps:
42
# 1. find_lca('G', 'H') => ['D', 'E']
43
# 2. Since len(['D', 'E']) > 1, find_lca('D', 'E') => ['A']
44
45
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
46
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
47
class _StackedParentsProvider(object):
48
49
    def __init__(self, parent_providers):
50
        self._parent_providers = parent_providers
51
2490.2.28 by Aaron Bentley
Fix handling of null revision
52
    def __repr__(self):
53
        return "_StackedParentsProvider(%r)" % self._parent_providers
54
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
55
    def get_parents(self, revision_ids):
2490.2.25 by Aaron Bentley
Update from review
56
        """Find revision ids of the parents of a list of revisions
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
57
58
        A list is returned of the same length as the input.  Each entry
59
        is a list of parent ids for the corresponding input revision.
60
61
        [NULL_REVISION] is used as the parent of the first user-committed
62
        revision.  Its parent list is empty.
63
64
        If the revision is not present (i.e. a ghost), None is used in place
65
        of the list of parents.
66
        """
67
        found = {}
68
        for parents_provider in self._parent_providers:
2490.2.25 by Aaron Bentley
Update from review
69
            pending_revisions = [r for r in revision_ids if r not in found]
70
            parent_list = parents_provider.get_parents(pending_revisions)
71
            new_found = dict((k, v) for k, v in zip(pending_revisions,
72
                             parent_list) if v is not None)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
73
            found.update(new_found)
74
            if len(found) == len(revision_ids):
75
                break
2490.2.25 by Aaron Bentley
Update from review
76
        return [found.get(r, None) for r in revision_ids]
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
77
78
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
79
class Graph(object):
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
80
    """Provide incremental access to revision graphs.
81
82
    This is the generic implementation; it is intended to be subclassed to
83
    specialize it for other repository types.
84
    """
2490.2.1 by Aaron Bentley
Start work on GraphWalker
85
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
86
    def __init__(self, parents_provider):
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
87
        """Construct a Graph that uses several graphs as its input
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
88
89
        This should not normally be invoked directly, because there may be
90
        specialized implementations for particular repository types.  See
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
91
        Repository.get_graph()
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
92
2921.3.4 by Robert Collins
Review feedback.
93
        :param parents_provider: An object providing a get_parents call
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
94
            conforming to the behavior of StackedParentsProvider.get_parents
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
95
        """
96
        self.get_parents = parents_provider.get_parents
2490.2.29 by Aaron Bentley
Make parents provider private
97
        self._parents_provider = parents_provider
2490.2.28 by Aaron Bentley
Fix handling of null revision
98
99
    def __repr__(self):
2490.2.29 by Aaron Bentley
Make parents provider private
100
        return 'Graph(%r)' % self._parents_provider
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
101
102
    def find_lca(self, *revisions):
103
        """Determine the lowest common ancestors of the provided revisions
104
105
        A lowest common ancestor is a common ancestor none of whose
106
        descendants are common ancestors.  In graphs, unlike trees, there may
107
        be multiple lowest common ancestors.
2490.2.12 by Aaron Bentley
Improve documentation
108
109
        This algorithm has two phases.  Phase 1 identifies border ancestors,
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
110
        and phase 2 filters border ancestors to determine lowest common
111
        ancestors.
2490.2.12 by Aaron Bentley
Improve documentation
112
113
        In phase 1, border ancestors are identified, using a breadth-first
114
        search starting at the bottom of the graph.  Searches are stopped
115
        whenever a node or one of its descendants is determined to be common
116
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
117
        In phase 2, the border ancestors are filtered to find the least
2490.2.12 by Aaron Bentley
Improve documentation
118
        common ancestors.  This is done by searching the ancestries of each
119
        border ancestor.
120
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
121
        Phase 2 is perfomed on the principle that a border ancestor that is
122
        not an ancestor of any other border ancestor is a least common
123
        ancestor.
2490.2.12 by Aaron Bentley
Improve documentation
124
125
        Searches are stopped when they find a node that is determined to be a
126
        common ancestor of all border ancestors, because this shows that it
127
        cannot be a descendant of any border ancestor.
128
129
        The scaling of this operation should be proportional to
130
        1. The number of uncommon ancestors
131
        2. The number of border ancestors
132
        3. The length of the shortest path between a border ancestor and an
133
           ancestor of all border ancestors.
2490.2.3 by Aaron Bentley
Implement new merge base picker
134
        """
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
135
        border_common, common, sides = self._find_border_ancestors(revisions)
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
136
        # We may have common ancestors that can be reached from each other.
137
        # - ask for the heads of them to filter it down to only ones that
138
        # cannot be reached from each other - phase 2.
139
        return self.heads(border_common)
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
140
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
141
    def find_difference(self, left_revision, right_revision):
2490.2.25 by Aaron Bentley
Update from review
142
        """Determine the graph difference between two revisions"""
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
143
        border, common, (left, right) = self._find_border_ancestors(
144
            [left_revision, right_revision])
145
        return (left.difference(right).difference(common),
146
                right.difference(left).difference(common))
147
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
148
    def _make_breadth_first_searcher(self, revisions):
149
        return _BreadthFirstSearcher(revisions, self)
150
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
151
    def _find_border_ancestors(self, revisions):
2490.2.12 by Aaron Bentley
Improve documentation
152
        """Find common ancestors with at least one uncommon descendant.
153
154
        Border ancestors are identified using a breadth-first
155
        search starting at the bottom of the graph.  Searches are stopped
156
        whenever a node or one of its descendants is determined to be common.
157
158
        This will scale with the number of uncommon ancestors.
2490.2.25 by Aaron Bentley
Update from review
159
160
        As well as the border ancestors, a set of seen common ancestors and a
161
        list of sets of seen ancestors for each input revision is returned.
162
        This allows calculation of graph difference from the results of this
163
        operation.
2490.2.12 by Aaron Bentley
Improve documentation
164
        """
2490.2.28 by Aaron Bentley
Fix handling of null revision
165
        if None in revisions:
166
            raise errors.InvalidRevisionId(None, self)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
167
        common_searcher = self._make_breadth_first_searcher([])
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
168
        common_ancestors = set()
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
169
        searchers = [self._make_breadth_first_searcher([r])
170
                     for r in revisions]
171
        active_searchers = searchers[:]
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
172
        border_ancestors = set()
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
173
        def update_common(searcher, revisions):
174
            w_seen_ancestors = searcher.find_seen_ancestors(
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
175
                revision)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
176
            stopped = searcher.stop_searching_any(w_seen_ancestors)
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
177
            common_ancestors.update(w_seen_ancestors)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
178
            common_searcher.start_searching(stopped)
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
179
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
180
        while True:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
181
            if len(active_searchers) == 0:
2490.2.23 by Aaron Bentley
Adapt find_borders to produce a graph difference
182
                return border_ancestors, common_ancestors, [s.seen for s in
183
                                                            searchers]
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
184
            try:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
185
                new_common = common_searcher.next()
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
186
                common_ancestors.update(new_common)
187
            except StopIteration:
188
                pass
189
            else:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
190
                for searcher in active_searchers:
191
                    for revision in new_common.intersection(searcher.seen):
192
                        update_common(searcher, revision)
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
193
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
194
            newly_seen = set()
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
195
            new_active_searchers = []
196
            for searcher in active_searchers:
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
197
                try:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
198
                    newly_seen.update(searcher.next())
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
199
                except StopIteration:
200
                    pass
201
                else:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
202
                    new_active_searchers.append(searcher)
203
            active_searchers = new_active_searchers
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
204
            for revision in newly_seen:
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
205
                if revision in common_ancestors:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
206
                    for searcher in searchers:
207
                        update_common(searcher, revision)
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
208
                    continue
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
209
                for searcher in searchers:
210
                    if revision not in searcher.seen:
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
211
                        break
212
                else:
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
213
                    border_ancestors.add(revision)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
214
                    for searcher in searchers:
215
                        update_common(searcher, revision)
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
216
2776.3.1 by Robert Collins
* Deprecated method ``find_previous_heads`` on
217
    def heads(self, keys):
218
        """Return the heads from amongst keys.
219
220
        This is done by searching the ancestries of each key.  Any key that is
221
        reachable from another key is not returned; all the others are.
222
223
        This operation scales with the relative depth between any two keys. If
224
        any two keys are completely disconnected all ancestry of both sides
225
        will be retrieved.
226
227
        :param keys: An iterable of keys.
2776.1.4 by Robert Collins
Trivial review feedback changes.
228
        :return: A set of the heads. Note that as a set there is no ordering
229
            information. Callers will need to filter their input to create
230
            order if they need it.
2490.2.12 by Aaron Bentley
Improve documentation
231
        """
2776.1.4 by Robert Collins
Trivial review feedback changes.
232
        candidate_heads = set(keys)
2850.2.1 by Robert Collins
(robertc) Special case the zero-or-no-heads case for Graph.heads(). (Robert Collins)
233
        if len(candidate_heads) < 2:
234
            return candidate_heads
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
235
        searchers = dict((c, self._make_breadth_first_searcher([c]))
2776.1.4 by Robert Collins
Trivial review feedback changes.
236
                          for c in candidate_heads)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
237
        active_searchers = dict(searchers)
238
        # skip over the actual candidate for each searcher
239
        for searcher in active_searchers.itervalues():
1551.15.81 by Aaron Bentley
Remove testing code
240
            searcher.next()
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
241
        # The common walker finds nodes that are common to two or more of the
242
        # input keys, so that we don't access all history when a currently
243
        # uncommon search point actually meets up with something behind a
244
        # common search point. Common search points do not keep searches
245
        # active; they just allow us to make searches inactive without
246
        # accessing all history.
247
        common_walker = self._make_breadth_first_searcher([])
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
248
        while len(active_searchers) > 0:
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
249
            ancestors = set()
250
            # advance searches
251
            try:
252
                common_walker.next()
253
            except StopIteration:
2921.3.4 by Robert Collins
Review feedback.
254
                # 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
255
                pass
1551.15.78 by Aaron Bentley
Fix KeyError in filter_candidate_lca
256
            for candidate in active_searchers.keys():
257
                try:
258
                    searcher = active_searchers[candidate]
259
                except KeyError:
260
                    # rare case: we deleted candidate in a previous iteration
261
                    # through this for loop, because it was determined to be
262
                    # a descendant of another candidate.
263
                    continue
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
264
                try:
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
265
                    ancestors.update(searcher.next())
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
266
                except StopIteration:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
267
                    del active_searchers[candidate]
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
268
                    continue
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
269
            # process found nodes
270
            new_common = set()
271
            for ancestor in ancestors:
272
                if ancestor in candidate_heads:
273
                    candidate_heads.remove(ancestor)
274
                    del searchers[ancestor]
275
                    if ancestor in active_searchers:
276
                        del active_searchers[ancestor]
277
                # it may meet up with a known common node
2921.3.4 by Robert Collins
Review feedback.
278
                if ancestor in common_walker.seen:
279
                    # some searcher has encountered our known common nodes:
280
                    # just stop it
281
                    ancestor_set = set([ancestor])
282
                    for searcher in searchers.itervalues():
283
                        searcher.stop_searching_any(ancestor_set)
284
                else:
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
285
                    # or it may have been just reached by all the searchers:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
286
                    for searcher in searchers.itervalues():
287
                        if ancestor not in searcher.seen:
2490.2.9 by Aaron Bentley
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
288
                            break
289
                    else:
2921.3.4 by Robert Collins
Review feedback.
290
                        # The final active searcher has just reached this node,
291
                        # making it be known as a descendant of all candidates,
292
                        # so we can stop searching it, and any seen ancestors
293
                        new_common.add(ancestor)
294
                        for searcher in searchers.itervalues():
295
                            seen_ancestors =\
296
                                searcher.find_seen_ancestors(ancestor)
297
                            searcher.stop_searching_any(seen_ancestors)
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
298
            common_walker.start_searching(new_common)
2776.1.4 by Robert Collins
Trivial review feedback changes.
299
        return candidate_heads
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
300
301
    def find_unique_lca(self, left_revision, right_revision):
302
        """Find a unique LCA.
303
304
        Find lowest common ancestors.  If there is no unique  common
305
        ancestor, find the lowest common ancestors of those ancestors.
306
307
        Iteration stops when a unique lowest common ancestor is found.
308
        The graph origin is necessarily a unique lowest common ancestor.
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
309
310
        Note that None is not an acceptable substitute for NULL_REVISION.
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
311
        in the input for this method.
2490.2.3 by Aaron Bentley
Implement new merge base picker
312
        """
313
        revisions = [left_revision, right_revision]
314
        while True:
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
315
            lca = self.find_lca(*revisions)
316
            if len(lca) == 1:
317
                return lca.pop()
2520.4.104 by Aaron Bentley
Avoid infinite loop when there is no unique lca
318
            if len(lca) == 0:
319
                raise errors.NoCommonAncestor(left_revision, right_revision)
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
320
            revisions = lca
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
321
2490.2.31 by Aaron Bentley
Fix iter_topo_order to permit un-included parents
322
    def iter_topo_order(self, revisions):
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
323
        """Iterate through the input revisions in topological order.
324
325
        This sorting only ensures that parents come before their children.
326
        An ancestor may sort after a descendant if the relationship is not
327
        visible in the supplied list of revisions.
328
        """
2490.2.34 by Aaron Bentley
Update NEWS and change implementation to return an iterator
329
        sorter = tsort.TopoSorter(zip(revisions, self.get_parents(revisions)))
330
        return sorter.iter_topo_order()
2490.2.30 by Aaron Bentley
Add functionality for tsorting graphs
331
2653.2.1 by Aaron Bentley
Implement Graph.is_ancestor
332
    def is_ancestor(self, candidate_ancestor, candidate_descendant):
2653.2.5 by Aaron Bentley
Update to clarify algorithm
333
        """Determine whether a revision is an ancestor of another.
334
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
335
        We answer this using heads() as heads() has the logic to perform the
336
        smallest number of parent looksup to determine the ancestral
337
        relationship between N revisions.
2653.2.5 by Aaron Bentley
Update to clarify algorithm
338
        """
2921.3.1 by Robert Collins
* Graph ``heads()`` queries have been bugfixed to no longer access all
339
        return set([candidate_descendant]) == self.heads(
340
            [candidate_ancestor, candidate_descendant])
2653.2.1 by Aaron Bentley
Implement Graph.is_ancestor
341
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
342
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
343
class HeadsCache(object):
344
    """A cache of results for graph heads calls."""
345
346
    def __init__(self, graph):
347
        self.graph = graph
348
        self._heads = {}
349
350
    def heads(self, keys):
351
        """Return the heads of keys.
352
2911.4.3 by Robert Collins
Make the contract of HeadsCache.heads() more clear.
353
        This matches the API of Graph.heads(), specifically the return value is
354
        a set which can be mutated, and ordering of the input is not preserved
355
        in the output.
356
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
357
        :see also: Graph.heads.
358
        :param keys: The keys to calculate heads for.
359
        :return: A set containing the heads, which may be mutated without
360
            affecting future lookups.
361
        """
2911.4.2 by Robert Collins
Make HeadsCache actually work.
362
        keys = frozenset(keys)
2911.4.1 by Robert Collins
Factor out the Graph.heads() cache from _RevisionTextVersionCache for reuse, and use it in commit.
363
        try:
364
            return set(self._heads[keys])
365
        except KeyError:
366
            heads = self.graph.heads(keys)
367
            self._heads[keys] = heads
368
            return set(heads)
369
370
2592.3.223 by Robert Collins
Merge graph history-access bugfix.
371
class HeadsCache(object):
372
    """A cache of results for graph heads calls."""
373
374
    def __init__(self, graph):
375
        self.graph = graph
376
        self._heads = {}
377
378
    def heads(self, keys):
379
        """Return the heads of keys.
380
381
        :see also: Graph.heads.
382
        :param keys: The keys to calculate heads for.
383
        :return: A set containing the heads, which may be mutated without
384
            affecting future lookups.
385
        """
386
        keys = frozenset(keys)
387
        try:
388
            return set(self._heads[keys])
389
        except KeyError:
390
            heads = self.graph.heads(keys)
391
            self._heads[keys] = heads
392
            return set(heads)
393
394
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
395
class _BreadthFirstSearcher(object):
2921.3.4 by Robert Collins
Review feedback.
396
    """Parallel search breadth-first the ancestry of revisions.
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
397
398
    This class implements the iterator protocol, but additionally
399
    1. provides a set of seen ancestors, and
400
    2. allows some ancestries to be unsearched, via stop_searching_any
401
    """
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
402
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
403
    def __init__(self, revisions, parents_provider):
2490.2.18 by Aaron Bentley
Change AncestryWalker to take a set of ancestors
404
        self._start = set(revisions)
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
405
        self._search_revisions = None
2490.2.18 by Aaron Bentley
Change AncestryWalker to take a set of ancestors
406
        self.seen = set(revisions)
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
407
        self._parents_provider = parents_provider 
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
408
409
    def __repr__(self):
2490.2.25 by Aaron Bentley
Update from review
410
        return ('_BreadthFirstSearcher(self._search_revisions=%r,'
411
                ' self.seen=%r)' % (self._search_revisions, self.seen))
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
412
413
    def next(self):
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
414
        """Return the next ancestors of this revision.
415
2490.2.12 by Aaron Bentley
Improve documentation
416
        Ancestors are returned in the order they are seen in a breadth-first
417
        traversal.  No ancestor will be returned more than once.
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
418
        """
419
        if self._search_revisions is None:
420
            self._search_revisions = self._start
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
421
        else:
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
422
            new_search_revisions = set()
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
423
            for parents in self._parents_provider.get_parents(
2490.2.13 by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept
424
                self._search_revisions):
425
                if parents is None:
426
                    continue
427
                new_search_revisions.update(p for p in parents if
428
                                            p not in self.seen)
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
429
            self._search_revisions = new_search_revisions
430
        if len(self._search_revisions) == 0:
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
431
            raise StopIteration()
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
432
        self.seen.update(self._search_revisions)
433
        return self._search_revisions
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
434
2490.2.8 by Aaron Bentley
fix iteration stuff
435
    def __iter__(self):
436
        return self
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
437
438
    def find_seen_ancestors(self, revision):
2490.2.25 by Aaron Bentley
Update from review
439
        """Find ancestors of this revision that have already been seen."""
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
440
        searcher = _BreadthFirstSearcher([revision], self._parents_provider)
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
441
        seen_ancestors = set()
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
442
        for ancestors in searcher:
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
443
            for ancestor in ancestors:
444
                if ancestor not in self.seen:
2490.2.22 by Aaron Bentley
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
445
                    searcher.stop_searching_any([ancestor])
2490.2.7 by Aaron Bentley
Start implementing mca that scales with number of uncommon ancestors
446
                else:
447
                    seen_ancestors.add(ancestor)
448
        return seen_ancestors
449
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
450
    def stop_searching_any(self, revisions):
451
        """
452
        Remove any of the specified revisions from the search list.
453
454
        None of the specified revisions are required to be present in the
2490.2.12 by Aaron Bentley
Improve documentation
455
        search list.  In this case, the call is a no-op.
2490.2.10 by Aaron Bentley
Clarify text, remove unused _get_ancestry method
456
        """
2490.2.25 by Aaron Bentley
Update from review
457
        stopped = self._search_revisions.intersection(revisions)
458
        self._search_revisions = self._search_revisions.difference(revisions)
459
        return stopped
2490.2.17 by Aaron Bentley
Add start_searching, tweak stop_searching_any
460
461
    def start_searching(self, revisions):
462
        if self._search_revisions is None:
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
463
            self._start = set(revisions)
2490.2.17 by Aaron Bentley
Add start_searching, tweak stop_searching_any
464
        else:
2490.2.25 by Aaron Bentley
Update from review
465
            self._search_revisions.update(revisions.difference(self.seen))
2490.2.19 by Aaron Bentley
Implement common-ancestor-based culling
466
        self.seen.update(revisions)