626 tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) |
626 tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) |
627 if tool in internals and tool.startswith('internal:'): |
627 if tool in internals and tool.startswith('internal:'): |
628 # normalize to new-style names (':merge' etc) |
628 # normalize to new-style names (':merge' etc) |
629 tool = tool[len('internal'):] |
629 tool = tool[len('internal'):] |
630 ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" |
630 ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" |
631 % (tool, fd, binary, symlink, changedelete)) |
631 % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink), |
|
632 pycompat.bytestr(changedelete))) |
632 |
633 |
633 if tool in internals: |
634 if tool in internals: |
634 func = internals[tool] |
635 func = internals[tool] |
635 mergetype = func.mergetype |
636 mergetype = func.mergetype |
636 onfailure = func.onfailure |
637 onfailure = func.onfailure |