Merge lp:~doxxx/bzr/828803-get_merge_tools-2.4 into lp:bzr/2.4

[Gordon Tyler]

Allow the uses of spaces in merge tools paths.

Fixes bug 828803 for bzr 2.4.

[Jelmer Vernooij (jelmer)]

Ideally we should improve ._get_options() to just do the right thing (and there's a comment about that in _show_values), but this seems like a good step in the right direction regardless. I'm going to submit it to pqm.

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2011-08-23 07:49:31 +0000
+++ bzrlib/config.py	2011-09-09 12:59:17 +0000
@@ -573,7 +573,7 @@
         for (oname, value, section, conf_id, parser) in self._get_options():
             if oname.startswith('bzr.mergetool.'):
                 tool_name = oname[len('bzr.mergetool.'):]
-                tools[tool_name] = value
+                tools[tool_name] = self.get_user_option(oname)
         trace.mutter('loaded merge tools: %r' % tools)
         return tools
 
 
=== modified file 'bzrlib/tests/test_config.py'
--- bzrlib/tests/test_config.py	2011-08-23 07:49:31 +0000
+++ bzrlib/tests/test_config.py	2011-09-09 12:59:17 +0000
@@ -166,6 +166,7 @@
 user_global_option=something
 bzr.mergetool.sometool=sometool {base} {this} {other} -o {result}
 bzr.mergetool.funkytool=funkytool "arg with spaces" {this_temp}
+bzr.mergetool.newtool='"newtool with spaces" {this_temp}'
 bzr.default_mergetool=sometool
 [ALIASES]
 h=help
@@ -1296,7 +1297,8 @@
         self.log(repr(tools))
         self.assertEqual(
             {u'funkytool' : u'funkytool "arg with spaces" {this_temp}',
-            u'sometool' : u'sometool {base} {this} {other} -o {result}'},
+            u'sometool' : u'sometool {base} {this} {other} -o {result}',
+            u'newtool' : u'"newtool with spaces" {this_temp}'},
             tools)
 
     def test_get_merge_tools_empty(self):
 
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-09-08 17:57:00 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-09-09 12:59:17 +0000
@@ -29,8 +29,8 @@
 Bug Fixes
 *********
 
-.. Fixes for situations where bzr would previously crash or give incorrect
-   or undesirable results.
+* Fixed loading of external merge tools from config to properly decode
+  command-lines which contain embedded quotes. (Gordon Tyler, #828803)
 
 Documentation
 *************