← 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: 2012-08-01 09:54:49 UTC
  • mfrom: (6548.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20120801095449-yzevoszth5odzgjk
(vila) Merge 2.5 including fix for bug #957049 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
89
89
    atomicfile,
90
90
    controldir,
91
91
    debug,
 
92
    directory_service,
92
93
    errors,
93
94
    lazy_regex,
94
95
    library_state,
4068
4069
            remove=False):
4069
4070
        if directory is None:
4070
4071
            directory = '.'
 
4072
        directory = directory_service.directories.dereference(directory)
4071
4073
        directory = urlutils.normalize_url(directory)
4072
4074
        if remove and all:
4073
4075
            raise errors.BzrError(