Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 13565:984175605311 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: introduce a 'regkeyalt' merge tool variable This allows us to provide alternate search keys for 64bit operating systems that may have 32bit merge tools installed. Presumably it may find other uses.
author Steve Borho <steve@borho.org>
date Tue, 08 Mar 2011 13:05:18 -0600
parents de793925862e
children 135e244776f0
line wrap: on
line diff
--- a/mercurial/filemerge.py	Tue Mar 08 10:03:01 2011 -0600
+++ b/mercurial/filemerge.py	Tue Mar 08 13:05:18 2011 -0600
@@ -25,8 +25,10 @@
 def _findtool(ui, tool):
     if tool in _internal:
         return tool
-    k = _toolstr(ui, tool, "regkey")
-    if k:
+    for kn in ("regkey", "regkeyalt"):
+        k = _toolstr(ui, tool, kn)
+        if not k:
+            continue
         p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))
         if p:
             p = util.find_exe(p + _toolstr(ui, tool, "regappend"))