[Updated] D8897: hgweb: remove some accesses to private member uimod._unset
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Aug 6 00:49:33 UTC 2020
Closed by commit rHGd12fba074cc6: hgweb: remove some accesses to private member uimod._unset (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8897?vs=22279&id=22295
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8897/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8897
AFFECTED FILES
mercurial/hgweb/hgweb_mod.py
mercurial/hgweb/hgwebdir_mod.py
CHANGE DETAILS
diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py
+++ b/mercurial/hgweb/hgwebdir_mod.py
@@ -537,8 +537,9 @@
return res.sendresponse()
def templater(self, req, nonce):
- def config(section, name, default=uimod._unset, untrusted=True):
- return self.ui.config(section, name, default, untrusted)
+ def config(*args, **kwargs):
+ kwargs.setdefault('untrusted', True)
+ return self.ui.config(*args, **kwargs)
vars = {}
styles, (style, mapfile) = hgweb_mod.getstyle(
diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -151,23 +151,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=uimod._unset, untrusted=True):
- return self.repo.ui.config(section, name, default, untrusted=untrusted)
+ def config(self, *args, **kwargs):
+ kwargs.setdefault('untrusted', True)
+ return self.repo.ui.config(*args, **kwargs)
- def configbool(self, section, name, default=uimod._unset, untrusted=True):
- return self.repo.ui.configbool(
- section, name, default, untrusted=untrusted
- )
+ def configbool(self, *args, **kwargs):
+ kwargs.setdefault('untrusted', True)
+ return self.repo.ui.configbool(*args, **kwargs)
- def configint(self, section, name, default=uimod._unset, untrusted=True):
- return self.repo.ui.configint(
- section, name, default, untrusted=untrusted
- )
+ def configint(self, *args, **kwargs):
+ kwargs.setdefault('untrusted', True)
+ return self.repo.ui.configint(*args, **kwargs)
- def configlist(self, section, name, default=uimod._unset, untrusted=True):
- return self.repo.ui.configlist(
- section, name, default, untrusted=untrusted
- )
+ def configlist(self, *args, **kwargs):
+ kwargs.setdefault('untrusted', True)
+ return self.repo.ui.configlist(*args, **kwargs)
def archivelist(self, nodeid):
return webutil.archivelist(self.repo.ui, nodeid)
To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200806/2a52a593/attachment-0002.html>
More information about the Mercurial-patches
mailing list