Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 14230:d51630301241

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename util.lookup_reg to lookupreg
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 06 May 2011 15:16:22 +0200
parents 135e244776f0
children 4030630fb59c
comparison
equal deleted inserted replaced
14229:85fd8402cbc4 14230:d51630301241
27 return tool 27 return tool
28 for kn in ("regkey", "regkeyalt"): 28 for kn in ("regkey", "regkeyalt"):
29 k = _toolstr(ui, tool, kn) 29 k = _toolstr(ui, tool, kn)
30 if not k: 30 if not k:
31 continue 31 continue
32 p = util.lookup_reg(k, _toolstr(ui, tool, "regname")) 32 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
33 if p: 33 if p:
34 p = util.find_exe(p + _toolstr(ui, tool, "regappend")) 34 p = util.find_exe(p + _toolstr(ui, tool, "regappend"))
35 if p: 35 if p:
36 return p 36 return p
37 return util.find_exe(_toolstr(ui, tool, "executable", tool)) 37 return util.find_exe(_toolstr(ui, tool, "executable", tool))