This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2289

date: fix parsing months
ClosedPublic

Authored by quark on Feb 16 2018, 4:26 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG48783333f45c: date: fix parsing months
Summary

Thanks nemo for discovering this on #mercurial IRC channel.

Test Plan

Add a test. It fails before this patch:

+  hg: parse error: invalid date: 'Feb 2018'
+  hg: parse error: invalid date: 'Apr 2018'
+  hg: parse error: invalid date: 'Jun 2018'
+  hg: parse error: invalid date: 'Sep 2018'
+  hg: parse error: invalid date: 'Nov 2018'

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

quark created this revision.Feb 16 2018, 4:26 PM
martinvonz accepted this revision.Feb 16 2018, 4:28 PM
This revision is now accepted and ready to land.Feb 16 2018, 4:28 PM
martinvonz added a comment.Feb 16 2018, 4:28 PM

Queuing for stable

Closed by commit rHG48783333f45c: date: fix parsing months (authored by quark). · Explain WhyFeb 16 2018, 5:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (2 lines)
Mtests/test-parse-date.t (6 lines)

Diff 5786

mercurial/util.py

return parsedate(date, extendeddateformats, d)[0] return parsedate(date, extendeddateformats, d)[0]
def upper(date): def upper(date):
d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"} d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"}
for days in ("31", "30", "29"): for days in ("31", "30", "29"):
try: try:
d["d"] = days d["d"] = days
return parsedate(date, extendeddateformats, d)[0] return parsedate(date, extendeddateformats, d)[0]
except Abort: except error.ParseError:
pass pass
d["d"] = "28" d["d"] = "28"
return parsedate(date, extendeddateformats, d)[0] return parsedate(date, extendeddateformats, d)[0]
date = date.strip() date = date.strip()
if not date: if not date:
raise Abort(_("dates cannot consist entirely of whitespace")) raise Abort(_("dates cannot consist entirely of whitespace"))

tests/test-parse-date.t

internal: 1469621421 0 internal: 1469621421 0
standard: Wed Jul 27 12:10:21 2016 +0000 standard: Wed Jul 27 12:10:21 2016 +0000
$ hg debugdate "2016-07-27 12:10:21+00:00" $ hg debugdate "2016-07-27 12:10:21+00:00"
internal: 1469621421 0 internal: 1469621421 0
standard: Wed Jul 27 12:10:21 2016 +0000 standard: Wed Jul 27 12:10:21 2016 +0000
$ hg debugdate "2016-07-27 121021Z" $ hg debugdate "2016-07-27 121021Z"
internal: 1469621421 0 internal: 1469621421 0
standard: Wed Jul 27 12:10:21 2016 +0000 standard: Wed Jul 27 12:10:21 2016 +0000
Test parsing months
$ for i in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec; do
> hg log -d "$i 2018" -r null
> done