Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 32773:264b86cf2092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert bool variables to bytes
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Jun 2017 16:57:21 +0530
parents 6587427b2018
children 2ecce24dfcd3
comparison
equal deleted inserted replaced
32772:dc7efa2826e4 32773:264b86cf2092
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