Rev 5426: Make _find_merge_tools a private method. in file:///home/vila/src/bzr/reviews/mergetools/

Vincent Ladeuil v.ladeuil+lp at free.fr
Mon Dec 6 13:33:47 GMT 2010


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

------------------------------------------------------------
revno: 5426
revision-id: v.ladeuil+lp at free.fr-20101206133347-qjs6o0x3on22741n
parent: v.ladeuil+lp at free.fr-20101206103358-o4rr2spy1ggkhwa8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Mon 2010-12-06 14:33:47 +0100
message:
  Make _find_merge_tools a private method.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-12-06 10:33:58 +0000
+++ b/bzrlib/config.py	2010-12-06 13:33:47 +0000
@@ -383,7 +383,7 @@
                 continue
             self.set_user_option(oname, value)
 
-    def find_merge_tool(self, name):
+    def _find_merge_tool(self, name):
         commandline = self.get_user_option('bzr.mergetool.%s' % name)
         if commandline is None:
             return None
@@ -394,7 +394,7 @@
         if name is None:
             trace.mutter('no default merge tool defined')
             return None
-        tool = self.find_merge_tool(name)
+        tool = self._find_merge_tool(name)
         trace.mutter('found default merge tool: %r', tool)
         return tool
 
@@ -404,7 +404,7 @@
         else:
             if isinstance(name, mergetools.MergeTool):
                 name = name.get_name()
-            if self.find_merge_tool(name) is None:
+            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)



More information about the bazaar-commits mailing list