← 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-31 15:43:17 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: (6437.23.1 2.5)
  • mto: This revision was merged to the branch mainline in revision 6458.
  • Revision ID: jelmer@samba.org-20120131154317-y028tz0r9xesvn9p
Merge 2.5.

Show diffs side-by-side

added added

removed removed

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