/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2009, 2010 Canonical Ltd
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17
"""Implementation of Graph algorithms when we have already loaded everything.
18
"""
19
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
20
from __future__ import absolute_import
21
6800.1.3 by Jelmer Vernooij
Avoid modifying possibly lazily imported module.
22
import collections
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from . import (
4593.5.30 by John Arbash Meinel
Move the topo_sort implementation into KnownGraph, rather than calling back to it.
24
    errors,
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
25
    revision,
26
    )
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
27
from .sixish import (
28
    viewitems,
29
    viewvalues,
30
    )
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
31
32
33
class _KnownGraphNode(object):
34
    """Represents a single object in the known graph."""
35
4371.4.10 by Vincent Ladeuil
Cleanup.
36
    __slots__ = ('key', 'parent_keys', 'child_keys', 'gdfo')
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
37
38
    def __init__(self, key, parent_keys):
39
        self.key = key
40
        self.parent_keys = parent_keys
41
        self.child_keys = []
42
        # Greatest distance from origin
43
        self.gdfo = None
44
45
    def __repr__(self):
4371.4.10 by Vincent Ladeuil
Cleanup.
46
        return '%s(%s  gdfo:%s par:%s child:%s)' % (
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
47
            self.__class__.__name__, self.key, self.gdfo,
4371.4.10 by Vincent Ladeuil
Cleanup.
48
            self.parent_keys, self.child_keys)
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
49
50
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
51
class _MergeSortNode(object):
52
    """Information about a specific node in the merge graph."""
53
54
    __slots__ = ('key', 'merge_depth', 'revno', 'end_of_merge')
55
56
    def __init__(self, key, merge_depth, revno, end_of_merge):
57
        self.key = key
58
        self.merge_depth = merge_depth
59
        self.revno = revno
60
        self.end_of_merge = end_of_merge
61
62
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
63
class KnownGraph(object):
64
    """This is a class which assumes we already know the full graph."""
65
66
    def __init__(self, parent_map, do_cache=True):
67
        """Create a new KnownGraph instance.
68
69
        :param parent_map: A dictionary mapping key => parent_keys
70
        """
71
        self._nodes = {}
4838.1.2 by John Arbash Meinel
Implement KnownGraph.add_node() for the pyrex version.
72
        # Maps {frozenset(revision_id, revision_id): heads}
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
73
        self._known_heads = {}
4371.3.19 by John Arbash Meinel
Get an initial pyrex implementation.
74
        self.do_cache = do_cache
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
75
        self._initialize_nodes(parent_map)
4371.3.19 by John Arbash Meinel
Get an initial pyrex implementation.
76
        self._find_gdfo()
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
77
78
    def _initialize_nodes(self, parent_map):
79
        """Populate self._nodes.
80
4371.4.9 by Vincent Ladeuil
Simplify gdfo computing by finding tails when at graph build time.
81
        After this has finished:
82
        - self._nodes will have an entry for every entry in parent_map.
83
        - ghosts will have a parent_keys = None,
84
        - all nodes found will also have .child_keys populated with all known
85
          child_keys,
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
86
        """
87
        nodes = self._nodes
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
88
        for key, parent_keys in viewitems(parent_map):
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
89
            if key in nodes:
90
                node = nodes[key]
91
                node.parent_keys = parent_keys
92
            else:
93
                node = _KnownGraphNode(key, parent_keys)
94
                nodes[key] = node
95
            for parent_key in parent_keys:
96
                try:
97
                    parent_node = nodes[parent_key]
98
                except KeyError:
99
                    parent_node = _KnownGraphNode(parent_key, None)
100
                    nodes[parent_key] = parent_node
101
                parent_node.child_keys.append(key)
102
4454.3.78 by John Arbash Meinel
Found a bug in the pure-python KnownGraph code.
103
    def _find_tails(self):
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
104
        return [node for node in viewvalues(self._nodes)
4454.3.78 by John Arbash Meinel
Found a bug in the pure-python KnownGraph code.
105
                if not node.parent_keys]
