← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-28 12:47:17 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: jelmer@canonical.com-20120128124717-80ggi7q1y7m2wjf0
Merge 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
778
778
        return controldir._get_tree_branch()
779
779
 
780
780
    @classmethod
781
 
    def open_containing_tree_or_branch(klass, location):
 
781
    def open_containing_tree_or_branch(klass, location,
 
782
            possible_transports=None):
782
783
        """Return the branch and working tree contained by a location.
783
784
 
784
785
        Returns (tree, branch, relpath).
787
788
        raised
788
789
        relpath is the portion of the path that is contained by the branch.
789
790
        """
790
 
        controldir, relpath = klass.open_containing(location)
 
791
        controldir, relpath = klass.open_containing(location,
 
792
            possible_transports=possible_transports)
791
793
        tree, branch = controldir._get_tree_branch()
792
794
        return tree, branch, relpath
793
795