( )⚙ D1557 py3: use encoding.strtolocal() to convert string to bytes

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1557

py3: use encoding.strtolocal() to convert string to bytes
ClosedPublic

Authored by pulkit on Nov 29 2017, 6:09 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGd4b108fdf423: py3: use encoding.strtolocal() to convert string to bytes
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Nov 29 2017, 6:09 PM
yuja requested changes to this revision.Nov 30 2017, 7:28 AM
yuja added a subscriber: yuja.

The result of strftime() has to be converted back to local string
by .encode('ascii') or encoding.strtolocal().

See util.parsedate() for details.

This revision now requires changes to proceed.Nov 30 2017, 7:28 AM
pulkit retitled this revision from py3: use pycompat.bytestr() to convert string to bytes to py3: use encoding.strtolocal() to convert string to bytes.Dec 1 2017, 9:13 AM
pulkit updated this revision to Diff 4050.
yuja requested changes to this revision.Dec 1 2017, 9:59 PM
yuja added inline comments.
mercurial/debugcommands.py
730

timestr may be either bytes or str. strtolocal() should be
applied only to the return value of strftime().

This revision now requires changes to proceed.Dec 1 2017, 9:59 PM
pulkit updated this revision to Diff 4085.Dec 2 2017, 2:51 PM
yuja accepted this revision.Dec 3 2017, 3:54 AM
This revision is now accepted and ready to land.Dec 3 2017, 3:54 AM
Closed by commit rHGd4b108fdf423: py3: use encoding.strtolocal() to convert string to bytes (authored by pulkit). · Explain WhyDec 3 2017, 4:13 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (1 line)

Diff 4085

mercurial/debugcommands.py

for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
if ent[3] == -1: if ent[3] == -1:
timestr = 'unset ' timestr = 'unset '
elif nodates: elif nodates:
timestr = 'set ' timestr = 'set '
else: else:
timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ", timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ",
time.localtime(ent[3])) time.localtime(ent[3]))
timestr = encoding.strtolocal(timestr)
if ent[1] & 0o20000: if ent[1] & 0o20000:
mode = 'lnk' mode = 'lnk'
else: else:
mode = '%3o' % (ent[1] & 0o777 & ~util.umask) mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
for f in repo.dirstate.copies(): for f in repo.dirstate.copies():
yujaUnsubmitted
Not Done

timestr may be either bytes or str. strtolocal() should be
applied only to the return value of strftime().

yuja: `timestr` may be either bytes or str. `strtolocal()` should be applied only to the return value…
ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
@command('debugdiscovery', @command('debugdiscovery',
[('', 'old', None, _('use old-style discovery')), [('', 'old', None, _('use old-style discovery')),
('', 'nonheads', None, ('', 'nonheads', None,
_('use old-style discovery with non-heads included')), _('use old-style discovery with non-heads included')),
] + cmdutil.remoteopts, ] + cmdutil.remoteopts,
_('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))