106
4641.5.4 by John Arbash Meinel
Implement a basic algorithm for the pure-python KnownGraph code.
107
    def _find_tips(self):
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
108
        return [node for node in viewvalues(self._nodes)
4641.5.4 by John Arbash Meinel
Implement a basic algorithm for the pure-python KnownGraph code.
109
                      if not node.child_keys]
110
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
111
    def _find_gdfo(self):
4371.4.1 by Vincent Ladeuil
A new recursive gdfo processing method.
112
        nodes = self._nodes
4371.4.10 by Vincent Ladeuil
Cleanup.
113
        known_parent_gdfos = {}
4371.4.1 by Vincent Ladeuil
A new recursive gdfo processing method.
114
        pending = []
115
4454.3.78 by John Arbash Meinel
Found a bug in the pure-python KnownGraph code.
116
        for node in self._find_tails():
4371.4.9 by Vincent Ladeuil
Simplify gdfo computing by finding tails when at graph build time.
117
            node.gdfo = 1
118
            pending.append(node)
119
4371.4.8 by Vincent Ladeuil
Replace the existing KnownGraph._find_gdfo.
120
        while pending:
121
            node = pending.pop()
4371.4.1 by Vincent Ladeuil
A new recursive gdfo processing method.
122
            for child_key in node.child_keys:
123
                child = nodes[child_key]
4371.4.19 by John Arbash Meinel
Update the python code to do the same checking around known_parent_gdfos being present.
124
                if child_key in known_parent_gdfos:
125
                    known_gdfo = known_parent_gdfos[child_key] + 1
126
                    present = True
127
                else:
128
                    known_gdfo = 1
129
                    present = False
4371.4.1 by Vincent Ladeuil
A new recursive gdfo processing method.
130
                if child.gdfo is None or node.gdfo + 1 > child.gdfo:
131
                    child.gdfo = node.gdfo + 1
4371.4.19 by John Arbash Meinel
Update the python code to do the same checking around known_parent_gdfos being present.
132
                if known_gdfo == len(child.parent_keys):
4371.4.1 by Vincent Ladeuil
A new recursive gdfo processing method.
133
                    # We are the last parent updating that node, we can
134
                    # continue from there
4371.4.2 by Vincent Ladeuil
Same gdfo processing, without recursion.
135
                    pending.append(child)
4371.4.19 by John Arbash Meinel
Update the python code to do the same checking around known_parent_gdfos being present.
136
                    if present:
137
                        del known_parent_gdfos[child_key]
138
                else:
139
                    # Update known_parent_gdfos for a key we couldn't process
140
                    known_parent_gdfos[child_key] = known_gdfo
4371.4.1 by Vincent Ladeuil
A new recursive gdfo processing method.
141
4838.1.1 by John Arbash Meinel
Implement KnownGraph.add_node(), along with tests, for the python version.
142
    def add_node(self, key, parent_keys):
4838.1.2 by John Arbash Meinel
Implement KnownGraph.add_node() for the pyrex version.
143
        """Add a new node to the graph.
144
145
        If this fills in a ghost, then the gdfos of all children will be
146
        updated accordingly.
147
        
148
        :param key: The node being added. If this is a duplicate, this is a
149
            no-op.
150
        :param parent_keys: The parents of the given node.
151
        :return: None (should we return if this was a ghost, etc?)
152
        """
4838.1.1 by John Arbash Meinel
Implement KnownGraph.add_node(), along with tests, for the python version.
153
        nodes = self._nodes
154
        if key in nodes:
155
            node = nodes[key]
156
            if node.parent_keys is None:
157
                node.parent_keys = parent_keys
4838.1.2 by John Arbash Meinel
Implement KnownGraph.add_node() for the pyrex version.
158
                # A ghost is being added, we can no-longer trust the heads
159
                # cache, so clear it
160
                self._known_heads.clear()
4838.1.1 by John Arbash Meinel
Implement KnownGraph.add_node(), along with tests, for the python version.
161
            else:
