Mercurial > hg

comparison mercurial/filemerge.py @ 14271:4030630fb59c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename util.find_exe to findexe
author Adrian Buehlmann <adrian@cadifra.com>
date Sun, 08 May 2011 20:35:46 +0200
parents d51630301241
children e3be7dc9a5e1
comparison
equal deleted inserted replaced
14268:a55a0045704c 14271:4030630fb59c
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.lookupreg(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.findexe(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.findexe(_toolstr(ui, tool, "executable", tool))
38 38
39 def _picktool(repo, ui, path, binary, symlink): 39 def _picktool(repo, ui, path, binary, symlink):
40 def check(tool, pat, symlink, binary): 40 def check(tool, pat, symlink, binary):
41 tmsg = tool 41 tmsg = tool
42 if pat: 42 if pat: