Mercurial > hg

diff mercurial/ui.py @ 21955:6dfb78f18bdb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: allow 'user' in .hgrc ui section (issue3169)
author anatoly techtonik <techtonik@gmail.com>
date Sat, 26 Jul 2014 09:27:11 +0300
parents 9336bc7dca8e
children 9fa429723f26
line wrap: on
line diff
--- a/mercurial/ui.py	Wed Jul 30 14:51:56 2014 -0500
+++ b/mercurial/ui.py	Sat Jul 26 09:27:11 2014 +0300
@@ -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: