Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 23148:b405dd6c90bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: split the logic for finding an external tool to its own function This will be used by extdiff in an subsequent patch.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 02 Nov 2014 14:58:50 -0500
parents 38e0363dcbe0
children 41c03b7592ed
comparison
equal deleted inserted replaced
23147:9174863c58e4 23148:b405dd6c90bf
35 return decorator 35 return decorator
36 36
37 def _findtool(ui, tool): 37 def _findtool(ui, tool):
38 if tool in internals: 38 if tool in internals:
39 return tool 39 return tool
40 return findexternaltool(ui, tool)
41
42 def findexternaltool(ui, tool):
40 for kn in ("regkey", "regkeyalt"): 43 for kn in ("regkey", "regkeyalt"):
41 k = _toolstr(ui, tool, kn) 44 k = _toolstr(ui, tool, kn)
42 if not k: 45 if not k:
43 continue 46 continue
44 p = util.lookupreg(k, _toolstr(ui, tool, "regname")) 47 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))