Merge lp:~larstiq/bzr/bug957049 into lp:bzr/2.5

[Wouter van Heyst]

Bug 957049 is about bzr config not dealing with directory services. I've added a derefence at the start of cmd_config, but I need some help with how to test it correctly.

[Jelmer Vernooij (jelmer)]

I would probably register a custom directory service during the test (don't we already have a dummy directory service somewhere?) and then use that to test that 'bzr config' does the right thing.

[Martin Packman (gz)]

Let's just land this if it's been manually tested rather than blocking on having unit tests.

review: Approve

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2012-03-26 17:01:21 +0000
+++ bzrlib/config.py	2012-04-30 08:19:19 +0000
@@ -88,6 +88,7 @@
     atomicfile,
     controldir,
     debug,
+    directory_service,
     errors,
     lazy_regex,
     library_state,
@@ -4003,6 +4004,7 @@
             remove=False):
         if directory is None:
             directory = '.'
+        directory = directory_service.directories.dereference(directory)
         directory = urlutils.normalize_url(directory)
         if remove and all:
             raise errors.BzrError(