comparison mercurial/templatekw.py @ 36574:45f149bf08d1

templatekw: fix dict construction in _showlist to not mix bytes and strs

What we had was fine on Python 2, but was slightly wrong on Python
3. This works on both.

Differential Revision: https://phab.mercurial-scm.org/D2554

36573:9b6b02a5b589

    if name not in templ:
        if isinstance(values[0], bytes):
            yield separator.join(values)
        else:
            for v in values:
                yield dict(v, **strmapping)
        return
    startname = 'start_' + plural
    if startname in templ:
        yield templ(startname, **strmapping)
    vmapping = mapping.copy()

36574:45f149bf08d1

    if name not in templ:
        if isinstance(values[0], bytes):
            yield separator.join(values)
        else:
            for v in values:
                r = dict(v)
                r.update(mapping)
                yield r
        return
    startname = 'start_' + plural
    if startname in templ:
        yield templ(startname, **strmapping)
    vmapping = mapping.copy()