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 23558

	if b1 < ubb <= b2:			if b1 < ubb <= b2:
	if stype == b'=':			if stype == b'=':
	uba = a1 + (ubb - b1)			uba = a1 + (ubb - b1)
	else:			else:
	uba = a2			uba = a2
	if hunkinrange((b1, (b2 - b1)), rangeb):			if hunkinrange((b1, (b2 - b1)), rangeb):
	filteredblocks.append(block)			filteredblocks.append(block)
	if lba is None or uba is None or uba < lba:			if lba is None or uba is None or uba < lba:
	raise error.Abort(_(b'line range exceeds file size'))			raise error.InputError(_(b'line range exceeds file size'))
	return filteredblocks, (lba, uba)			return filteredblocks, (lba, uba)


	def chooseblocksfunc(opts=None):			def chooseblocksfunc(opts=None):
	if (			if (
	opts is None			opts is None
	or not opts.xdiff			or not opts.xdiff
	or not util.safehasattr(bdiff, b'xdiffblocks')			or not util.safehasattr(bdiff, b'xdiffblocks')

	$ hg log -r 'followlines(baz, 5:4)'			$ hg log -r 'followlines(baz, 5:4)'
	hg: parse error: line range must be positive			hg: parse error: line range must be positive
	[255]			[255]
	$ hg log -r 'followlines(baz, 0:4)'			$ hg log -r 'followlines(baz, 0:4)'
	hg: parse error: fromline must be strictly positive			hg: parse error: fromline must be strictly positive
	[255]			[255]
	$ hg log -r 'followlines(baz, 2:40)'			$ hg log -r 'followlines(baz, 2:40)'
	abort: line range exceeds file size			abort: line range exceeds file size
	[255]			[10]
	$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])'			$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])'
	hg: parse error at 43: not a prefix: [			hg: parse error at 43: not a prefix: [
	(followlines(baz, 2:4, startrev=20, descend=[1])			(followlines(baz, 2:4, startrev=20, descend=[1])
	^ here)			^ here)
	[255]			[255]
	$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)'			$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)'
	hg: parse error: descend argument must be a boolean			hg: parse error: descend argument must be a boolean
	[255]			[255]