D11826: errors: use detailed exit code for non-integer number of diff context lines
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon Nov 29 21:58:49 UTC 2021
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11826
AFFECTED FILES
mercurial/mdiff.py
tests/test-diff-unified.t
CHANGE DETAILS
diff --git a/tests/test-diff-unified.t b/tests/test-diff-unified.t
--- a/tests/test-diff-unified.t
+++ b/tests/test-diff-unified.t
@@ -46,7 +46,7 @@
$ hg diff --nodates -U foo
abort: diff context lines count must be an integer, not 'foo'
- [255]
+ [10]
$ hg diff --nodates -U 2
@@ -87,7 +87,7 @@
$ hg --config diff.unified=foo diff --nodates
abort: diff context lines count must be an integer, not 'foo'
- [255]
+ [10]
noprefix config and option
diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -84,7 +84,7 @@
try:
self.context = int(self.context)
except ValueError:
- raise error.Abort(
+ raise error.InputError(
_(b'diff context lines count must be an integer, not %r')
% pycompat.bytestr(self.context)
)
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list