Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templatefuncs.py @ 38251:ead71b15efd5
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 06 Jun 2018 13:31:24 -0400 |
| parents | 1c8098cf560a 3277940a935f |
| children | c2456a7726c1 |
line wrap: on
line diff
--- a/mercurial/templatefuncs.py Sat May 26 03:01:14 2018 +0530 +++ b/mercurial/templatefuncs.py Wed Jun 06 13:31:24 2018 -0400 @@ -559,9 +559,9 @@ text = evalstring(context, mapping, args[0]) style = evalstring(context, mapping, args[1]) - return minirst.format(text, style=style, keep=['verbose']) + return minirst.format(text, style=style, keep=['verbose'])[0] -@templatefunc('separate(sep, args)', argspec='sep *args') +@templatefunc('separate(sep, args...)', argspec='sep *args') def separate(context, mapping, args): """Add a separator between non-empty arguments.""" if 'sep' not in args: