[PATCH 2 of 2 v2] hgweb: forward arguments to ui.config

[David Demelier]

# HG changeset patch
# User David Demelier <demelier.da...@gmail.com>
# Date 1498646251 -7200
#      Wed Jun 28 12:37:31 2017 +0200
# Node ID ff76472b66ad8b74887674887654bdffabe41b78
# Parent  9a80ff1ee41ce0c87cf1f7f5219b6337f3c04941
hgweb: forward arguments to ui.config

diff -r 9a80ff1ee41c -r ff76472b66ad mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py      Wed Jun 28 12:44:36 2017 +0200
+++ b/mercurial/hgweb/hgweb_mod.py      Wed Jun 28 12:37:31 2017 +0200
@@ -119,21 +119,21 @@
         self.csp, self.nonce = cspvalues(self.repo.ui)
 
     # Trust the settings from the .hg/hgrc files by default.
-    def config(self, section, name, default=None, untrusted=True):
-        return self.repo.ui.config(section, name, default,
-                                   untrusted=untrusted)
+    def config(self, *args, **kwargs):
+        kwargs['untrusted'] = True
+        return self.repo.ui.config(*args, **kwargs)
 
-    def configbool(self, section, name, default=False, untrusted=True):
-        return self.repo.ui.configbool(section, name, default,
-                                       untrusted=untrusted)
+    def configbool(self, *args, **kwargs):
+        kwargs['untrusted'] = True
+        return self.repo.ui.configbool(*args, **kwargs)
 
-    def configint(self, section, name, default=None, untrusted=True):
-        return self.repo.ui.configint(section, name, default,
-                                      untrusted=untrusted)
+    def configint(self, *args, **kwargs):
+        kwargs['untrusted'] = True
+        return self.repo.ui.configint(*args, **kwargs)
 
-    def configlist(self, section, name, default=None, untrusted=True):
-        return self.repo.ui.configlist(section, name, default,
-                                       untrusted=untrusted)
+    def configlist(self, *args, **kwargs):
+        kwargs['untrusted'] = True
+        return self.repo.ui.configlist(*args, **kwargs)
 
     def archivelist(self, nodeid):
         allowed = self.configlist('web', 'allow_archive')
diff -r 9a80ff1ee41c -r ff76472b66ad mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py   Wed Jun 28 12:44:36 2017 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py   Wed Jun 28 12:37:31 2017 +0200
@@ -404,9 +404,9 @@
                 except Exception as e:
                     u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e))
                     continue
-                def get(section, name, default=None):
-                    return u.config(section, name, default, untrusted=True)
-
+                def get(*args, **kwargs):
+                    kwargs['untrusted'] = True
+                    return u.config(*args, **kwargs)
                 if u.configbool("web", "hidden", untrusted=True):
                     continue
 
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel