templatefuncs: do not crash because of invalid value fed to mailmap()

mercurial/templatefuncs.py

@@ -175,7 +175,7 b' def mailmap(context, mapping, args):'
     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')

tests/test-mailmap.t

@@ -65,3 +65,8 b' A commit with improperly formatted user '
   Proper Name 4 <proper@m.c>
   Testuser <newmmentry@m.c>
   Improper user
+
+No TypeError beacause of invalid input
+
+  $ hg log -T '{mailmap(termwidth)}\n' -r0
+  80