/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/_known_graph_py.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/_known_graph_py.py
27
27
    errors,
28
28
    revision,
29
29
    )
30
 
from .sixish import (
31
 
    viewitems,
32
 
    viewvalues,
33
 
    )
34
30
 
35
31
 
36
32
class _KnownGraphNode(object):
88
84
          child_keys,
89
85
        """
90
86
        nodes = self._nodes
91
 
        for key, parent_keys in viewitems(parent_map):
 
87
        for key, parent_keys in parent_map.items():
92
88
            if key in nodes:
93
89
                node = nodes[key]
94
90
                node.parent_keys = parent_keys
104
100
                parent_node.child_keys.append(key)
105
101
 
106
102
    def _find_tails(self):
107
 
        return [node for node in viewvalues(self._nodes)
 
103
        return [node for node in self._nodes.values()
108
104
                if not node.parent_keys]
109
105
 
110
106
    def _find_tips(self):
111
 
        return [node for node in viewvalues(self._nodes)
 
107
        return [node for node in self._nodes.values()
112
108
                if not node.child_keys]
113
109
 
114
110
    def _find_gdfo(self):
242
238
        seen = set()
243
239
        pending = []
244
240
        min_gdfo = None
245
 
        for node in viewvalues(candidate_nodes):
 
241
        for node in candidate_nodes.values():
246
242
            if node.parent_keys:
247
243
                pending.extend(node.parent_keys)
248
244
            if min_gdfo is None or node.gdfo < min_gdfo:
269
265
 
270
266
        All parents must occur before all children.
271
267
        """
272
 
        for node in viewvalues(self._nodes):
 
268
        for node in self._nodes.values():
273
269
            if node.gdfo is None:
274
270
                raise errors.GraphCycleError(self._nodes)
275
271
        pending = self._find_tails()
347
343
        """Compute the merge sorted graph output."""
348
344
        from breezy import tsort
349
345
        as_parent_map = dict((node.key, node.parent_keys)
350
 
                             for node in viewvalues(self._nodes)
 
346
                             for node in self._nodes.values()
351
347
                             if node.parent_keys is not None)
352
348
        # We intentionally always generate revnos and never force the
353
349
        # mainline_revisions