4838.1.2 by John Arbash Meinel
Implement KnownGraph.add_node() for the pyrex version.
162
                # Make sure we compare a list to a list, as tuple != list.
163
                parent_keys = list(parent_keys)
164
                existing_parent_keys = list(node.parent_keys)
165
                if parent_keys == existing_parent_keys:
166
                    return # Identical content
167
                else:
168
                    raise ValueError('Parent key mismatch, existing node %s'
169
                        ' has parents of %s not %s'
170
                        % (key, existing_parent_keys, parent_keys))
4838.1.1 by John Arbash Meinel
Implement KnownGraph.add_node(), along with tests, for the python version.
171
        else:
172
            node = _KnownGraphNode(key, parent_keys)
173
            nodes[key] = node
174
        parent_gdfo = 0
175
        for parent_key in parent_keys:
176
            try:
177
                parent_node = nodes[parent_key]
178
            except KeyError:
179
                parent_node = _KnownGraphNode(parent_key, None)
180
                # Ghosts and roots have gdfo 1
181
                parent_node.gdfo = 1
182
                nodes[parent_key] = parent_node
183
            if parent_gdfo < parent_node.gdfo:
184
                parent_gdfo = parent_node.gdfo
185
            parent_node.child_keys.append(key)
186
        node.gdfo = parent_gdfo + 1
187
        # Now fill the gdfo to all children
188
        # Note that this loop is slightly inefficient, in that we may visit the
189
        # same child (and its decendents) more than once, however, it is
190
        # 'efficient' in that we only walk to nodes that would be updated,
191
        # rather than all nodes
192
        # We use a deque rather than a simple list stack, to go for BFD rather
193
        # than DFD. So that if a longer path is possible, we walk it before we
194
        # get to the final child
6800.1.3 by Jelmer Vernooij
Avoid modifying possibly lazily imported module.
195
        pending = collections.deque([node])
4838.1.1 by John Arbash Meinel
Implement KnownGraph.add_node(), along with tests, for the python version.
196
        while pending:
197
            node = pending.popleft()
198
            next_gdfo = node.gdfo + 1
199
            for child_key in node.child_keys:
200
                child = nodes[child_key]
201
                if child.gdfo < next_gdfo:
202
                    # This child is being updated, we need to check its
203
                    # children
204
                    child.gdfo = next_gdfo
205
                    pending.append(child)
206
4371.3.18 by John Arbash Meinel
Change VF.annotate to use the new KnownGraph code.
207
    def heads(self, keys):
208
        """Return the heads from amongst keys.
209
210
        This is done by searching the ancestries of each key.  Any key that is
211
        reachable from another key is not returned; all the others are.
212
4371.4.3 by Vincent Ladeuil
A new heads() method based on gdfo.
213
        This operation scales with the relative depth between any two keys. It
214
        uses gdfo to avoid walking all ancestry.
215
216
        :param keys: An iterable of keys.
217
        :return: A set of the heads. Note that as a set there is no ordering
218
            information. Callers will need to filter their input to create
219
            order if they need it.
220
        """
221
        candidate_nodes = dict((key, self._nodes[key]) for key in keys)
222
        if revision.NULL_REVISION in candidate_nodes:
223
            # NULL_REVISION is only a head if it is the only entry
224
            candidate_nodes.pop(revision.NULL_REVISION)
225
            if not candidate_nodes:
226
                return frozenset([revision.NULL_REVISION])
227
        if len(candidate_nodes) < 2:
228
            # No or only one candidate
229
            return frozenset(candidate_nodes)
230
        heads_key = frozenset(candidate_nodes)
231
        # Do we have a cached result ?
232
        try:
233
            heads = self._known_heads[heads_key]
234
            return heads
235
        except KeyError:
236
            pass
237
        # Let's compute the heads
4371.4.4 by Vincent Ladeuil
Feedback from John, 'seen' is a set().
238
        seen = set()
4371.4.3 by Vincent Ladeuil
A new heads() method based on gdfo.
239
        pending = []
