errors: raise InputError in fancyopts
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 12 Nov 2020 08:29:55 -0800
changeset 45837 2eb8ad899fa6
parent 45836 de1f4c431619
child 45838 ae00e170f2d1
errors: raise InputError in fancyopts If a value of wrong type is passed to a command line flag, that's cleary an InputError. Differential Revision: https://phab.mercurial-scm.org/D9308
mercurial/fancyopts.py
tests/test-import.t
--- a/mercurial/fancyopts.py	Fri Nov 06 17:32:23 2020 +0100
+++ b/mercurial/fancyopts.py	Thu Nov 12 08:29:55 2020 -0800
@@ -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)
                 )
--- a/tests/test-import.t	Fri Nov 06 17:32:23 2020 +0100
+++ b/tests/test-import.t	Thu Nov 12 08:29:55 2020 -0800
@@ -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