This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8897

hgweb: remove some accesses to private member uimod._unset
ClosedPublic

Authored by martinvonz on Aug 5 2020, 6:05 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd12fba074cc6: hgweb: remove some accesses to private member uimod._unset

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 22295

mercurial/hgweb/hgweb_mod.py

# if it is updated. Since this is a reference and nothing should # if it is updated. Since this is a reference and nothing should
# modify the underlying object, it should be constant for the lifetime # modify the underlying object, it should be constant for the lifetime
# of the request. # of the request.
self.websubtable = app.websubtable self.websubtable = app.websubtable
self.csp, self.nonce = cspvalues(self.repo.ui) self.csp, self.nonce = cspvalues(self.repo.ui)
# Trust the settings from the .hg/hgrc files by default. # Trust the settings from the .hg/hgrc files by default.
def config(self, section, name, default=uimod._unset, untrusted=True): def config(self, *args, **kwargs):
return self.repo.ui.config(section, name, default, untrusted=untrusted) 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( def configbool(self, *args, **kwargs):
section, name, default, untrusted=untrusted kwargs.setdefault('untrusted', True)
) return self.repo.ui.configbool(*args, **kwargs)
def configint(self, section, name, default=uimod._unset, untrusted=True): def configint(self, *args, **kwargs):
return self.repo.ui.configint( kwargs.setdefault('untrusted', True)
section, name, default, untrusted=untrusted return self.repo.ui.configint(*args, **kwargs)
)
def configlist(self, *args, **kwargs):
def configlist(self, section, name, default=uimod._unset, untrusted=True): kwargs.setdefault('untrusted', True)
return self.repo.ui.configlist( return self.repo.ui.configlist(*args, **kwargs)
section, name, default, untrusted=untrusted
)
def archivelist(self, nodeid): def archivelist(self, nodeid):
return webutil.archivelist(self.repo.ui, nodeid) return webutil.archivelist(self.repo.ui, nodeid)
def templater(self, req): def templater(self, req):
# determine scheme, port and server name # determine scheme, port and server name
# this is needed to create absolute urls # this is needed to create absolute urls
logourl = self.config(b'web', b'logourl') logourl = self.config(b'web', b'logourl')

mercurial/hgweb/hgwebdir_mod.py

b'sortcolumn': sortcolumn, b'sortcolumn': sortcolumn,
b'descending': descending, b'descending': descending,
} }
mapping.update(sort) mapping.update(sort)
res.setbodygen(tmpl.generate(b'index', mapping)) res.setbodygen(tmpl.generate(b'index', mapping))
return res.sendresponse() return res.sendresponse()
def templater(self, req, nonce): def templater(self, req, nonce):
def config(section, name, default=uimod._unset, untrusted=True): def config(*args, **kwargs):
return self.ui.config(section, name, default, untrusted) kwargs.setdefault('untrusted', True)
return self.ui.config(*args, **kwargs)
vars = {} vars = {}
styles, (style, mapfile) = hgweb_mod.getstyle( styles, (style, mapfile) = hgweb_mod.getstyle(
req, config, self.templatepath req, config, self.templatepath
) )
if style == styles[0]: if style == styles[0]:
vars[b'style'] = style vars[b'style'] = style