# HG changeset patch # User Martin Geisler # Date 2009-04-02 16:04:42 # Node ID ec4784bb7d756f0c862f2669ce9a6860544a3ced # Parent 5325596c354c344b70f1175175c2736c605721d4 windows: break import cycle with util diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -8,7 +8,7 @@ the GNU General Public License version 2 reference. """ -from util import Abort +import util from i18n import _ import errno, msvcrt, os, osutil, re, sys nulldev = 'NUL:' @@ -228,8 +228,8 @@ def statfiles(files): def getuser(): '''return name of current user''' - raise Abort(_('user name not available - set USERNAME ' - 'environment variable')) + raise util.Abort(_('user name not available - set USERNAME ' + 'environment variable')) def username(uid=None): """Return the name of the user with the given uid.