Mercurial > hg-stable

diff mercurial/dispatch.py @ 32165:1208b74841ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: take over SignalInterrupt handling from scmutil dispatch handles KeyboardInterrupt already. This makes the code more consistent, and makes worker not print "killed!" if it receives SIGTERM in most cases (in rare cases there is still "killed!" printed, which will be fixed by the next patch).
author Jun Wu <quark@fb.com>
date Sat, 22 Apr 2017 15:00:17 -0700
parents 616e788321cc
children c3dcec6cbc1b
line wrap: on
line diff
--- a/mercurial/dispatch.py	Tue May 02 17:29:01 2017 -0500
+++ b/mercurial/dispatch.py	Sat Apr 22 15:00:17 2017 -0700
@@ -162,9 +162,13 @@
     ret = None
     try:
         ret = _runcatch(req)
-    except KeyboardInterrupt:
+    except KeyboardInterrupt as inst:
         try:
-            req.ui.warn(_("interrupted!\n"))
+            if isinstance(inst, error.SignalInterrupt):
+                msg = _("killed!\n")
+            else:
+                msg = _("interrupted!\n")
+            req.ui.warn(msg)
         except error.SignalInterrupt:
             # maybe pager would quit without consuming all the output, and
             # SIGPIPE was raised. we cannot print anything in this case.