This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D9340 errors: raise InputError in `hg absorb`
Closed	martinvonz	D9339 errors: introduce CanceledError and use it in a few places
Closed	martinvonz	D9338 errors: raise InputError in `hg split`
Closed	martinvonz	D9337 errors: raise StateError in `hg bisect`
Closed	martinvonz	D9336 errors: raise InputError in `hg debugobsolete`
Closed	martinvonz	D9333 errors: raise InputError when line range to followlines() is out of bounds
Closed	martinvonz	D9332 errors: use exit code 10 for parse errors
Closed	martinvonz	D9355 errors: raise ConfigError on failure to parse config file
Closed	martinvonz	D9354 errors: remove ParseError.args
Closed	martinvonz	D9353 errors: let ParseError use Abort.__bytes__
Closed	martinvonz	D9352 config: clean up message about ignored untrusted config
Closed	martinvonz	D9351 tests: use new ParseError.format() in test-trusted.py
Closed	martinvonz	D9350 errors: make ParseError a subtype of Abort
Closed	martinvonz	D9349 tests: make doctests not depend on str(ParseError()) format
Closed	martinvonz	D9348 errors: format "abort: " text in a new Abort.format() method
Closed	martinvonz	D9347 errors: make formatparse() an instance method on ParseError
Closed	martinvonz	D9346 errors: create "similarity hint" for UnknownIdentifier eagerly in constructor
Closed	martinvonz	D9345 errors: move similarity_hint() to error module
Closed	martinvonz	D9344 errors: morph reportsimilar() into similarity_hint()
Closed	martinvonz	D9343 errors: restructure formatparse() to clarify conditions a bit

Diff 23602

	testui(user=b'abc', group=b'def', debug=True, silent=True)			testui(user=b'abc', group=b'def', debug=True, silent=True)

	print()			print()
	bprint(b"# parse error")			bprint(b"# parse error")
	f = open(b'.hg/hgrc', 'wb')			f = open(b'.hg/hgrc', 'wb')
	f.write(b'foo')			f.write(b'foo')
	f.close()			f.close()

	# This is a hack to remove b'' prefixes from ParseError.__bytes__ on
	# Python 3.
	def normalizeparseerror(e):
	if pycompat.ispy3:
	args = [a.decode('utf-8') for a in e.args]
	else:
	args = e.args

	return error.ParseError(*args)


	try:			try:
	testui(user=b'abc', group=b'def', silent=True)			testui(user=b'abc', group=b'def', silent=True)
	except error.ParseError as inst:			except error.ParseError as inst:
	bprint(normalizeparseerror(inst))			bprint(inst.format())

	try:			try:
	testui(debug=True, silent=True)			testui(debug=True, silent=True)
	except error.ParseError as inst:			except error.ParseError as inst:
	bprint(normalizeparseerror(inst))			bprint(inst.format())

	print()			print()
	bprint(b'# access typed information')			bprint(b'# access typed information')
	with open(b'.hg/hgrc', 'wb') as f:			with open(b'.hg/hgrc', 'wb') as f:
	f.write(			f.write(
	b'''\			b'''\
	[foo]			[foo]
	sub=main			sub=main

	# same user, same group			# same user, same group
	# different user, different group			# different user, different group

	# parse error			# parse error
	# different user, different group			# different user, different group
	not trusting file .hg/hgrc from untrusted user abc, group def			not trusting file .hg/hgrc from untrusted user abc, group def
	ignored: ('foo', '.hg/hgrc:1')			ignored: ('foo', '.hg/hgrc:1')
	# same user, same group			# same user, same group
	ParseError('foo', '.hg/hgrc:1')			hg: parse error at .hg/hgrc:1: foo


	# access typed information			# access typed information
	# different user, different group			# different user, different group
	not trusting file .hg/hgrc from untrusted user abc, group def			not trusting file .hg/hgrc from untrusted user abc, group def
	# suboptions, trusted and untrusted			# suboptions, trusted and untrusted
	(None, []) ('main', [('one', 'one'), ('two', 'two')])			(None, []) ('main', [('one', 'one'), ('two', 'two')])
	# path, trusted and untrusted			# path, trusted and untrusted
	None .hg/monty/python			None .hg/monty/python
	# bool, trusted and untrusted			# bool, trusted and untrusted
	False True			False True
	# int, trusted and untrusted			# int, trusted and untrusted
	0 42			0 42
	# bytes, trusted and untrusted			# bytes, trusted and untrusted
	0 84934656			0 84934656
	# list, trusted and untrusted			# list, trusted and untrusted
	[] ['spam', 'ham', 'eggs']			[] ['spam', 'ham', 'eggs']