Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 30073:aa23c93e636d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make format strings unicodes and not bytes Fixes issues on Python 3, wherein docstrings are unicodes. Shouldn't break anything on Python 2.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 08 Oct 2016 16:10:58 +0200
parents 978b907d9b36
children 8819b63732b9
comparison
equal deleted inserted replaced
30072:87b8e40eb812 30073:aa23c93e636d
17 17
18 from . import ( 18 from . import (
19 error, 19 error,
20 formatter, 20 formatter,
21 match, 21 match,
22 pycompat,
22 scmutil, 23 scmutil,
23 simplemerge, 24 simplemerge,
24 tagmerge, 25 tagmerge,
25 templatekw, 26 templatekw,
26 templater, 27 templater,
91 92
92 def internaltool(name, mergetype, onfailure=None, precheck=None): 93 def internaltool(name, mergetype, onfailure=None, precheck=None):
93 '''return a decorator for populating internal merge tool table''' 94 '''return a decorator for populating internal merge tool table'''
94 def decorator(func): 95 def decorator(func):
95 fullname = ':' + name 96 fullname = ':' + name
96 func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() 97 func.__doc__ = (pycompat.sysstr("``%s``\n" % fullname)
98 + func.__doc__.strip())
97 internals[fullname] = func 99 internals[fullname] = func
98 internals['internal:' + name] = func 100 internals['internal:' + name] = func
99 internalsdoc[fullname] = func 101 internalsdoc[fullname] = func
100 func.mergetype = mergetype 102 func.mergetype = mergetype
101 func.onfailure = onfailure 103 func.onfailure = onfailure