This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2438

util: use pycompat.bytestr() on repr() in date parse abort
ClosedPublic

Authored by durin42 on Feb 25 2018, 10:49 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0c2eeaca0577: util: use pycompat.bytestr() on repr() in date parse abort
rHG8346c0e2af92: util: use pycompat.bytestr() on repr() in date parse abort
Summary

Avoids the b'' prefix.

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

durin42 created this revision.Feb 25 2018, 10:49 PM
durin42 updated this revision to Diff 6086.Feb 26 2018, 12:16 AM
durin42 updated this revision to Diff 6099.Feb 26 2018, 1:01 AM
yuja added a subscriber: yuja.Feb 26 2018, 7:35 AM

I think shellquote() is okay, but simpler workaround is to use bytestr(date)
to drop b.

durin42 edited the summary of this revision. (Show Details)Mar 1 2018, 2:11 PM
durin42 retitled this revision from util: use util.shellquote() instead of repr() in date parse abort to util: use pycompat.bytestr() on repr() in date parse abort.
durin42 updated this revision to Diff 6267.
durin42 updated this revision to Diff 6296.Mar 1 2018, 5:51 PM
pulkit accepted this revision.Mar 1 2018, 6:06 PM
pulkit added a subscriber: pulkit.

Looks good to me and Yuya's feedback is also addressed. Queued thanks.

Closed by commit rHG8346c0e2af92: util: use pycompat.bytestr() on repr() in date parse abort (authored by durin42). · Explain WhyMar 1 2018, 6:14 PM
This revision was automatically updated to reflect the committed changes.
yuja added a comment.Mar 1 2018, 10:55 PM

repr() should be applied to a bytestr object to get bytestr.repr() working.
Fixed in flight.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (3 lines)

Diff 6298

mercurial/util.py

for format in formats: for format in formats:
try: try:
when, offset = strdate(date, format, defaults) when, offset = strdate(date, format, defaults)
except (ValueError, OverflowError): except (ValueError, OverflowError):
pass pass
else: else:
break break
else: else:
raise error.ParseError(_('invalid date: %r') % date) raise error.ParseError(
_('invalid date: %s') % pycompat.bytestr(repr(date)))
# validate explicit (probably user-specified) date and # validate explicit (probably user-specified) date and
# time zone offset. values must fit in signed 32 bits for # time zone offset. values must fit in signed 32 bits for
# current 32-bit linux runtimes. timezones go from UTC-12 # current 32-bit linux runtimes. timezones go from UTC-12
# to UTC+14 # to UTC+14
if when < -0x80000000 or when > 0x7fffffff: if when < -0x80000000 or when > 0x7fffffff:
raise error.ParseError(_('date exceeds 32 bits: %d') % when) raise error.ParseError(_('date exceeds 32 bits: %d') % when)
if offset < -50400 or offset > 43200: if offset < -50400 or offset > 43200:
raise error.ParseError(_('impossible time zone offset: %d') % offset) raise error.ParseError(_('impossible time zone offset: %d') % offset)