240
        min_gdfo = None
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
241
        for node in viewvalues(candidate_nodes):
4371.4.7 by Vincent Ladeuil
Simple Pyrex version for the new heads() method.
242
            if node.parent_keys:
4371.4.3 by Vincent Ladeuil
A new heads() method based on gdfo.
243
                pending.extend(node.parent_keys)
244
            if min_gdfo is None or node.gdfo < min_gdfo:
245
                min_gdfo = node.gdfo
246
        nodes = self._nodes
247
        while pending:
248
            node_key = pending.pop()
249
            if node_key in seen:
250
                # node already appears in some ancestry
251
                continue
4371.4.4 by Vincent Ladeuil
Feedback from John, 'seen' is a set().
252
            seen.add(node_key)
4371.4.3 by Vincent Ladeuil
A new heads() method based on gdfo.
253
            node = nodes[node_key]
254
            if node.gdfo <= min_gdfo:
255
                continue
4371.4.7 by Vincent Ladeuil
Simple Pyrex version for the new heads() method.
256
            if node.parent_keys:
4371.4.3 by Vincent Ladeuil
A new heads() method based on gdfo.
257
                pending.extend(node.parent_keys)
4371.4.4 by Vincent Ladeuil
Feedback from John, 'seen' is a set().
258
        heads = heads_key.difference(seen)
4371.4.3 by Vincent Ladeuil
A new heads() method based on gdfo.
259
        if self.do_cache:
260
            self._known_heads[heads_key] = heads
261
        return heads
262
4593.5.2 by John Arbash Meinel
Implement a very basic version of KnownGraph.topo_sort that just
263
    def topo_sort(self):
4593.5.30 by John Arbash Meinel
Move the topo_sort implementation into KnownGraph, rather than calling back to it.
264
        """Return the nodes in topological order.
265
266
        All parents must occur before all children.
267
        """
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
268
        for node in viewvalues(self._nodes):
4593.5.30 by John Arbash Meinel
Move the topo_sort implementation into KnownGraph, rather than calling back to it.
269
            if node.gdfo is None:
270
                raise errors.GraphCycleError(self._nodes)
271
        pending = self._find_tails()
272
        pending_pop = pending.pop
273
        pending_append = pending.append
274
275
        topo_order = []
276
        topo_order_append = topo_order.append
277
278
        num_seen_parents = dict.fromkeys(self._nodes, 0)
279
        while pending:
280
            node = pending_pop()
281
            if node.parent_keys is not None:
282
                # We don't include ghost parents
283
                topo_order_append(node.key)
284
            for child_key in node.child_keys:
285
                child_node = self._nodes[child_key]
286
                seen_parents = num_seen_parents[child_key] + 1
287
                if seen_parents == len(child_node.parent_keys):
288
                    # All parents have been processed, enqueue this child
289
                    pending_append(child_node)
290
                    # This has been queued up, stop tracking it
291
                    del num_seen_parents[child_key]
292
                else:
293
                    num_seen_parents[child_key] = seen_parents
294
        # We started from the parents, so we don't need to do anymore work
295
        return topo_order
4593.5.6 by John Arbash Meinel
Create the crude merge_sort implementation that just thunks over to the old implementation.
296
4641.5.2 by John Arbash Meinel
Get ready to move the tests into KnownGraph implementation tests.
297
    def gc_sort(self):
298
        """Return a reverse topological ordering which is 'stable'.
299
300
        There are a few constraints:
301
          1) Reverse topological (all children before all parents)
302
          2) Grouped by prefix
303
          3) 'stable' sorting, so that we get the same result, independent of
304
             machine, or extra data.
305
        To do this, we use the same basic algorithm as topo_sort, but when we
306
        aren't sure what node to access next, we sort them lexicographically.
307
        """
4641.5.4 by John Arbash Meinel
Implement a basic algorithm for the pure-python KnownGraph code.
308
        tips = self._find_tips()
309
        # Split the tips based on prefix
