diff -r d51c658d3f04 -r 56b2bcea2529 hgext/win32mbcs.py --- a/hgext/win32mbcs.py Mon Oct 05 22:49:24 2015 -0700 +++ b/hgext/win32mbcs.py Thu Oct 08 12:55:45 2015 -0700 @@ -47,7 +47,7 @@ import os, sys from mercurial.i18n import _ -from mercurial import util, encoding +from mercurial import error, encoding # Note for extension authors: ONLY specify testedwith = 'internal' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or @@ -105,7 +105,7 @@ # return value. return enc(func(*dec(args), **dec(kwds))) except UnicodeError: - raise util.Abort(_("[win32mbcs] filename conversion failed with" + raise error.Abort(_("[win32mbcs] filename conversion failed with" " %s encoding\n") % (_encoding)) def wrapper(func, args, kwds):