mercurial/fancyopts.py

--- a/mercurial/fancyopts.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/fancyopts.py	Thu Oct 08 12:55:45 2015 -0700
@@ -10,7 +10,7 @@
 import getopt
 
 from .i18n import _
-from . import util
+from . import error
 
 def gnugetopt(args, options, longoptions):
     """Parse options mostly like getopt.gnu_getopt.
@@ -114,7 +114,7 @@
             try:
                 state[name] = int(val)
             except ValueError:
-                raise util.Abort(_('invalid value %r for option %s, '
+                raise error.Abort(_('invalid value %r for option %s, '
                                    'expected int') % (val, opt))
         elif t is type(''):
             state[name] = val