310
        prefix_tips = {}
311
        for node in tips:
312
            if node.key.__class__ is str or len(node.key) == 1:
313
                prefix = ''
314
            else:
315
                prefix = node.key[0]
316
            prefix_tips.setdefault(prefix, []).append(node)
317
318
        num_seen_children = dict.fromkeys(self._nodes, 0)
319
320
        result = []
321
        for prefix in sorted(prefix_tips):
322
            pending = sorted(prefix_tips[prefix], key=lambda n:n.key,
323
                             reverse=True)
324
            while pending:
325
                node = pending.pop()
4641.5.6 by John Arbash Meinel
Add support for skipping ghost nodes.
326
                if node.parent_keys is None:
327
                    # Ghost node, skip it
328
                    continue
4641.5.4 by John Arbash Meinel
Implement a basic algorithm for the pure-python KnownGraph code.
329
                result.append(node.key)
4641.5.5 by John Arbash Meinel
Implement initial gc_sort in pyrex.
330
                for parent_key in sorted(node.parent_keys, reverse=True):
4641.5.4 by John Arbash Meinel
Implement a basic algorithm for the pure-python KnownGraph code.
331
                    parent_node = self._nodes[parent_key]
332
                    seen_children = num_seen_children[parent_key] + 1
333
                    if seen_children == len(parent_node.child_keys):
334
                        # All children have been processed, enqueue this parent
335
                        pending.append(parent_node)
336
                        # This has been queued up, stop tracking it
337
                        del num_seen_children[parent_key]
338
                    else:
4641.5.5 by John Arbash Meinel
Implement initial gc_sort in pyrex.
339
                        num_seen_children[parent_key] = seen_children
4641.5.4 by John Arbash Meinel
Implement a basic algorithm for the pure-python KnownGraph code.
340
        return result
4641.5.2 by John Arbash Meinel
Get ready to move the tests into KnownGraph implementation tests.
341
4593.5.6 by John Arbash Meinel
Create the crude merge_sort implementation that just thunks over to the old implementation.
342
    def merge_sort(self, tip_key):
343
        """Compute the merge sorted graph output."""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
344
        from breezy import tsort
4593.5.6 by John Arbash Meinel
Create the crude merge_sort implementation that just thunks over to the old implementation.
345
        as_parent_map = dict((node.key, node.parent_keys)
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
346
                             for node in viewvalues(self._nodes)
4593.5.25 by John Arbash Meinel
Add tests that we detect GraphCycleError
347
                              if node.parent_keys is not None)
4593.5.6 by John Arbash Meinel
Create the crude merge_sort implementation that just thunks over to the old implementation.
348
        # We intentionally always generate revnos and never force the
349
        # mainline_revisions
4593.5.32 by John Arbash Meinel
With the new api, we don't return 'sequence_number' anymore.
350
        # Strip the sequence_number that merge_sort generates
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
351
        return [_MergeSortNode(key, merge_depth, revno, end_of_merge)
352
                for _, key, merge_depth, revno, end_of_merge
353
                 in tsort.merge_sort(as_parent_map, tip_key,
354
                                     mainline_revisions=None,
355
                                     generate_revno=True)]
4648.2.1 by Gary van der Merwe
Add get_parent_keys, and get_child_keys to KnownGraph.
356
    
357
    def get_parent_keys(self, key):
358
        """Get the parents for a key
359
        
360
        Returns a list containg the parents keys. If the key is a ghost,
361
        None is returned. A KeyError will be raised if the key is not in
362
        the graph.
363
        
364
        :param keys: Key to check (eg revision_id)
365
        :return: A list of parents
366
        """
367
        return self._nodes[key].parent_keys
368
369
    def get_child_keys(self, key):
370
        """Get the children for a key
371
        
372
        Returns a list containg the children keys. A KeyError will be raised
373
        if the key is not in the graph.
374
        
375
        :param keys: Key to check (eg revision_id)
376
        :return: A list of children
377
        """
378
        return self._nodes[key].child_keys