← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 08:34:03 UTC
  • mfrom: (6191.2.1 843900-url-nameerror)
  • Revision ID: pqm@pqm.ubuntu.com-20111006083403-jnsw0exlirg01aed
(mbp) error message without traceback on invalid ubuntu/debian url (bug
 843900) (Martin Pool)

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
 
    controldir,
 
90
    bzrdir,
91
91
    debug,
92
92
    errors,
93
93
    lazy_regex,
2572
2572
Otherwise, bzr will prompt as normal to break the lock.
2573
2573
'''))
2574
2574
option_registry.register(
2575
 
    Option('log_format', default='long',
2576
 
           help= '''\
2577
 
Log format to use when displaying revisions.
2578
 
 
2579
 
Standard log formats are ``long``, ``short`` and ``line``. Additional formats
2580
 
may be provided by plugins.
2581
 
'''))
2582
 
option_registry.register(
2583
2575
    Option('output_encoding',
2584
2576
           help= 'Unicode encoding for output'
2585
2577
           ' (terminal encoding if not specified).'))
3453
3445
            elif scope == 'locations':
3454
3446
                yield LocationConfig(directory)
3455
3447
            elif scope == 'branch':
3456
 
                (_, br, _) = (
3457
 
                    controldir.ControlDir.open_containing_tree_or_branch(
3458
 
                        directory))
 
3448
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
 
3449
                    directory)
3459
3450
                yield br.get_config()
3460
3451
        else:
3461
3452
            try:
3462
 
                (_, br, _) = (
3463
 
                    controldir.ControlDir.open_containing_tree_or_branch(
3464
 
                        directory))
 
3453
                (_, br, _) = bzrdir.BzrDir.open_containing_tree_or_branch(
 
3454
                    directory)
3465
3455
                yield br.get_config()
3466
3456
            except errors.NotBranchError:
3467
3457
                yield LocationConfig(directory)