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 k = _toolstr(ui, tool, "regkey") |
|
20 if k: |
|
21 p = util.lookup_reg(k, _toolstr(ui, tool, "regname")) |
|
22 if p: |
|
23 p = util.find_exe(p + _toolstr(ui, tool, "regappend")) |
|
24 if p: |
|
25 return p |
19 return util.find_exe(_toolstr(ui, tool, "executable", tool)) |
26 return util.find_exe(_toolstr(ui, tool, "executable", tool)) |
20 |
27 |
21 def _picktool(repo, ui, path, binary, symlink): |
28 def _picktool(repo, ui, path, binary, symlink): |
22 def check(tool, pat, symlink, binary): |
29 def check(tool, pat, symlink, binary): |
23 tmsg = tool |
30 tmsg = tool |