This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3590

py3: make sure we pass str to date.strftime()
ClosedPublic

Authored by pulkit on May 19 2018, 10:35 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG543b7b349b2c: py3: make sure we pass str to date.strftime()

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 19 2018, 10:35 AM
Closed by commit rHG543b7b349b2c: py3: make sure we pass str to date.strftime() (authored by pulkit). · Explain WhyMay 19 2018, 3:38 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.May 21 2018, 8:42 AM
  • return date.strftime(opts['dateformat'])

+ return date.strftime(pycompat.sysstr(opts['dateformat']))

Should be encoding.strfromlocal() because opts['dateformat'] is provided
by user.

Revision Contents
Changeset List

PathPackages
Mhgext/churn.py (2 lines)

Diff 8795

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(opts['dateformat']) return date.strftime(pycompat.sysstr(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()