--- a/mercurial/util.py	Wed Jul 19 07:56:40 2006 -0700
+++ b/mercurial/util.py	Mon Jul 24 09:11:26 2006 -0700
@@ -12,7 +12,7 @@
 
 from i18n import gettext as _
 from demandload import *
-demandload(globals(), "cStringIO errno popen2 re shutil sys tempfile")
+demandload(globals(), "cStringIO errno getpass popen2 re shutil sys tempfile")
 demandload(globals(), "os threading time")
 
 # used by parsedate
@@ -510,6 +510,17 @@
     except AttributeError:
         return os.name == 'nt' and 'command' in os.environ.get('comspec', '')
 
+getuser_fallback = None
+
+def getuser():
+    '''return name of current user'''
+    try:
+        return getpass.getuser()
+    except ImportError:
+        return getuser_fallback and getuser_fallback()
+    raise util.Abort(_('user name not available - set USERNAME '
+                       'environment variable'))
+
 # Platform specific variants
 if os.name == 'nt':
     demandload(globals(), "msvcrt")