| durin42 |
| hg-reviewers |
hgwebdir has a bit of code for constructing URLs. This reinvents wheels
from our parsedrequest instance. And sometimes the behavior varies
from what hgweb does. We'll want to converge that behavior.
This commit changes hgwebdir so its staticurl template keyword
is constructed the same way as hgweb's. There's probably room
to factor this into a shared function. But let's solve the
problem of divergence first.
| 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 (3 lines) |
| 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') or url + 'static/' | staticurl = (config('web', 'staticurl') | ||||
| 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": url, | ||||
| "logourl": logourl, | "logourl": logourl, | ||||