Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 39042:9126a4034621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
grep: coerce username to bytestr, not str Differential Revision: https://phab.mercurial-scm.org/D4238
author Augie Fackler <augie@google.com>
date Thu, 09 Aug 2018 23:13:01 -0400
parents 2525c4943c09
children 5797b0bbdd1d
comparison
equal deleted inserted replaced
39041:2525c4943c09 39042:9126a4034621
2623 def display(fm, fn, ctx, pstates, states): 2623 def display(fm, fn, ctx, pstates, states):
2624 rev = scmutil.intrev(ctx) 2624 rev = scmutil.intrev(ctx)
2625 if fm.isplain(): 2625 if fm.isplain():
2626 formatuser = ui.shortuser 2626 formatuser = ui.shortuser
2627 else: 2627 else:
2628 formatuser = str 2628 formatuser = pycompat.bytestr
2629 if ui.quiet: 2629 if ui.quiet:
2630 datefmt = '%Y-%m-%d' 2630 datefmt = '%Y-%m-%d'
2631 else: 2631 else:
2632 datefmt = '%a %b %d %H:%M:%S %Y %1%2' 2632 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2633 found = False 2633 found = False