Patchwork [2,of,3] ui: do not use alternate in ui.config

login
register
mail settings
Submitter David Demelier
Date June 27, 2017, 6:17 p.m.
Message ID <9eab1b51385ab89e3fdd.1498587421@kiwi.home>
Download mbox | patch
Permalink /patch/21785/
State Accepted
Headers show

Comments

David Demelier - June 27, 2017, 6:17 p.m.
# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1497954172 -7200
#      Tue Jun 20 12:22:52 2017 +0200
# Node ID 9eab1b51385ab89e3fdd304ce3da68db4959a48e
# Parent  e79846f1dbf02981993aa524df33a40722c98b72
ui: do not use alternate in ui.config

Patch

diff -r e79846f1dbf0 -r 9eab1b51385a mercurial/ui.py
--- a/mercurial/ui.py	Tue Jun 20 12:21:50 2017 +0200
+++ b/mercurial/ui.py	Tue Jun 20 12:22:52 2017 +0200
@@ -742,7 +742,7 @@ 
         """
         user = encoding.environ.get("HGUSER")
         if user is None:
-            user = self.config("ui", ["username", "user"])
+            user = self.config("ui", "username")
             if user is not None:
                 user = os.path.expandvars(user)
         if user is None: