error: move SignalInterrupt

now derived from KeyboardInterrupt to simplify catches

mercurial/dispatch.py

@@ -26,7 +26,7 b' def dispatch(args):'
 
 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 b' def _runcatch(ui, args):'
                (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:

mercurial/error.py

@@ -56,3 +56,6 b' class UnknownCommand(Exception):'
 class AmbiguousCommand(Exception):
     """Exception raised if command shortcut matches more than one command."""
 
+# derived from KeyboardInterrupt to simplify some breakout code
+class SignalInterrupt(KeyboardInterrupt):
+    """Exception raised on SIGTERM and SIGHUP."""

mercurial/extensions.py

@@ -75,7 +75,7 b' def loadall(ui):'
             path = os.path.expanduser(path)
         try:
             load(ui, name, path)
-        except (util.SignalInterrupt, KeyboardInterrupt):
+        except KeyboardInterrupt:
             raise
         except Exception, inst:
             if path:

mercurial/hook.py

@@ -49,7 +49,7 b' def _pythonhook(ui, repo, name, hname, f'
                              (hname, funcname))
     try:
         r = obj(ui=ui, repo=repo, hooktype=name, **args)
-    except (KeyboardInterrupt, util.SignalInterrupt):
+    except KeyboardInterrupt:
         raise
     except Exception, exc:
         if isinstance(exc, util.Abort):

mercurial/localrepo.py

@@ -412,7 +412,7 b' class localrepository(repo.repository):'
                 if not l: continue
                 node, label = l.split(" ", 1)
                 partial[label.strip()] = bin(node)
-        except (KeyboardInterrupt, util.SignalInterrupt):
+        except KeyboardInterrupt:
             raise
         except Exception, inst:
             if self.ui.debugflag:

mercurial/util.py

@@ -185,9 +185,6 b' extendeddateformats = defaultdateformats'
     "%b %Y",
     )
 
-class SignalInterrupt(Exception):
-    """Exception raised on SIGTERM and SIGHUP."""
-
 # differences from SafeConfigParser:
 # - case-sensitive keys
 # - allows values that are not strings (this means that you may not