This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9913

errors: use InputError for incorrectly formatted dates
ClosedPublic

Authored by martinvonz on Jan 29 2021, 7:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6894c9ef4dcd: errors: use InputError for incorrectly formatted dates

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

martinvonz created this revision.Jan 29 2021, 7:37 PM
pulkit accepted this revision.Jan 31 2021, 1:17 PM
This revision is now accepted and ready to land.Jan 31 2021, 1:17 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/dateutil.py (16 lines)
Mtests/test-parse-date.t (20 lines)

Diff 25406

mercurial/utils/dateutil.py

def makedate(timestamp=None): def makedate(timestamp=None):
"""Return a unix timestamp (or the current time) as a (unixtime, """Return a unix timestamp (or the current time) as a (unixtime,
offset) tuple based off the local timezone.""" offset) tuple based off the local timezone."""
if timestamp is None: if timestamp is None:
timestamp = time.time() timestamp = time.time()
if timestamp < 0: if timestamp < 0:
hint = _(b"check your clock") hint = _(b"check your clock")
raise error.Abort(_(b"negative timestamp: %d") % timestamp, hint=hint) raise error.InputError(
_(b"negative timestamp: %d") % timestamp, hint=hint
)
delta = datetime.datetime.utcfromtimestamp( delta = datetime.datetime.utcfromtimestamp(
timestamp timestamp
) - datetime.datetime.fromtimestamp(timestamp) ) - datetime.datetime.fromtimestamp(timestamp)
tz = delta.days * 86400 + delta.seconds tz = delta.days * 86400 + delta.seconds
return timestamp, tz return timestamp, tz
def datestr(date=None, format=b'%a %b %d %H:%M:%S %Y %1%2'): def datestr(date=None, format=b'%a %b %d %H:%M:%S %Y %1%2'):
except error.ParseError: except error.ParseError:
pass pass
d[b"d"] = b"28" d[b"d"] = b"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 error.Abort(_(b"dates cannot consist entirely of whitespace")) raise error.InputError(
_(b"dates cannot consist entirely of whitespace")
)
elif date[0:1] == b"<": elif date[0:1] == b"<":
if not date[1:]: if not date[1:]:
raise error.Abort(_(b"invalid day spec, use '<DATE'")) raise error.InputError(_(b"invalid day spec, use '<DATE'"))
when = upper(date[1:]) when = upper(date[1:])
return lambda x: x <= when return lambda x: x <= when
elif date[0:1] == b">": elif date[0:1] == b">":
if not date[1:]: if not date[1:]:
raise error.Abort(_(b"invalid day spec, use '>DATE'")) raise error.InputError(_(b"invalid day spec, use '>DATE'"))
when = lower(date[1:]) when = lower(date[1:])
return lambda x: x >= when return lambda x: x >= when
elif date[0:1] == b"-": elif date[0:1] == b"-":
try: try:
days = int(date[1:]) days = int(date[1:])
except ValueError: except ValueError:
raise error.Abort(_(b"invalid day spec: %s") % date[1:]) raise error.InputError(_(b"invalid day spec: %s") % date[1:])
if days < 0: if days < 0:
raise error.Abort( raise error.InputError(
_(b"%s must be nonnegative (see 'hg help dates')") % date[1:] _(b"%s must be nonnegative (see 'hg help dates')") % date[1:]
) )
when = makedate()[0] - days * 3600 * 24 when = makedate()[0] - days * 3600 * 24
return lambda x: x >= when return lambda x: x >= when
elif b" to " in date: elif b" to " in date:
a, b = date.split(b" to ") a, b = date.split(b" to ")
start, stop = lower(a), upper(b) start, stop = lower(a), upper(b)
return lambda x: x >= start and x <= stop return lambda x: x >= start and x <= stop
else: else:
start, stop = lower(date), upper(date) start, stop = lower(date), upper(date)
return lambda x: x >= start and x <= stop return lambda x: x >= start and x <= stop

tests/test-parse-date.t

Normal range Normal range
$ hg log -d -1 $ hg log -d -1
Negative range Negative range
$ hg log -d "--2" $ hg log -d "--2"
abort: -2 must be nonnegative (see 'hg help dates') abort: -2 must be nonnegative (see 'hg help dates')
[255] [10]
Whitespace only Whitespace only
$ hg log -d " " $ hg log -d " "
abort: dates cannot consist entirely of whitespace abort: dates cannot consist entirely of whitespace
[255] [10]
Test date formats with '>' or '<' accompanied by space characters Test date formats with '>' or '<' accompanied by space characters
$ hg log -d '>' --template '{date|date}\n' $ hg log -d '>' --template '{date|date}\n'
abort: invalid day spec, use '>DATE' abort: invalid day spec, use '>DATE'
[255] [10]
$ hg log -d '<' --template '{date|date}\n' $ hg log -d '<' --template '{date|date}\n'
abort: invalid day spec, use '<DATE' abort: invalid day spec, use '<DATE'
[255] [10]
$ hg log -d ' >' --template '{date|date}\n' $ hg log -d ' >' --template '{date|date}\n'
abort: invalid day spec, use '>DATE' abort: invalid day spec, use '>DATE'
[255] [10]
$ hg log -d ' <' --template '{date|date}\n' $ hg log -d ' <' --template '{date|date}\n'
abort: invalid day spec, use '<DATE' abort: invalid day spec, use '<DATE'
[255] [10]
$ hg log -d '> ' --template '{date|date}\n' $ hg log -d '> ' --template '{date|date}\n'
abort: invalid day spec, use '>DATE' abort: invalid day spec, use '>DATE'
[255] [10]
$ hg log -d '< ' --template '{date|date}\n' $ hg log -d '< ' --template '{date|date}\n'
abort: invalid day spec, use '<DATE' abort: invalid day spec, use '<DATE'
[255] [10]
$ hg log -d ' > ' --template '{date|date}\n' $ hg log -d ' > ' --template '{date|date}\n'
abort: invalid day spec, use '>DATE' abort: invalid day spec, use '>DATE'
[255] [10]
$ hg log -d ' < ' --template '{date|date}\n' $ hg log -d ' < ' --template '{date|date}\n'
abort: invalid day spec, use '<DATE' abort: invalid day spec, use '<DATE'
[255] [10]
$ hg log -d '>02/01' --template '{date|date}\n' $ hg log -d '>02/01' --template '{date|date}\n'
$ hg log -d '<02/01' --template '{date|date}\n' $ hg log -d '<02/01' --template '{date|date}\n'
Sun Jan 15 13:30:00 2006 +0500 Sun Jan 15 13:30:00 2006 +0500
Sun Jan 15 13:30:00 2006 -0800 Sun Jan 15 13:30:00 2006 -0800
Sat Jul 15 13:30:00 2006 +0500 Sat Jul 15 13:30:00 2006 +0500
Sat Jul 15 13:30:00 2006 -0700 Sat Jul 15 13:30:00 2006 -0700
Sun Jun 11 00:26:40 2006 -0400 Sun Jun 11 00:26:40 2006 -0400