Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: handle late KeyboardInterrupt occurred in run()
authorYuya Nishihara <yuya@tcha.org>
Mon, 13 Jul 2020 21:14:20 +0900
changeset 45102 efcc87d37f4d
parent 45101 9e6b86a8f438
child 45103 a5fa2761a6cd
dispatch: handle late KeyboardInterrupt occurred in run() User can press Ctrl+C while flushing streams in dispatch.run(). In such case, I think exiting with 255 is better than printing Python traceback and exiting with 1.
mercurial/dispatch.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dispatch.py	Mon Jul 13 21:06:34 2020 +0900
+++ b/mercurial/dispatch.py	Mon Jul 13 21:14:20 2020 +0900
@@ -140,8 +140,10 @@
                 status = -1
 
         _silencestdio()
-    finally:
-        pass
+    except KeyboardInterrupt:
+        # Catch early/late KeyboardInterrupt as last ditch. Here nothing will
+        # be printed to console to avoid another IOError/KeyboardInterrupt.
+        status = -1
     sys.exit(status & 255)
mercurial