# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1520550872 28800
# Node ID ec46415ed826ba23872d2dae8f1710cf1d30ea35
# Parent  b9b968e21f78dc82326f3e61816fcfd1511abef4
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

diff -r b9b968e21f78 -r ec46415ed826 mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Thu Mar 08 15:15:59 2018 -0800
+++ b/mercurial/hgweb/hgweb_mod.py	Thu Mar 08 15:14:32 2018 -0800
@@ -177,8 +177,7 @@
         if style == styles[0]:
             vars['style'] = style
 
-        start = '&' if wsgireq.url[-1] == r'?' else '?'
-        sessionvars = webutil.sessionvars(vars, start)
+        sessionvars = webutil.sessionvars(vars, '?')
 
         if not self.reponame:
             self.reponame = (self.config('web', 'name', '')
diff -r b9b968e21f78 -r ec46415ed826 mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Thu Mar 08 15:15:59 2018 -0800
+++ b/mercurial/hgweb/hgwebdir_mod.py	Thu Mar 08 15:14:32 2018 -0800
@@ -509,8 +509,7 @@
         if style == styles[0]:
             vars['style'] = style
 
-        start = r'&' if url[-1] == r'?' else r'?'
-        sessionvars = webutil.sessionvars(vars, start)
+        sessionvars = webutil.sessionvars(vars, r'?')
         logourl = config('web', 'logourl')
         logoimg = config('web', 'logoimg')
         staticurl = config('web', 'staticurl') or url + 'static/'