Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 39126:e09fad982ef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: show actual capabilities of internal merge tools This information is useful to know which internal merge tools can be applied safely on binary files and/or symlinks.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 14 Aug 2018 22:20:28 +0900
parents cded904f7acc
children 82555d7186d0
comparison
equal deleted inserted replaced
39125:cded904f7acc 39126:e09fad982ef5
987 fullname = ':' + name 987 fullname = ':' + name
988 internals[fullname] = func 988 internals[fullname] = func
989 internals['internal:' + name] = func 989 internals['internal:' + name] = func
990 internalsdoc[fullname] = func 990 internalsdoc[fullname] = func
991 991
992 capabilities = sorted([k for k, v in func.capabilities.items() if v])
993 if capabilities:
994 capdesc = _("(actual capabilities: %s)") % ', '.join(capabilities)
995 func.__doc__ = (func.__doc__ +
996 pycompat.sysstr("\n\n %s" % capdesc))
997
992 # load built-in merge tools explicitly to setup internalsdoc 998 # load built-in merge tools explicitly to setup internalsdoc
993 loadinternalmerge(None, None, internaltool) 999 loadinternalmerge(None, None, internaltool)
994 1000
995 # tell hggettext to extract docstrings from these functions: 1001 # tell hggettext to extract docstrings from these functions:
996 i18nfunctions = internals.values() 1002 i18nfunctions = internals.values()