Mercurial > public > mercurial-scm > hg-stable
diff mercurial/debugcommands.py @ 35172:b45a9d121b53
py3: make sure the first argument of time.strftime() is str
time.strftime() does not accepts bytes as its first argument on py3.
Differential Revision: https://phab.mercurial-scm.org/D1559
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 29 Nov 2017 08:44:06 +0530 |
parents | 8f6641fa7c89 |
children | d4b108fdf423 |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Wed Nov 29 08:46:37 2017 +0530 +++ b/mercurial/debugcommands.py Wed Nov 29 08:44:06 2017 +0530 @@ -719,7 +719,7 @@ elif nodates: timestr = 'set ' else: - timestr = time.strftime("%Y-%m-%d %H:%M:%S ", + timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ", time.localtime(ent[3])) if ent[1] & 0o20000: mode = 'lnk'