| durin42 |
| hg-reviewers |
This is how the hgweb WSGI application does it. Let's make the
behavior consistent.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgwebdir_mod.py (6 lines) |
| if self.motd is not None: | if self.motd is not None: | ||||
| yield self.motd | yield self.motd | ||||
| else: | else: | ||||
| yield config('web', 'motd') | yield config('web', 'motd') | ||||
| def config(section, name, default=uimod._unset, untrusted=True): | def config(section, name, default=uimod._unset, untrusted=True): | ||||
| return self.ui.config(section, name, default, untrusted) | return self.ui.config(section, name, default, untrusted) | ||||
| url = wsgireq.env.get('SCRIPT_NAME', '') | |||||
| if not url.endswith('/'): | |||||
| url += '/' | |||||
| vars = {} | vars = {} | ||||
| styles, (style, mapfile) = hgweb_mod.getstyle(wsgireq.req, config, | styles, (style, mapfile) = hgweb_mod.getstyle(wsgireq.req, config, | ||||
| self.templatepath) | self.templatepath) | ||||
| if style == styles[0]: | if style == styles[0]: | ||||
| vars['style'] = style | vars['style'] = style | ||||
| sessionvars = webutil.sessionvars(vars, r'?') | sessionvars = webutil.sessionvars(vars, r'?') | ||||
| logourl = config('web', 'logourl') | logourl = config('web', 'logourl') | ||||
| logoimg = config('web', 'logoimg') | logoimg = config('web', 'logoimg') | ||||
| staticurl = (config('web', 'staticurl') | staticurl = (config('web', 'staticurl') | ||||
| or wsgireq.req.apppath + '/static/') | or wsgireq.req.apppath + '/static/') | ||||
| if not staticurl.endswith('/'): | if not staticurl.endswith('/'): | ||||
| staticurl += '/' | staticurl += '/' | ||||
| defaults = { | defaults = { | ||||
| "encoding": encoding.encoding, | "encoding": encoding.encoding, | ||||
| "motd": motd, | "motd": motd, | ||||
| "url": url, | "url": wsgireq.req.apppath + '/', | ||||
| "logourl": logourl, | "logourl": logourl, | ||||
| "logoimg": logoimg, | "logoimg": logoimg, | ||||
| "staticurl": staticurl, | "staticurl": staticurl, | ||||
| "sessionvars": sessionvars, | "sessionvars": sessionvars, | ||||
| "style": style, | "style": style, | ||||
| "nonce": nonce, | "nonce": nonce, | ||||
| } | } | ||||
| tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) | tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) | ||||
| return tmpl | return tmpl | ||||