Mercurial > hg

diff mercurial/scmutil.py @ 32111: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 0d892d820a51
children ef966bcf48a5
line wrap: on
line diff
--- a/mercurial/scmutil.py	Tue May 02 17:29:01 2017 -0500
+++ b/mercurial/scmutil.py	Sat Apr 22 15:00:17 2017 -0700
@@ -186,8 +186,6 @@
         ui.warn(_("abort: file censored %s!\n") % inst)
     except error.RevlogError as inst:
         ui.warn(_("abort: %s!\n") % inst)
-    except error.SignalInterrupt:
-        ui.warn(_("killed!\n"))
     except error.InterventionRequired as inst:
         ui.warn("%s\n" % inst)
         if inst.hint: