← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: jelmer at samba
  • Date: 2011-10-11 12:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111011120151-l1aa35zasaocrev3
Fix tests and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
87
87
 
88
88
from bzrlib import (
89
89
    atomicfile,
90
 
    bzrdir,
 
90
    controldir,
91
91
    debug,
92
92
    errors,
93
93
    lazy_regex,
3453
3453
            elif scope == 'locations':
3454
3454
                yield LocationConfig(directory)
3455
3455
            elif scope == 'branch':
3456
 
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
3457
 
                    directory)
 
3456
                (_, br, _) = (
 
3457
                    controldir.ControlDir.open_containing_tree_or_branch(
 
3458
                        directory))
3458
3459
                yield br.get_config()
3459
3460
        else:
3460
3461
            try:
3461
 
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
3462
 
                    directory)
 
3462
                (_, br, _) = (
 
3463
                    controldir.ControlDir.open_containing_tree_or_branch(
 
3464
                        directory))
3463
3465
                yield br.get_config()
3464
3466
            except errors.NotBranchError:
3465
3467
                yield LocationConfig(directory)