This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D11831 errors: use detailed error for invalid commit-extras argument
Closed	martinvonz	D11830 errors: use detailed exit code in pathauditor
Closed	martinvonz	D11829 errors: use detailed exit code for RepoLookupError
Closed	martinvonz	D11828 errors: use detailed exit code for detected case-collision
Closed	martinvonz	D11827 errors: use detailed exit code when trying to merge file outside narrowspec
Closed	martinvonz	D11826 errors: use detailed exit code for non-integer number of diff context lines
Closed	martinvonz	D11825 patch: add hint about mangled whitespace on bad patch
Closed	martinvonz	D11824 errors: return more detailed errors when failing to parse or apply patch

Diff 31213

	v = opts.get(k)			v = opts.get(k)
	if v is None:			if v is None:
	v = self.defaults[k]			v = self.defaults[k]
	setattr(self, k, v)			setattr(self, k, v)

	try:			try:
	self.context = int(self.context)			self.context = int(self.context)
	except ValueError:			except ValueError:
	raise error.Abort(			raise error.InputError(
	_(b'diff context lines count must be an integer, not %r')			_(b'diff context lines count must be an integer, not %r')
	% pycompat.bytestr(self.context)			% pycompat.bytestr(self.context)
	)			)

	def copy(self, **kwargs):			def copy(self, **kwargs):
	opts = {k: getattr(self, k) for k in self.defaults}			opts = {k: getattr(self, k) for k in self.defaults}
	opts = pycompat.strkwargs(opts)			opts = pycompat.strkwargs(opts)
	opts.update(kwargs)			opts.update(kwargs)

	a			a
	a			a
	c			c

	invalid --unified			invalid --unified

	$ hg diff --nodates -U foo			$ hg diff --nodates -U foo
	abort: diff context lines count must be an integer, not 'foo'			abort: diff context lines count must be an integer, not 'foo'
	[255]			[10]


	$ hg diff --nodates -U 2			$ hg diff --nodates -U 2
	diff -r cf9f4ba66af2 a			diff -r cf9f4ba66af2 a
	--- a/a			--- a/a
	+++ b/a			+++ b/a
	@@ -3,5 +3,5 @@			@@ -3,5 +3,5 @@
	a			a
	-b			-b
	+dd			+dd
	a			a

	invalid diff.unified			invalid diff.unified

	$ hg --config diff.unified=foo diff --nodates			$ hg --config diff.unified=foo diff --nodates
	abort: diff context lines count must be an integer, not 'foo'			abort: diff context lines count must be an integer, not 'foo'
	[255]			[10]

	noprefix config and option			noprefix config and option

	$ hg --config diff.noprefix=True diff --nodates			$ hg --config diff.noprefix=True diff --nodates
	diff -r cf9f4ba66af2 a			diff -r cf9f4ba66af2 a
	--- a			--- a
	+++ a			+++ a
	@@ -2,7 +2,7 @@			@@ -2,7 +2,7 @@