Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
narrow: fix for getting the username when running http server
authorSandu Turcan <idlsoft@gmail.com>
Tue, 13 Feb 2018 14:39:02 -0500
changeset 36162 4224f26c0d35
parent 36161 48797b21882e
child 36163 068f520754ca
narrow: fix for getting the username when running http server Differential Revision: https://phab.mercurial-scm.org/D2231
hgext/narrow/narrowbundle2.py file | annotate | diff | comparison | revisions 
--- a/hgext/narrow/narrowbundle2.py	Mon Feb 12 16:22:31 2018 -0800
+++ b/hgext/narrow/narrowbundle2.py	Tue Feb 13 14:39:02 2018 -0500
@@ -327,13 +327,14 @@
             part.addparam('treemanifest', '1')
 
 def applyacl_narrow(repo, kwargs):
-    username = repo.ui.shortuser(repo.ui.username())
-    user_includes = repo.ui.configlist(
+    ui = repo.ui
+    username = ui.shortuser(ui.environ.get('REMOTE_USER') or ui.username())
+    user_includes = ui.configlist(
         _NARROWACL_SECTION, username + '.includes',
-        repo.ui.configlist(_NARROWACL_SECTION, 'default.includes'))
-    user_excludes = repo.ui.configlist(
+        ui.configlist(_NARROWACL_SECTION, 'default.includes'))
+    user_excludes = ui.configlist(
         _NARROWACL_SECTION, username + '.excludes',
-        repo.ui.configlist(_NARROWACL_SECTION, 'default.excludes'))
+        ui.configlist(_NARROWACL_SECTION, 'default.excludes'))
     if not user_includes:
         raise error.Abort(_("{} configuration for user {} is empty")
                           .format(_NARROWACL_SECTION, username))
mercurial