##// END OF EJS Templates
hgweb: use ui._unset to prevent a warning in configitems
David Demelier -
r33328:c8f212cb default
parent child Browse files
Show More
@@ -119,19 +119,19 b' class requestcontext(object):'
119 self.csp, self.nonce = cspvalues(self.repo.ui)
119 self.csp, self.nonce = cspvalues(self.repo.ui)
120
120
121 # Trust the settings from the .hg/hgrc files by default.
121 # Trust the settings from the .hg/hgrc files by default.
122 def config(self, section, name, default=None, untrusted=True):
122 def config(self, section, name, default=uimod._unset, untrusted=True):
123 return self.repo.ui.config(section, name, default,
123 return self.repo.ui.config(section, name, default,
124 untrusted=untrusted)
124 untrusted=untrusted)
125
125
126 def configbool(self, section, name, default=False, untrusted=True):
126 def configbool(self, section, name, default=uimod._unset, untrusted=True):
127 return self.repo.ui.configbool(section, name, default,
127 return self.repo.ui.configbool(section, name, default,
128 untrusted=untrusted)
128 untrusted=untrusted)
129
129
130 def configint(self, section, name, default=None, untrusted=True):
130 def configint(self, section, name, default=uimod._unset, untrusted=True):
131 return self.repo.ui.configint(section, name, default,
131 return self.repo.ui.configint(section, name, default,
132 untrusted=untrusted)
132 untrusted=untrusted)
133
133
134 def configlist(self, section, name, default=None, untrusted=True):
134 def configlist(self, section, name, default=uimod._unset, untrusted=True):
135 return self.repo.ui.configlist(section, name, default,
135 return self.repo.ui.configlist(section, name, default,
136 untrusted=untrusted)
136 untrusted=untrusted)
137
137
@@ -404,7 +404,7 b' class hgwebdir(object):'
404 except Exception as e:
404 except Exception as e:
405 u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e))
405 u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e))
406 continue
406 continue
407 def get(section, name, default=None):
407 def get(section, name, default=uimod._unset):
408 return u.config(section, name, default, untrusted=True)
408 return u.config(section, name, default, untrusted=True)
409
409
410 if u.configbool("web", "hidden", untrusted=True):
410 if u.configbool("web", "hidden", untrusted=True):
General Comments 0
You need to be logged in to leave comments. Login now