~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/config.py

Committer: Patch Queue Manager
Date: 2012-08-01 09:20:55 UTC
mfrom: (6437.67.1 2.5.2-dev)
mto: (6548.1.1 trunk) (6437.77.1 2.5) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6549.
Revision ID: pqm@pqm.ubuntu.com-20120801092055-5sxxreh2v28enii1

(vila) Fixes '-d' handling for 'bzr config' (Wouter van Heyst)

added added

removed removed

atomicfile,

controldir,

debug,

directory_service,

errors,

lazy_regex,

library_state,

4003

4004

remove=False):

4004

4005

if directory is None:

4005

4006

directory = '.'

4007

directory = directory_service.directories.dereference(directory)

4006

4008

directory = urlutils.normalize_url(directory)

4007

4009

if remove and all:

4008

4010

raise errors.BzrError(