Mercurial > public > mercurial-scm > hg
comparison mercurial/debugcommands.py @ 35151: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 |
comparison
equal
deleted
inserted
replaced
| 35150:08b8b56bd2e8 | 35151:b45a9d121b53 |
|---|---|
| 717 if ent[3] == -1: | 717 if ent[3] == -1: |
| 718 timestr = 'unset ' | 718 timestr = 'unset ' |
| 719 elif nodates: | 719 elif nodates: |
| 720 timestr = 'set ' | 720 timestr = 'set ' |
| 721 else: | 721 else: |
| 722 timestr = time.strftime("%Y-%m-%d %H:%M:%S ", | 722 timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ", |
| 723 time.localtime(ent[3])) | 723 time.localtime(ent[3])) |
| 724 if ent[1] & 0o20000: | 724 if ent[1] & 0o20000: |
| 725 mode = 'lnk' | 725 mode = 'lnk' |
| 726 else: | 726 else: |
| 727 mode = '%3o' % (ent[1] & 0o777 & ~util.umask) | 727 mode = '%3o' % (ent[1] & 0o777 & ~util.umask) |