diff -r 568c05d8f3d2 -r ac362d5a7893 mercurial/patch.py
--- a/mercurial/patch.py	Tue Nov 17 15:51:09 2020 -0800
+++ b/mercurial/patch.py	Thu Oct 22 14:14:59 2020 -0700
@@ -1272,7 +1272,7 @@
             elif r == 6:  # all
                 ret = skipall = True
             elif r == 7:  # quit
-                raise error.Abort(_(b'user quit'))
+                raise error.CanceledError(_(b'user quit'))
             return ret, skipfile, skipall, newpatches
 
     seen = set()