comparison mercurial/filemerge.py @ 30073:aa23c93e636d

py3: make format strings unicodes and not bytes

Fixes issues on Python 3, wherein docstrings are unicodes.
Shouldn't break anything on Python 2.

30072:87b8e40eb812

from . import (
    error,
    formatter,
    match,
    scmutil,
    simplemerge,
    tagmerge,
    templatekw,
    templater,

def internaltool(name, mergetype, onfailure=None, precheck=None):
    '''return a decorator for populating internal merge tool table'''
    def decorator(func):
        fullname = ':' + name
        func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
        internals[fullname] = func
        internals['internal:' + name] = func
        internalsdoc[fullname] = func
        func.mergetype = mergetype
        func.onfailure = onfailure

30073:aa23c93e636d

from . import (
    error,
    formatter,
    match,
    pycompat,
    scmutil,
    simplemerge,
    tagmerge,
    templatekw,
    templater,

def internaltool(name, mergetype, onfailure=None, precheck=None):
    '''return a decorator for populating internal merge tool table'''
    def decorator(func):
        fullname = ':' + name
        func.__doc__ = (pycompat.sysstr("``%s``\n" % fullname)
                        + func.__doc__.strip())
        internals[fullname] = func
        internals['internal:' + name] = func
        internalsdoc[fullname] = func
        func.mergetype = mergetype
        func.onfailure = onfailure