Mercurial > hg

comparison mercurial/filemerge.py @ 6522:2b181fb3a70a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:21:53 +0300
parents e75aab656f46
children 65f1b97484be
comparison
equal deleted inserted replaced
6521:a3668330f14a 6522:2b181fb3a70a
14 14
15 def _toolbool(ui, tool, part, default=False): 15 def _toolbool(ui, tool, part, default=False):
16 return ui.configbool("merge-tools", tool + "." + part, default) 16 return ui.configbool("merge-tools", tool + "." + part, default)
17 17
18 def _findtool(ui, tool): 18 def _findtool(ui, tool):
19 if tool in ("internal:fail", "internal:local", "internal:other"):
20 return tool
19 k = _toolstr(ui, tool, "regkey") 21 k = _toolstr(ui, tool, "regkey")
20 if k: 22 if k:
21 p = util.lookup_reg(k, _toolstr(ui, tool, "regname")) 23 p = util.lookup_reg(k, _toolstr(ui, tool, "regname"))
22 if p: 24 if p:
23 p = util.find_exe(p + _toolstr(ui, tool, "regappend")) 25 p = util.find_exe(p + _toolstr(ui, tool, "regappend"))