This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3642

py3: use encoding.strfromlocal() instead of pycompat.sysstr()
ClosedPublic

Authored by pulkit on May 21 2018, 4:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG282f3daac1d7: py3: use encoding.strfromlocal() instead of pycompat.sysstr()
rHGd6d939a3676f: py3: use encoding.strfromlocal() instead of pycompat.sysstr()
Summary

opts['dateformat'] is provided by the user and can be encoded in local encoding.
Thanks to Yuya for catching.

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

pulkit created this revision.May 21 2018, 4:44 PM
Closed by commit rHGd6d939a3676f: py3: use encoding.strfromlocal() instead of pycompat.sysstr() (authored by pulkit). · Explain WhyMay 22 2018, 7:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/churn.py (2 lines)

Diff 8865

hgext/churn.py

def countrate(ui, repo, amap, *pats, **opts): def countrate(ui, repo, amap, *pats, **opts):
"""Calculate stats""" """Calculate stats"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get('dateformat'): if opts.get('dateformat'):
def getkey(ctx): def getkey(ctx):
t, tz = ctx.date() t, tz = ctx.date()
date = datetime.datetime(*time.gmtime(float(t) - tz)[:6]) date = datetime.datetime(*time.gmtime(float(t) - tz)[:6])
return date.strftime(pycompat.sysstr(opts['dateformat'])) return date.strftime(encoding.strfromlocal(opts['dateformat']))
else: else:
tmpl = opts.get('oldtemplate') or opts.get('template') tmpl = opts.get('oldtemplate') or opts.get('template')
tmpl = logcmdutil.maketemplater(ui, repo, tmpl) tmpl = logcmdutil.maketemplater(ui, repo, tmpl)
def getkey(ctx): def getkey(ctx):
ui.pushbuffer() ui.pushbuffer()
tmpl.show(ctx) tmpl.show(ctx)
return ui.popbuffer() return ui.popbuffer()