Rev 5430: Simplify set_default_merge_tool. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/mergetools/

------------------------------------------------------------
revno: 5430
revision-id: v.ladeuil+lp at free.fr-20101206143741-eqbgbmmgn6ya8oor
parent: v.ladeuil+lp at free.fr-20101206141515-s6oa96cj01ley5s3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Mon 2010-12-06 15:37:41 +0100
message:
  Simplify set_default_merge_tool.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-12-06 13:33:47 +0000
+++ b/bzrlib/config.py	2010-12-06 14:37:41 +0000
@@ -399,15 +399,10 @@
         return tool
 
     def set_default_merge_tool(self, name):
-        if name is None:
-            self.remove_user_option('bzr.default_mergetool')
-        else:
-            if isinstance(name, mergetools.MergeTool):
-                name = name.get_name()
-            if self._find_merge_tool(name) is None:
-                raise errors.BzrError('invalid merge tool name: %r' % name)
-            trace.mutter('setting default merge tool: %s', name)
-            self.set_user_option('bzr.default_mergetool', name)
+        if self._find_merge_tool(name) is None:
+            raise errors.BzrError('invalid merge tool name: %r' % name)
+        trace.mutter('setting default merge tool: %s', name)
+        self.set_user_option('bzr.default_mergetool', name)
 
 
 class IniBasedConfig(Config):

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2010-12-06 10:33:58 +0000
+++ b/bzrlib/tests/test_config.py	2010-12-06 14:37:41 +0000
@@ -1082,11 +1082,6 @@
         self.assertEqual('winmergeu',
                          conf.get_user_option('bzr.default_mergetool'))
 
-    def test_set_default_merge_tool_none(self):
-        conf = config.GlobalConfig.from_string(sample_config_text)
-        conf.set_default_merge_tool(None)
-        self.assertEqual(None, conf.get_user_option('bzr.default_mergetool'))
-
     def test_set_invalid_default_merge_tool(self):
         conf = config.GlobalConfig()
         tools = [