Mercurial > hg-stable

diff mercurial/templatefuncs.py @ 37262:8e57c3b0dce4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatefuncs: do not crash because of invalid value fed to mailmap()
author Yuya Nishihara <yuya@tcha.org>
date Sun, 01 Apr 2018 11:06:29 +0900
parents 3685a79ea51b
children 7d3bc1d4e871
line wrap: on
line diff
--- a/mercurial/templatefuncs.py	Sat Mar 31 23:34:15 2018 -0700
+++ b/mercurial/templatefuncs.py	Sun Apr 01 11:06:29 2018 +0900
@@ -175,7 +175,7 @@
     if len(args) != 1:
         raise error.ParseError(_("mailmap expects one argument"))
 
-    author = evalfuncarg(context, mapping, args[0])
+    author = evalstring(context, mapping, args[0])
 
     cache = context.resource(mapping, 'cache')
     repo = context.resource(mapping, 'repo')