Mercurial > hg
comparison mercurial/templatefuncs.py @ 37244:3685a79ea51b
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 |
comparison
equal
deleted
inserted
replaced
37243:3e293808e835 | 37244:3685a79ea51b |
---|---|
182 | 182 |
183 if 'mailmap' not in cache: | 183 if 'mailmap' not in cache: |
184 data = repo.wvfs.tryread('.mailmap') | 184 data = repo.wvfs.tryread('.mailmap') |
185 cache['mailmap'] = stringutil.parsemailmap(data) | 185 cache['mailmap'] = stringutil.parsemailmap(data) |
186 | 186 |
187 return stringutil.mapname(cache['mailmap'], author) or author | 187 return stringutil.mapname(cache['mailmap'], author) |
188 | 188 |
189 @templatefunc('pad(text, width[, fillchar=\' \'[, left=False]])', | 189 @templatefunc('pad(text, width[, fillchar=\' \'[, left=False]])', |
190 argspec='text width fillchar left') | 190 argspec='text width fillchar left') |
191 def pad(context, mapping, args): | 191 def pad(context, mapping, args): |
192 """Pad text with a | 192 """Pad text with a |