--- a/mercurial/ui.py	Sun Oct 22 21:47:37 2006 -0300
+++ b/mercurial/ui.py	Mon Oct 23 14:56:51 2006 +0200
@@ -235,8 +235,13 @@
             user = self.config("ui", "username")
         if user is None:
             user = os.environ.get("EMAIL")
-        if user is None:
-            raise util.Abort(_("No default username available, use -u"))
+        if not user:
+            self.status(_("Please choose a commit username to be recorded "
+                          "in the changelog via\ncommand line option "
+                          '(-u "First Last <email@example.com>"), in the\n'
+                          "configuration files (hgrc), or by setting the "
+                          "EMAIL environment variable.\n\n"))
+            raise util.Abort(_("No commit username specified!"))
         return user
 
     def shortuser(self, user):