← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/graph.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-10 22:20:12 UTC
  • mfrom: (5582 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110110222012-mtcqudkvmzwiufuc
Merge in the bzr.dev 5582

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/graph.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1770
1770
    def merge_sort(self, tip_revision):
1771
1771
        return self._graph.merge_sort((tip_revision,))
1772
1772
 
 
1773
    def add_node(self, revision, parents):
 
1774
        self._graph.add_node((revision,), [(p,) for p in parents])
 
1775
 
1773
1776
 
1774
1777
_counters = [0,0,0,0,0,0,0]
1775
1778
try: