diff --git a/mercurial/fancyopts.py b/mercurial/fancyopts.py index de1f4c431619a33b8e74e87365beae237198e222_bWVyY3VyaWFsL2ZhbmN5b3B0cy5weQ==..2eb8ad899fa636e1589da122d82e1be928821428_bWVyY3VyaWFsL2ZhbmN5b3B0cy5weQ== 100644 --- a/mercurial/fancyopts.py +++ b/mercurial/fancyopts.py @@ -380,7 +380,7 @@ else: def abort(s): - raise error.Abort( + raise error.InputError( _(b'invalid value %r for option %s, %s') % (pycompat.maybebytestr(val), opt, s) ) diff --git a/tests/test-import.t b/tests/test-import.t index de1f4c431619a33b8e74e87365beae237198e222_dGVzdHMvdGVzdC1pbXBvcnQudA==..2eb8ad899fa636e1589da122d82e1be928821428_dGVzdHMvdGVzdC1pbXBvcnQudA== 100644 --- a/tests/test-import.t +++ b/tests/test-import.t @@ -1036,7 +1036,7 @@ adding a $ hg import -p foo abort: invalid value 'foo' for option -p, expected int - [255] + [10] $ hg import -p0 - << EOF > foobar > --- a Sat Apr 12 22:43:58 2008 -0400