Mercurial > hg
changeset 36864:4e06e8336634
hgweb: set variables in qsparams
We currently mutate wsgireq.form in a few places. Since it is
independent from req.qsparams, we will need to make changes on
req.qsparams as well before consumers can use qsparams. So let's
do that.
Eventually, we'll delete wsgireq.form and all references to it.
Differential Revision: https://phab.mercurial-scm.org/D2780
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 10 Mar 2018 12:11:26 -0800 |
| parents | 1a1972b1a1ff |
| children | 3d60a22e27f5 |
| files | mercurial/hgweb/hgweb_mod.py |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Sat Mar 10 11:46:52 2018 -0800 +++ b/mercurial/hgweb/hgweb_mod.py Sat Mar 10 12:11:26 2018 -0800 @@ -342,15 +342,22 @@ # avoid accepting e.g. style parameter as command if util.safehasattr(webcommands, cmd): wsgireq.form['cmd'] = [cmd] + req.qsparams['cmd'] = cmd if cmd == 'static': wsgireq.form['file'] = ['/'.join(args)] + req.qsparams['file'] = '/'.join(args) else: if args and args[0]: node = args.pop(0).replace('%2F', '/') wsgireq.form['node'] = [node] + req.qsparams['node'] = node if args: wsgireq.form['file'] = args + if 'file' in req.qsparams: + del req.qsparams['file'] + for a in args: + req.qsparams.add('file', a) ua = req.headers.get('User-Agent', '') if cmd == 'rev' and 'mercurial' in ua: @@ -362,7 +369,9 @@ ext = spec[2] if fn.endswith(ext): wsgireq.form['node'] = [fn[:-len(ext)]] + req.qsparams['node'] = fn[:-len(next)] wsgireq.form['type'] = [type_] + req.qsparams['type'] = type_ else: cmd = wsgireq.form.get('cmd', [''])[0] @@ -379,6 +388,7 @@ if cmd == '': wsgireq.form['cmd'] = [tmpl.cache['default']] + req.qsparams['cmd'] = tmpl.cache['default'] cmd = wsgireq.form['cmd'][0] # Don't enable caching if using a CSP nonce because then it wouldn't