diff -r 02b6fa7bbfbf -r e6a41cbaa260 mercurial/ui.py
--- a/mercurial/ui.py	Wed Jul 19 07:56:40 2006 -0700
+++ b/mercurial/ui.py	Mon Jul 24 09:11:26 2006 -0700
@@ -197,7 +197,7 @@
             user = os.environ.get("EMAIL")
         if user is None:
             try:
-                user = '%s@%s' % (getpass.getuser(), socket.getfqdn())
+                user = '%s@%s' % (util.getuser(), socket.getfqdn())
             except KeyError:
                 raise util.Abort(_("Please specify a username."))
         return user