branch | stable |
changeset 21955 | 6dfb78f18bdb |
parent 21195 | 9336bc7dca8e |
child 22205 | 9fa429723f26 |
--- 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: