Rev 5424: Prefix mergetools option names with 'bzr.'. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5424
revision-id: v.ladeuil+lp at free.fr-20101206101525-4f9xea2yqcak0vlx
parent: v.ladeuil+lp at free.fr-20101206100444-t3m50se27q1kzimm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Mon 2010-12-06 11:15:25 +0100
message:
  Prefix mergetools option names with 'bzr.'.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-12-04 05:49:20 +0000
+++ b/bzrlib/config.py	2010-12-06 10:15:25 +0000
@@ -361,35 +361,36 @@
     def get_merge_tools(self):
         tools = []
         for (oname, value, section, conf_id, parser) in self._get_options():
-            if oname.startswith('mergetool.'):
-                tools.append(mergetools.MergeTool(oname[len('mergetool.'):],
+            if oname.startswith('bzr.mergetool.'):
+                tools.append(mergetools.MergeTool(oname[len('bzr.mergetool.'):],
                                                   value))
         trace.mutter('loaded merge tools: %r' % tools)
         return tools
 
     def set_merge_tools(self, tools):
-        # remove entries from config for tools which do not appear in merge_tools
+        # remove entries from config for tools which do not appear in
+        # merge_tools
         tool_names = [tool.get_name() for tool in tools]
         for (oname, value, section, conf_id, parser) in self._get_options():
-            if oname.startswith('mergetool.'):
-                if oname[len('mergetool.'):] not in tool_names:
+            if oname.startswith('bzr.mergetool.'):
+                if oname[len('bzr.mergetool.'):] not in tool_names:
                     self.remove_user_option(oname)
         # set config entries
         for tool in tools:
-            oname = 'mergetool.%s' % tool.get_name()
+            oname = 'bzr.mergetool.%s' % tool.get_name()
             value = tool.get_commandline()
             if oname == '' or value == '':
                 continue
             self.set_user_option(oname, value)
 
     def find_merge_tool(self, name):
-        commandline = self.get_user_option('mergetool.%s' % name)
+        commandline = self.get_user_option('bzr.mergetool.%s' % name)
         if commandline is None:
             return None
         return mergetools.MergeTool(name, commandline)
 
     def get_default_merge_tool(self):
-        name = self.get_user_option('default_mergetool')
+        name = self.get_user_option('bzr.default_mergetool')
         if name is None:
             trace.mutter('no default merge tool defined')
             return None
@@ -399,14 +400,14 @@
 
     def set_default_merge_tool(self, name):
         if name is None:
-            self.remove_user_option('default_mergetool')
+            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('default_mergetool', name)
+            self.set_user_option('bzr.default_mergetool', name)
 
 
 class IniBasedConfig(Config):

=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2010-12-04 05:26:37 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2010-12-06 10:15:25 +0000
@@ -588,8 +588,8 @@
 External Merge Tools
 --------------------
 
-mergetool.<name>
-~~~~~~~~~~~~~~~~
+bzr.mergetool.<name>
+~~~~~~~~~~~~~~~~~~~~
 
 Defines an external merge tool called <name> with the given command-line.
 Arguments containing spaces should be quoted using single or double quotes. The
@@ -607,9 +607,9 @@
 
 For example:
 
-  mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
+  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
 
-default_mergetool
+bzr.default_mergetool
 ~~~~~~~~~~~~~~~~~
 
 Specifies which external merge tool (as defined above) should be selected by
@@ -617,4 +617,4 @@
 
 For example:
 
-  default_mergetool = kdiff3
+  bzr.default_mergetool = kdiff3

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2010-12-04 05:49:20 +0000
+++ b/bzrlib/tests/test_config.py	2010-12-06 10:15:25 +0000
@@ -71,10 +71,10 @@
 gpg_signing_command=gnome-gpg
 log_format=short
 user_global_option=something
-mergetool.kdiff3=kdiff3 {base} {this} {other} -o {result}
-mergetool.winmergeu=winmergeu {result}
-mergetool.funkytool=funkytool "arg with spaces" {this_temp}
-default_mergetool=kdiff3
+bzr.mergetool.kdiff3=kdiff3 {base} {this} {other} -o {result}
+bzr.mergetool.winmergeu=winmergeu {result}
+bzr.mergetool.funkytool=funkytool "arg with spaces" {this_temp}
+bzr.default_mergetool=kdiff3
 [ALIASES]
 h=help
 ll=""" + sample_long_alias + "\n"
@@ -1018,11 +1018,11 @@
                                  'funkytool "arg with spaces" {this_temp}')
             ])
         self.assertEqual('funkytool "arg with spaces" {this_temp}',
-                          conf.get_user_option('mergetool.funkytool'))
+                          conf.get_user_option('bzr.mergetool.funkytool'))
         self.assertEqual('kdiff3 {base} {this} {other} -o {result}',
-                          conf.get_user_option('mergetool.kdiff3'))
+                          conf.get_user_option('bzr.mergetool.kdiff3'))
         self.assertEqual('winmergeu {result}',
-                          conf.get_user_option('mergetool.winmergeu'))
+                          conf.get_user_option('bzr.mergetool.winmergeu'))
 
     def test_set_merge_tools_duplicates(self):
         conf = config.GlobalConfig()
@@ -1079,12 +1079,13 @@
             ]
         conf.set_merge_tools(tools)
         conf.set_default_merge_tool('winmergeu')
-        self.assertEqual('winmergeu', conf.get_user_option('default_mergetool'))
+        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('default_mergetool'))
+        self.assertEqual(None, conf.get_user_option('bzr.default_mergetool'))
 
     def test_set_invalid_default_merge_tool(self):
         conf = config.GlobalConfig()