# HG changeset patch # User David Demelier # Date 2017-07-03 11:04:35 # Node ID c8f212cb0c83c772bce452684ace17ec1724272d # Parent 68b7ceda99d736a45e2e484a620bcb44c39b9294 hgweb: use ui._unset to prevent a warning in configitems 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 @@ -119,19 +119,19 @@ class requestcontext(object): 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): + def config(self, section, name, default=uimod._unset, untrusted=True): return self.repo.ui.config(section, name, default, untrusted=untrusted) - def configbool(self, section, name, default=False, untrusted=True): + def configbool(self, section, name, default=uimod._unset, untrusted=True): return self.repo.ui.configbool(section, name, default, untrusted=untrusted) - def configint(self, section, name, default=None, untrusted=True): + def configint(self, section, name, default=uimod._unset, untrusted=True): return self.repo.ui.configint(section, name, default, untrusted=untrusted) - def configlist(self, section, name, default=None, untrusted=True): + def configlist(self, section, name, default=uimod._unset, untrusted=True): return self.repo.ui.configlist(section, name, default, untrusted=untrusted) 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 @@ -404,7 +404,7 @@ class hgwebdir(object): except Exception as e: u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) continue - def get(section, name, default=None): + def get(section, name, default=uimod._unset): return u.config(section, name, default, untrusted=True) if u.configbool("web", "hidden", untrusted=True):