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

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

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.

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

Revision Contents
Changeset List

			Path	Packages
M			mercurial/util.py (2 lines)
M			tests/test-commit.t (2 lines)
M			tests/test-revset.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6083		Feb 25 2018, 10:49 PM	★	★
Diff 2	6086		Feb 26 2018, 12:16 AM	★	★
Diff 3	6099		Feb 26 2018, 1:01 AM	★	★
Diff 4	6267		Mar 1 2018, 2:11 PM	★	★
Diff 5	6296		Mar 1 2018, 5:51 PM	★	★
Diff 6	6298	rHG8346c0e2af92df777de1d529b8464d8a7b217f78	Feb 25 2018, 10:31 PM	★	★

Status	Author	Revision
Closed	durin42	D2451 py3: whitelist test-push-http.t as passing
Closed	durin42	D2450 util: handle fileno() on Python 3 throwing io.UnsupportedOperation
Closed	durin42	D2449 wireproto: use %d to encode an int, not a %s
Closed	durin42	D2448 httppeer: explicitly catch urlerr.httperror and re-raise
Closed	durin42	D2447 hgweb: pass exception message to builtin Exception ctor as sysstr
Closed	durin42	D2446 bundle2: part id is an int, use %d to make it bytes
Closed	durin42	D2445 bundle2: **strkwargs love on various kwargs constructions
Closed	durin42	D2444 http: drop custom http client logic
Closed	durin42	D2443 statichttprepo: move HTTPRangeHandler from byterange and delete the latter
Closed	durin42	D2442 filemerge: do what the context __bytes__ does, but locally
Closed	durin42	D2441 py3: convert known-int values to bytes using %d
Closed	durin42	D2440 py3: hunt down str(exception) instances and use util.forcebytestr
Closed	durin42	D2439 py3: whitelist another nine passing tests
Closed	durin42	D2438 util: use pycompat.bytestr() on repr() in date parse abort
Closed	durin42	D2437 subrepo: use util.forcebytestr() instead of str() on exception
Closed	durin42	D2436 tests: add missing b prefixes in test-commit.t
Closed	durin42	D2435 commitextras: fix on Python 3 by using sysstrs for __dict__ ops
Closed	durin42	D2434 util: use pycompat.bytestr() instead of str()

Diff 6099

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') % shellquote(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)

tests/test-commit.t

	abort: empty commit message			abort: empty commit message
	[255]			[255]
	$ hg commit -d '0 0' -m commit-1			$ hg commit -d '0 0' -m commit-1
	$ echo foo >> foo			$ echo foo >> foo
	$ hg commit -d '1 4444444' -m commit-3			$ hg commit -d '1 4444444' -m commit-3
	hg: parse error: impossible time zone offset: 4444444			hg: parse error: impossible time zone offset: 4444444
	[255]			[255]
	$ hg commit -d '1 15.1' -m commit-4			$ hg commit -d '1 15.1' -m commit-4
	hg: parse error: invalid date: '1\t15.1'			hg: parse error: invalid date: '1 15.1'
	[255]			[255]
	$ hg commit -d 'foo bar' -m commit-5			$ hg commit -d 'foo bar' -m commit-5
	hg: parse error: invalid date: 'foo bar'			hg: parse error: invalid date: 'foo bar'
	[255]			[255]
	$ hg commit -d ' 1 4444' -m commit-6			$ hg commit -d ' 1 4444' -m commit-6
	$ hg commit -d '111111111111 0' -m commit-7			$ hg commit -d '111111111111 0' -m commit-7
	hg: parse error: date exceeds 32 bits: 111111111111			hg: parse error: date exceeds 32 bits: 111111111111
	[255]			[255]

tests/test-revset.t

	[255]			[255]
	$ log 'date('			$ log 'date('
	hg: parse error at 5: not a prefix: end			hg: parse error at 5: not a prefix: end
	[255]			[255]
	$ log 'date("\xy")'			$ log 'date("\xy")'
	hg: parse error: invalid \x escape			hg: parse error: invalid \x escape
	[255]			[255]
	$ log 'date(tip)'			$ log 'date(tip)'
	hg: parse error: invalid date: 'tip'			hg: parse error: invalid date: tip
	[255]			[255]
	$ log '0:date'			$ log '0:date'
	abort: unknown revision 'date'!			abort: unknown revision 'date'!
	[255]			[255]
	$ log '::"date"'			$ log '::"date"'
	abort: unknown revision 'date'!			abort: unknown revision 'date'!
	[255]			[255]
	$ hg book date -r 4			$ hg book date -r 4

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail