Mercurial > hg

diff mercurial/ui.py @ 21976:3467cf39aae6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Aug 2014 18:32:52 -0500
parents 6dfb78f18bdb
children 9fa429723f26
line wrap: on
line diff
--- a/mercurial/ui.py	Fri Jul 18 19:46:56 2014 -0400
+++ b/mercurial/ui.py	Fri Aug 01 18:32:52 2014 -0500
@@ -437,7 +437,7 @@
         """
         user = os.environ.get("HGUSER")
         if user is None:
-            user = self.config("ui", "username")
+            user = self.config("ui", ["username", "user"])
             if user is not None:
                 user = os.path.expandvars(user)
         if user is None: