← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Aaron Bentley
  • Date: 2007-06-08 21:48:42 UTC
  • mto: This revision was merged to the branch mainline in revision 2534.
  • Revision ID: abentley@panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
Rename graph to deprecated_graph

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
634
634
                raise errors.NoCommits(b)
635
635
        revision_source = revision.MultipleRevisionSources(
636
636
                branch.repository, other_branch.repository)
637
 
        walker = branch.repository.get_graph_walker(other_branch.repository)
 
637
        graph = branch.repository.get_graph(other_branch.repository)
638
638
        revision_a = revision.ensure_null(revision_a)
639
639
        revision_b = revision.ensure_null(revision_b)
640
640
        if revision.NULL_REVISION in (revision_a, revision_b):
641
641
            rev_id = revision.NULL_REVISION
642
642
        else:
643
 
            rev_id = walker.find_unique_lca(revision_a, revision_b)
 
643
            rev_id = graph.find_unique_lca(revision_a, revision_b)
644
644
            if rev_id == revision.NULL_REVISION:
645
645
                raise errors.NoCommonAncestor(revision_a, revision_b)
646
646
        try: