diff -r 31047b6f7ec1 -r 78a0dd93db0b mercurial/ui.py
--- a/mercurial/ui.py	Sun Jan 14 19:10:35 2007 +0100
+++ b/mercurial/ui.py	Wed Jan 24 23:04:51 2007 +0100
@@ -345,12 +345,14 @@
             user = self.config("ui", "username")
         if user is None:
             user = os.environ.get("EMAIL")
-        if not user:
+        if user is None:
             try:
                 user = '%s@%s' % (util.getuser(), socket.getfqdn())
+                self.warn(_("No username found, using '%s' instead\n") % user)
             except KeyError:
-                raise util.Abort(_("Please specify a username."))
-            self.warn(_("No username found, using '%s' instead\n") % user)
+                pass
+        if not user:
+            raise util.Abort(_("Please specify a username."))
         return user
 
     def shortuser(self, user):