--- a/mercurial/scmutil.py Tue Nov 10 09:14:01 2020 -0800
+++ b/mercurial/scmutil.py Thu Nov 12 09:53:14 2020 -0800
@@ -311,7 +311,7 @@
def checkfilename(f):
'''Check that the filename f is an acceptable filename for a tracked file'''
if b'\r' in f or b'\n' in f:
- raise error.Abort(
+ raise error.InputError(
_(b"'\\n' and '\\r' disallowed in filenames: %r")
% pycompat.bytestr(f)
)
@@ -326,7 +326,7 @@
if msg:
msg = b"%s: %s" % (msg, procutil.shellquote(f))
if abort:
- raise error.Abort(msg)
+ raise error.InputError(msg)
ui.warn(_(b"warning: %s\n") % msg)