error: move SignatureError

mercurial/dispatch.py

@@ -371,7 +371,7 b' def _runcommand(ui, options, cmd, cmdfun'
     def checkargs():
         try:
             return cmdfunc()
-        except util.SignatureError:
+        except error.SignatureError:
             raise error.ParseError(cmd, _("invalid arguments"))
 
     if options['profile']:

mercurial/error.py

@@ -59,3 +59,6 b' class AmbiguousCommand(Exception):'
 # derived from KeyboardInterrupt to simplify some breakout code
 class SignalInterrupt(KeyboardInterrupt):
     """Exception raised on SIGTERM and SIGHUP."""
+
+class SignatureError(Exception):
+    pass

mercurial/util.py

@@ -13,7 +13,7 b' platform-specific details from the core.'
 """
 
 from i18n import _
-import cStringIO, errno, getpass, re, shutil, sys, tempfile, traceback
+import cStringIO, errno, getpass, re, shutil, sys, tempfile, traceback, error
 import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil
 import imp
 
@@ -707,9 +707,6 b' def system(cmd, environ={}, cwd=None, on'
         if cwd is not None and oldcwd != cwd:
             os.chdir(oldcwd)
 
-class SignatureError(Exception):
-    pass
-
 def checksignature(func):
     '''wrap a function with code to check for calling errors'''
     def check(*args, **kwargs):
@@ -717,7 +714,7 b' def checksignature(func):'
             return func(*args, **kwargs)
         except TypeError:
             if len(traceback.extract_tb(sys.exc_info()[2])) == 1:
-                raise SignatureError
+                raise error.SignatureError
             raise
 
     return check