facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

parsedate: use Abort rather than ValueError

Browse Source
This commit is contained in:
Matt Mackall 2006-12-06 13:13:26 -06:00
parent 506998b3ec
commit 9630fc215f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial/util.py
View File

@ -1079,17 +1079,15 @@ def parsedate(string, formats=None):
else:
break
else:
raise ValueError(_('invalid date: %r '
'see hg(1) manual page for details')
% string)
raise Abort(_('invalid date: %r ') % string)
# validate explicit (probably user-specified) date and
# time zone offset. values must fit in signed 32 bits for
# current 32-bit linux runtimes. timezones go from UTC-12
# to UTC+14
if abs(when) > 0x7fffffff:
raise ValueError(_('date exceeds 32 bits: %d') % when)
raise Abort(_('date exceeds 32 bits: %d') % when)
if offset < -50400 or offset > 43200:
raise ValueError(_('impossible time zone offset: %d') % offset)
raise Abort(_('impossible time zone offset: %d') % offset)
return when, offset
def shortuser(user):

2
tests/test-parse-date.out
View File

@ -3,7 +3,7 @@ changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8
merging with changeset 2:e6c3abc120e7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
abort: invalid date: 'should fail' see hg(1) manual page for details
abort: invalid date: 'should fail'
transaction abort!
rollback completed
abort: date exceeds 32 bits: 100000000000000000