Mercurial > hg

diff mercurial/dispatch.py @ 7644:182b7114d35a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: move SignalInterrupt now derived from KeyboardInterrupt to simplify catches
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:48:05 -0600
parents 9a1ea6587557
children 020a896a5292
line wrap: on
line diff
--- a/mercurial/dispatch.py	Mon Jan 12 11:39:38 2009 -0600
+++ b/mercurial/dispatch.py	Mon Jan 12 11:48:05 2009 -0600
@@ -26,7 +26,7 @@
 
 def _runcatch(ui, args):
     def catchterm(*args):
-        raise util.SignalInterrupt
+        raise error.SignalInterrupt
 
     for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
         num = getattr(signal, name, None)
@@ -74,7 +74,7 @@
                (inst.desc or inst.filename, inst.strerror))
     except error.RevlogError, inst:
         ui.warn(_("abort: %s!\n") % inst)
-    except util.SignalInterrupt:
+    except error.SignalInterrupt:
         ui.warn(_("killed!\n"))
     except KeyboardInterrupt:
         try: