equal
deleted
inserted
replaced
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")) |