comparison mercurial/templateutil.py @ 37019:c97b936d8bb5

templater: use named function to expand template against mapping dict (API)

And replace __call__(t, **mapping) in favor of generate(t, mapping). I prefer
a named function here since the templater isn't a simple function-like object.

.. api::

   The templater is no longer callable. Use ``templater.generate(t, mapping)``
   instead of ``templater(t, **pycompat.strkwargs(mapping))``.

37018:3e74d3cc500f

    for each value, expand 'foo'. if 'last_foo' in template
    map, expand it instead of 'foo' for last key.

    expand 'end_foos'.
    '''
    strmapping = pycompat.strkwargs(mapping)
    if not plural:
        plural = name + 's'
    if not values:
        noname = 'no_' + plural
        if noname in templ:
            yield templ(noname, **strmapping)
        return
    if name not in templ:
        if isinstance(values[0], bytes):
            yield separator.join(values)
        else:

                r.update(mapping)
                yield r
        return
    startname = 'start_' + plural
    if startname in templ:
        yield templ(startname, **strmapping)
    vmapping = mapping.copy()
    def one(v, tag=name):
        try:
            vmapping.update(v)
        # Python 2 raises ValueError if the type of v is wrong. Python

                # bytes. Python 3 raises TypeError.
                for a, b in v:
                    vmapping[a] = b
            except (TypeError, ValueError):
                vmapping[name] = v
        return templ(tag, **pycompat.strkwargs(vmapping))
    lastname = 'last_' + name
    if lastname in templ:
        last = values.pop()
    else:
        last = None

        yield one(v)
    if last is not None:
        yield one(last, tag=lastname)
    endname = 'end_' + plural
    if endname in templ:
        yield templ(endname, **strmapping)

def stringify(thing):
    """Turn values into bytes by converting into text and concatenating them"""
    thing = unwraphybrid(thing)
    if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes):

37019:c97b936d8bb5

    for each value, expand 'foo'. if 'last_foo' in template
    map, expand it instead of 'foo' for last key.

    expand 'end_foos'.
    '''
    if not plural:
        plural = name + 's'
    if not values:
        noname = 'no_' + plural
        if noname in templ:
            yield templ.generate(noname, mapping)
        return
    if name not in templ:
        if isinstance(values[0], bytes):
            yield separator.join(values)
        else:

                r.update(mapping)
                yield r
        return
    startname = 'start_' + plural
    if startname in templ:
        yield templ.generate(startname, mapping)
    vmapping = mapping.copy()
    def one(v, tag=name):
        try:
            vmapping.update(v)
        # Python 2 raises ValueError if the type of v is wrong. Python

                # bytes. Python 3 raises TypeError.
                for a, b in v:
                    vmapping[a] = b
            except (TypeError, ValueError):
                vmapping[name] = v
        return templ.generate(tag, vmapping)
    lastname = 'last_' + name
    if lastname in templ:
        last = values.pop()
    else:
        last = None

        yield one(v)
    if last is not None:
        yield one(last, tag=lastname)
    endname = 'end_' + plural
    if endname in templ:
        yield templ.generate(endname, mapping)

def stringify(thing):
    """Turn values into bytes by converting into text and concatenating them"""
    thing = unwraphybrid(thing)
    if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes):