Rev 5402: Use the 'bzr.' name space for the configuration options. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5402
revision-id: v.ladeuil+lp at free.fr-20101125081720-3e7esismh7p89tso
parent: v.ladeuil+lp at free.fr-20101125081116-hl8h2dvrp36qpvmc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Thu 2010-11-25 09:17:20 +0100
message:
  Use the 'bzr.' name space for the configuration options.
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2010-11-24 16:56:34 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2010-11-25 08:17:20 +0000
@@ -588,8 +588,8 @@
 External Merge Tools
 --------------------
 
-mergetools.<name>
-~~~~~~~~~~~~~~~~~
+bzr.mergetools.<name>
+~~~~~~~~~~~~~~~~~~~~~
 
 Defines an external merge tool called <name> with the given command-line.
 Arguments containing spaces should be quoted using single or double
@@ -606,14 +606,14 @@
 
 For example:
 
-  mergetools.kdiff3 = kdiff3 %b %t %o -o %r
+  bzr.mergetools.kdiff3 = kdiff3 %b %t %o -o %r
 
-default_mergetool
-~~~~~~~~~~~~~~~~~
+bzr.default_mergetool
+~~~~~~~~~~~~~~~~~~~~~
 
 Specifies which external merge tool (as defined above) should be selected by
 default in tools such as ``bzr qconflicts``.
 
 For example:
 
-  default_mergetool = kdiff3
+  bzr.default_mergetool = kdiff3

=== modified file 'bzrlib/mergetools.py'
--- a/bzrlib/mergetools.py	2010-11-24 16:56:34 +0000
+++ b/bzrlib/mergetools.py	2010-11-25 08:17:20 +0000
@@ -188,8 +188,8 @@
         conf = config.GlobalConfig()
     tools = []
     for (oname, value, section, conf_id) in conf._get_options():
-        if oname.startswith('mergetools.'):
-            tools.append(MergeTool(oname[len('mergetools.'):], value))
+        if oname.startswith('bzr.mergetools.'):
+            tools.append(MergeTool(oname[len('bzr.mergetools.'):], value))
     return tools
 
 
@@ -199,12 +199,12 @@
     # remove entries from config for tools which do not appear in merge_tools
     tool_names = [tool.get_name() for tool in merge_tools]
     for (oname, value, section, conf_id) in conf._get_options():
-        if oname.startswith('mergetools.'):
-            if oname[len('mergetools.'):] not in tool_names:
+        if oname.startswith('bzr.mergetools.'):
+            if oname[len('bzr.mergetools.'):] not in tool_names:
                 conf.remove_user_option(oname)
     # set config entries
     for tool in merge_tools:
-        oname = 'mergetools.%s' % tool.get_name()
+        oname = 'bzr.mergetools.%s' % tool.get_name()
         value = tool.get_commandline(quote=True)
         if oname == '' or value == '':
             continue
@@ -234,7 +234,7 @@
 def get_default_merge_tool(conf=None):
     if conf is None:
         conf = config.GlobalConfig()
-    name = conf.get_user_option('default_mergetool')
+    name = conf.get_user_option('bzr.default_mergetool')
     if name is None:
         trace.mutter('no default merge tool defined')
         return None
@@ -247,14 +247,14 @@
     if conf is None:
         conf = config.GlobalConfig()
     if name is None:
-        conf.remove_user_option('default_mergetool')
+        conf.remove_user_option('bzr.default_mergetool')
     else:
         if isinstance(name, MergeTool):
             name = name.get_name()
         if find_merge_tool(name, conf) is None:
             raise errors.BzrError('invalid merge tool name: %r' % name)
         trace.mutter('setting default merge tool: %s', name)
-        conf.set_user_option('default_mergetool', name)
+        conf.set_user_option('bzr.default_mergetool', name)
 
 
 def resolve_using_merge_tool(tool_name, conflicts):

=== modified file 'bzrlib/tests/test_mergetools.py'
--- a/bzrlib/tests/test_mergetools.py	2010-11-25 08:11:16 +0000
+++ b/bzrlib/tests/test_mergetools.py	2010-11-25 08:17:20 +0000
@@ -241,9 +241,9 @@
 
     def test_get_merge_tools(self):
         conf = config.GlobalConfig()
-        conf.set_user_option('mergetools.kdiff3', 'kdiff3 %b %t %o -o %r')
-        conf.set_user_option('mergetools.winmergeu', 'winmergeu %r')
-        conf.set_user_option('mergetools.funkytool',
+        conf.set_user_option('bzr.mergetools.kdiff3', 'kdiff3 %b %t %o -o %r')
+        conf.set_user_option('bzr.mergetools.winmergeu', 'winmergeu %r')
+        conf.set_user_option('bzr.mergetools.funkytool',
                              'funkytool "arg with spaces" %T')
         tools = mergetools.get_merge_tools(conf)
         self.log(repr(tools))
@@ -265,11 +265,11 @@
                  ]
         mergetools.set_merge_tools(tools, conf)
         self.assertEqual('funkytool "arg with spaces" %T',
-                          conf.get_user_option('mergetools.funkytool'))
+                          conf.get_user_option('bzr.mergetools.funkytool'))
         self.assertEqual('kdiff3 %b %t %o -o %r',
-                          conf.get_user_option('mergetools.kdiff3'))
+                          conf.get_user_option('bzr.mergetools.kdiff3'))
         self.assertEqual('winmergeu %r',
-                          conf.get_user_option('mergetools.winmergeu'))
+                          conf.get_user_option('bzr.mergetools.winmergeu'))
 
     def test_set_merge_tools_duplicates(self):
         conf = config.GlobalConfig()
@@ -305,9 +305,9 @@
         del tools[0]
         mergetools.set_merge_tools(tools, conf)
         self.assertEqual(sorted([
-            ('mergetools.funkytool', 'funkytool "arg with spaces" %T',
+            ('bzr.mergetools.funkytool', 'funkytool "arg with spaces" %T',
              'DEFAULT', 'bazaar'),
-            ('mergetools.winmergeu', 'winmergeu %r', 'DEFAULT', 'bazaar'),
+            ('bzr.mergetools.winmergeu', 'winmergeu %r', 'DEFAULT', 'bazaar'),
             ]),
             sorted(conf._get_options()))