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

Proposed by Wouter van Heyst on 2012-04-30
Status: Merged
Merged at revision: 6506
Proposed branch: lp:~larstiq/bzr/bug957049
Merge into: lp:bzr/2.5
Diff against target: 19 lines (+2/-0)
1 file modified
bzrlib/config.py (+2/-0)
To merge this branch: bzr merge lp:~larstiq/bzr/bug957049
Reviewer Review Type Date Requested Status
Martin Packman (community) 2012-04-30 Approve on 2012-07-28
bzr-core 2012-07-28 Pending
Review via email: mp+104070@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

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) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/config.py'
2--- bzrlib/config.py 2012-03-26 17:01:21 +0000
3+++ bzrlib/config.py 2012-04-30 08:19:19 +0000
4@@ -88,6 +88,7 @@
5 atomicfile,
6 controldir,
7 debug,
8+ directory_service,
9 errors,
10 lazy_regex,
11 library_state,
12@@ -4003,6 +4004,7 @@
13 remove=False):
14 if directory is None:
15 directory = '.'
16+ directory = directory_service.directories.dereference(directory)
17 directory = urlutils.normalize_url(directory)
18 if remove and all:
19 raise errors.BzrError(

Subscribers

People subscribed via source and target branches