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

2018-03-31 Thread sheehan (Connor Sheehan) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3685a79ea51b: templatefuncs: remove redundant "or 
author" 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

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')



To: sheehan, #hg-reviewers, yuja
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

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

2018-03-31 Thread sheehan (Connor Sheehan) 
sheehan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/templatefuncs.py

CHANGE DETAILS

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



To: sheehan, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel