Mercurial > hg

diff mercurial/templatefuncs.py @ 37244:3685a79ea51b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatefuncs: remove redundant "or author" from mailmap return statement Differential Revision: https://phab.mercurial-scm.org/D3001
author Connor Sheehan <sheehan@mozilla.com>
date Sat, 31 Mar 2018 10:13:42 -0400
parents e70a90a72b80
children 8e57c3b0dce4
line wrap: on
line diff
--- a/mercurial/templatefuncs.py	Sat Feb 24 19:56:59 2018 -0500
+++ b/mercurial/templatefuncs.py	Sat Mar 31 10:13:42 2018 -0400
@@ -184,7 +184,7 @@
         data = repo.wvfs.tryread('.mailmap')
         cache['mailmap'] = stringutil.parsemailmap(data)
 
-    return stringutil.mapname(cache['mailmap'], author) or author
+    return stringutil.mapname(cache['mailmap'], author)
 
 @templatefunc('pad(text, width[, fillchar=\' \'[, left=False]])',
               argspec='text width fillchar left')