comparison mercurial/templatefuncs.py @ 37163:0fb28899e81a

templater: factor out unwrapastype() from evalastype()

So ParseError of unwrapastype() can be caught reliably.

37162:9ab3491f84c2

evalfuncarg = templateutil.evalfuncarg
evalboolean = templateutil.evalboolean
evalinteger = templateutil.evalinteger
evalstring = templateutil.evalstring
evalstringliteral = templateutil.evalstringliteral
evalastype = templateutil.evalastype

# dict of template built-in functions
funcs = {}
templatefunc = registrar.templatefunc(funcs)

    if not (3 <= len(args) <= 4):
        # i18n: "ifcontains" is a keyword
        raise error.ParseError(_("ifcontains expects three or four arguments"))

    haystack = evalfuncarg(context, mapping, args[1])
    try:
        needle = evalastype(context, mapping, args[0],
                            getattr(haystack, 'keytype', None) or bytes)
        found = (needle in haystack)
    except error.ParseError:
        found = False

    if found:

37163:0fb28899e81a

evalfuncarg = templateutil.evalfuncarg
evalboolean = templateutil.evalboolean
evalinteger = templateutil.evalinteger
evalstring = templateutil.evalstring
evalstringliteral = templateutil.evalstringliteral

# dict of template built-in functions
funcs = {}
templatefunc = registrar.templatefunc(funcs)

    if not (3 <= len(args) <= 4):
        # i18n: "ifcontains" is a keyword
        raise error.ParseError(_("ifcontains expects three or four arguments"))

    haystack = evalfuncarg(context, mapping, args[1])
    keytype = getattr(haystack, 'keytype', None)
    try:
        needle = evalrawexp(context, mapping, args[0])
        needle = templateutil.unwrapastype(needle, keytype or bytes)
        found = (needle in haystack)
    except error.ParseError:
        found = False

    if found: