comparison mercurial/hgweb/hgwebdir_mod.py @ 36805:ec46415ed826

hgweb: always use "?" when writing session vars This code resolves a string to insert in URLs as part of a query string. Essentially, it resolves the {sessionvars} template keyword, which is used by hgweb templates to build a URL as a string. The whole approach here feels wrong because there's no way of knowing when this code runs how the final URL will look. There could be additional URL fragments added before this template keyword that add a query string component. Furthermore, I don't think there's *any* for req.url to have a query string. That's because the code that populates this variable only takes SCRIPT_NAME and REPO_NAME into account. The "?" character it is searching for would only be added if some code attempted to add QUERY_STRING to the URL. Hacking the code up to raise if "?" is present in the URL yields a clean test suite run. I'm not sure if we broke this code or if it has always been broken. Anyway, this commit removes support for emitting "&" as the first character in {sessionvars} and makes it always emit "?", which is what it was always doing before AFAICT. Differential Revision: https://phab.mercurial-scm.org/D2733
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 08 Mar 2018 15:14:32 -0800
parents b9b968e21f78
children 1f7d9024674c
comparison
equal deleted inserted replaced
36804:b9b968e21f78 36805:ec46415ed826
507 styles, (style, mapfile) = hgweb_mod.getstyle(wsgireq, config, 507 styles, (style, mapfile) = hgweb_mod.getstyle(wsgireq, config,
508 self.templatepath) 508 self.templatepath)
509 if style == styles[0]: 509 if style == styles[0]:
510 vars['style'] = style 510 vars['style'] = style
511 511
512 start = r'&' if url[-1] == r'?' else r'?' 512 sessionvars = webutil.sessionvars(vars, r'?')
513 sessionvars = webutil.sessionvars(vars, start)
514 logourl = config('web', 'logourl') 513 logourl = config('web', 'logourl')
515 logoimg = config('web', 'logoimg') 514 logoimg = config('web', 'logoimg')
516 staticurl = config('web', 'staticurl') or url + 'static/' 515 staticurl = config('web', 'staticurl') or url + 'static/'
517 if not staticurl.endswith('/'): 516 if not staticurl.endswith('/'):
518 staticurl += '/' 517 staticurl += '/'