Rev 6506: Fixes '-d' handling for 'bzr config' in http://bazaar.launchpad.net/~vila/bzr/2.5-integration/

Vincent Ladeuil v.ladeuil+lp at free.fr
Wed Aug 1 08:53:36 UTC 2012


At http://bazaar.launchpad.net/~vila/bzr/2.5-integration/

------------------------------------------------------------
revno: 6506 [merge]
revision-id: v.ladeuil+lp at free.fr-20120801085335-98xp513pdtk5qux2
parent: pqm at pqm.ubuntu.com-20120728124511-5wd5xu09u2v2nvpq
parent: v.ladeuil+lp at free.fr-20120801085157-4po87sdt7o2p1f0q
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.5.2-dev
timestamp: Wed 2012-08-01 10:53:35 +0200
message:
  Fixes '-d' handling for 'bzr config'
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/blackbox/test_config.py test_config.py-20100927150753-x6rf54uibd08r636-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-03-26 17:01:21 +0000
+++ b/bzrlib/config.py	2012-04-30 08:14:51 +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(

=== modified file 'bzrlib/tests/blackbox/test_config.py'
--- a/bzrlib/tests/blackbox/test_config.py	2012-01-03 12:56:06 +0000
+++ b/bzrlib/tests/blackbox/test_config.py	2012-08-01 08:47:21 +0000
@@ -364,3 +364,15 @@
         self.assertLength(5, self.hpss_calls)
         self.assertLength(1, self.hpss_connections)
         self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
+
+
+class TestConfigDirectory(tests.TestCaseWithTransport):
+
+    def test_parent_alias(self):
+        t = self.make_branch_and_tree('base')
+        t.branch.get_config_stack().set('test', 'base')
+        clone = t.branch.bzrdir.sprout('clone').open_branch()
+        clone.get_config_stack().set('test', 'clone')
+        out, err = self.run_bzr(['config', '-d', ':parent', 'test'],
+                                working_dir='clone')
+        self.assertEquals('base\n', out)

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-06-26 23:04:30 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-08-01 08:51:57 +0000
@@ -32,6 +32,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* ``bzr config`` properly handles aliases and references in the
+  ``--directory`` parameter (Vincent Ladeuil, Wouter van Heyst, #947049)
+
 * Revert use of --no-tty when gpg signing commits. (Jelmer Vernooij, #1014570)
 
 Documentation



More information about the bazaar-commits mailing list