Mercurial > hg
diff tests/test-template-engine.t @ 37272:7d3bc1d4e871
templater: pass (context, mapping) down to unwraphybrid()
See the subsequent patches for why.
I initially thought it would be wrong to pass a mapping to flatten() and
stringify() since these functions may be applied to a tree of generators,
where each node should be bound to the mapping when it was evaluated. But,
actually that isn't a problem. If an intermediate node has to override a
mapping dict, it can do on unwraphybrid() and yield "unwrapped" generator
of byte strings:
"{f(g(v))}" # literal template example.
^^^^ # g() want to override a mapping, so it returns a wrapped
# object 'G{V}' with partial mapping 'lm' attached.
^^^^^^^ # f() stringifies 'G{V}', starting from a mapping 'm'.
# when unwrapping 'G{}', it updates 'm' with 'lm', and
# passes it to 'V'.
This structure is important for the formatter (and the hgweb) to build a
static template keyword, which can't access a mapping dict until evaluation
phase.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 17 Mar 2018 20:09:05 +0900 |
parents | ff9cb7067329 |
children |
line wrap: on
line diff
--- a/tests/test-template-engine.t Mon Apr 02 16:18:33 2018 -0700 +++ b/tests/test-template-engine.t Sat Mar 17 20:09:05 2018 +0900 @@ -24,7 +24,7 @@ > v = v(**pycompat.strkwargs(props)) > elif callable(v): > v = v(self, props) - > v = templateutil.stringify(v) + > v = templateutil.stringify(self, props, v) > tmpl = tmpl.replace(b'{{%s}}' % k, v) > yield tmpl >