# HG changeset patch # User Matt Mackall # Date 2009-04-03 19:52:03 # Node ID 443c0c8636acc4d7bc923e920002e054ff6bc9ef # Parent de377b1a9a84ffefd9b6f2b12644e36832a64fed windows: get Abort from error diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -8,9 +8,8 @@ the GNU General Public License version 2 reference. """ -import util from i18n import _ -import errno, msvcrt, os, osutil, re, sys +import errno, msvcrt, os, osutil, re, sys, error nulldev = 'NUL:' umask = 002 @@ -228,7 +227,7 @@ def statfiles(files): def getuser(): '''return name of current user''' - raise util.Abort(_('user name not available - set USERNAME ' + raise error.Abort(_('user name not available - set USERNAME ' 'environment variable')) def username(uid=None):