Rev 6549: Merge 2.5 including fix for bug #957049 in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6549 [merge]
revision-id: v.ladeuil+lp at free.fr-20120801092740-rhcwpdylg14ojvrq
parent: pqm at pqm.ubuntu.com-20120731084640-jvn3gs7ldyoc3rc3
parent: pqm at pqm.ubuntu.com-20120801092055-5sxxreh2v28enii1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2012-08-01 11:27:40 +0200
message:
  Merge 2.5 including fix for bug #957049
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/blackbox/test_config.py test_config.py-20100927150753-x6rf54uibd08r636-1
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  doc/en/whats-new/whats-new-in-2.5.txt whatsnewin2.5.txt-20110711065040-xz9b4xba1qzlwp7m-1
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-07-28 15:19:25 +0000
+++ b/bzrlib/config.py	2012-08-01 09:27:40 +0000
@@ -89,6 +89,7 @@
     atomicfile,
     controldir,
     debug,
+    directory_service,
     errors,
     lazy_regex,
     library_state,
@@ -4068,6 +4069,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-02-13 17:14:34 +0000
+++ b/bzrlib/tests/blackbox/test_config.py	2012-08-01 09:27:40 +0000
@@ -382,3 +382,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 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2011-12-21 14:17:33 +0000
+++ b/bzrlib/win32utils.py	2012-07-28 12:13:40 +0000
@@ -515,7 +515,7 @@
                                   default.
     :return: A list of unicode strings.
     """
-    # First, spit the command line
+    # First, split the command line
     s = cmdline.Splitter(command_line, single_quotes_allowed=single_quotes_allowed)
     
     # Bug #587868 Now make sure that the length of s agrees with sys.argv 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-06-29 08:12:32 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-08-01 09:27:40 +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

=== modified file 'doc/en/whats-new/whats-new-in-2.5.txt'
--- a/doc/en/whats-new/whats-new-in-2.5.txt	2012-05-22 14:06:21 +0000
+++ b/doc/en/whats-new/whats-new-in-2.5.txt	2012-07-28 12:13:40 +0000
@@ -2,7 +2,7 @@
 What's New in Bazaar 2.5?
 *************************
 
-Bazaar 2.5 bas been released on the 24th of February 2012 and marks the
+Bazaar 2.5 has been released on the 24th of February 2012 and marks the
 start of a new long-term-stable series. From here, we will only make bugfix
 releases on the 2.5 series (2.5.1, etc, and support it until April 2017),
 while 2.6 will become our new development series.