Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 26517:d8463a743d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: normalize 'internal:foo' names to ':foo' In upcoming patches we're going to present these names in the UI -- it would be good not to present deprecated names.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:01:16 -0700
parents eb9876aa8770
children a77679d0b887
comparison
equal deleted inserted replaced
26516:eb9876aa8770 26517:d8463a743d7d
463 ui = repo.ui 463 ui = repo.ui
464 fd = fcd.path() 464 fd = fcd.path()
465 binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() 465 binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
466 symlink = 'l' in fcd.flags() + fco.flags() 466 symlink = 'l' in fcd.flags() + fco.flags()
467 tool, toolpath = _picktool(repo, ui, fd, binary, symlink) 467 tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
468 if tool in internals and tool.startswith('internal:'):
469 # normalize to new-style names (':merge' etc)
470 tool = tool[len('internal'):]
468 ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" % 471 ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
469 (tool, fd, binary, symlink)) 472 (tool, fd, binary, symlink))
470 473
471 if tool in internals: 474 if tool in internals:
472 func = internals[tool] 475 func = internals[tool]