Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
13563:391948925b67 13565:984175605311
23 for s in 'fail local other merge prompt dump'.split()] 23 for s in 'fail local other merge prompt dump'.split()]
24 24
25 def _findtool(ui, tool): 25 def _findtool(ui, tool):
26 if tool in _internal: 26 if tool in _internal:
27 return tool 27 return tool
28 k = _toolstr(ui, tool, "regkey") 28 for kn in ("regkey", "regkeyalt"):
29 if k: 29 k = _toolstr(ui, tool, kn)
30 if not k:
31 continue
30 p = util.lookup_reg(k, _toolstr(ui, tool, "regname")) 32 p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))
31 if p: 33 if p:
32 p = util.find_exe(p + _toolstr(ui, tool, "regappend")) 34 p = util.find_exe(p + _toolstr(ui, tool, "regappend"))
33 if p: 35 if p:
34 return p 36 return p