This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4238

grep: coerce username to bytestr, not str
ClosedPublic

Authored by durin42 on Aug 9 2018, 11:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9126a4034621: grep: coerce username to bytestr, not str
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 9 2018, 11:19 PM
Closed by commit rHG9126a4034621: grep: coerce username to bytestr, not str (authored by durin42). · Explain WhyAug 9 2018, 11:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 10268

mercurial/commands.py

for i in pycompat.xrange(blo, bhi): for i in pycompat.xrange(blo, bhi):
yield ('+', b[i]) yield ('+', b[i])
def display(fm, fn, ctx, pstates, states): def display(fm, fn, ctx, pstates, states):
rev = scmutil.intrev(ctx) rev = scmutil.intrev(ctx)
if fm.isplain(): if fm.isplain():
formatuser = ui.shortuser formatuser = ui.shortuser
else: else:
formatuser = str formatuser = pycompat.bytestr
if ui.quiet: if ui.quiet:
datefmt = '%Y-%m-%d' datefmt = '%Y-%m-%d'
else: else:
datefmt = '%a %b %d %H:%M:%S %Y %1%2' datefmt = '%a %b %d %H:%M:%S %Y %1%2'
found = False found = False
@util.cachefunc @util.cachefunc
def binary(): def binary():
flog = getfile(fn) flog = getfile(fn)