← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/graph.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-21 17:27:28 UTC
  • mfrom: (5988.1.3 thunk-merge-sort)
  • Revision ID: pqm@pqm.ubuntu.com-20110621172728-3203vaenqctilpd7
(jelmer) Fix the thunking of GraphThunkIdsToKeys.merge_sort. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/graph.py
1980
1980
        return set([h[0] for h in head_keys])
1981
1981
 
1982
1982
    def merge_sort(self, tip_revision):
1983
 
        return self._graph.merge_sort((tip_revision,))
 
1983
        nodes = self._graph.merge_sort((tip_revision,))
 
1984
        for node in nodes:
 
1985
            node.key = node.key[0]
 
1986
        return nodes
1984
1987
 
1985
1988
    def add_node(self, revision, parents):
1986
1989
        self._graph.add_node((revision,), [(p,) for p in parents])