diff -r f762860f82c6 -r 61c6b4178b9e mercurial/ui.py
--- a/mercurial/ui.py	Wed Jul 13 01:46:50 2005 -0800
+++ b/mercurial/ui.py	Wed Jul 13 01:48:03 2005 -0800
@@ -44,8 +44,8 @@
         return []
 
     def username(self):
-        return (self.config("ui", "username") or
-                os.environ.get("HGUSER") or
+        return (os.environ.get("HGUSER") or
+                self.config("ui", "username") or
                 os.environ.get("EMAIL") or
                 (os.environ.get("LOGNAME",
                                 os.environ.get("USERNAME", "unknown"))
@@ -93,8 +93,8 @@
         f.write(text)
         f.close()
 
-        editor = (self.config("ui", "editor") or
-                  os.environ.get("HGEDITOR") or
+        editor = (os.environ.get("HGEDITOR") or
+                  self.config("ui", "editor") or
                   os.environ.get("EDITOR", "vi"))
 
         os.environ["HGUSER"] = self.username()