Patchwork D3001: templatefuncs: remove redundant "or author" from mailmap return statement

login
register
mail settings
Submitter phabricator
Date April 1, 2018, 1:59 a.m.
Message ID <4feb3abb2ad9b321f8a3ac96f73dc7f9@localhost.localdomain>
Download mbox | patch
Permalink /patch/30084/
State Not Applicable
Headers show

Comments

phabricator - April 1, 2018, 1:59 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3685a79ea51b: templatefuncs: remove redundant &quot;or author&quot; from mailmap return statement (authored by sheehan, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3001?vs=7477&id=7481

REVISION DETAIL
  https://phab.mercurial-scm.org/D3001

AFFECTED FILES
  mercurial/templatefuncs.py

CHANGE DETAILS




To: sheehan, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

diff --git a/mercurial/templatefuncs.py b/mercurial/templatefuncs.py
--- a/mercurial/templatefuncs.py
+++ b/mercurial/templatefuncs.py
@@ -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')