← 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-27 22:09:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6463.
  • Revision ID: jelmer@samba.org-20120127220919-tk0fdybtfwi177c6
Use config stacks in a few more places in the test suite.

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,
782
 
            possible_transports=None):
 
781
    def open_containing_tree_or_branch(klass, location):
783
782
        """Return the branch and working tree contained by a location.
784
783
 
785
784
        Returns (tree, branch, relpath).
788
787
        raised
789
788
        relpath is the portion of the path that is contained by the branch.
790
789
        """
791
 
        controldir, relpath = klass.open_containing(location,
792
 
            possible_transports=possible_transports)
 
790
        controldir, relpath = klass.open_containing(location)
793
791
        tree, branch = controldir._get_tree_branch()
794
792
        return tree, branch, relpath
795
793