This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3367

hgwebdir: un-bytes the env dict before re-parsing env
ClosedPublic

Authored by durin42 on Apr 14 2018, 1:13 AM.

Details

Reviewers
yuja
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa728e3695325: hgwebdir: un-bytes the env dict before re-parsing env
Summary

Not the most elegant, but it restores
test-subrepo-deep-nested-change.t to passing on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Apr 14 2018, 1:13 AM
yuja requested changes to this revision.Apr 14 2018, 7:45 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/hgweb/hgwebdir_mod.py
425

Maybe needs if ispy3 ?

This revision now requires changes to proceed.Apr 14 2018, 7:45 AM
durin42 updated this revision to Diff 8275.Apr 14 2018, 10:41 AM
durin42 updated this revision to Diff 8277.Apr 14 2018, 11:09 AM
Closed by commit rHGa728e3695325: hgwebdir: un-bytes the env dict before re-parsing env (authored by durin42). · Explain WhyApr 16 2018, 9:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8306

contrib/python3-whitelist

test-fileset-generated.t test-fileset-generated.t
test-flags.t test-flags.t
test-generaldelta.t test-generaldelta.t
test-getbundle.t test-getbundle.t
test-git-export.t test-git-export.t
test-glog-topological.t test-glog-topological.t
test-gpg.t test-gpg.t
test-graft.t test-graft.t
test-hg-parseurl.py
test-hghave.t test-hghave.t
test-hgignore.t test-hgignore.t
test-hgk.t test-hgk.t
test-hgweb-bundle.t test-hgweb-bundle.t
test-hgweb-descend-empties.t test-hgweb-descend-empties.t
test-hgweb-empty.t test-hgweb-empty.t
test-hgweb-removed.t test-hgweb-removed.t
test-histedit-arguments.t test-histedit-arguments.t

mercurial/hgweb/hgwebdir_mod.py

yield '' yield ''
for virtualrepo in _virtualdirs(): for virtualrepo in _virtualdirs():
real = repos.get(virtualrepo) real = repos.get(virtualrepo)
if real: if real:
# Re-parse the WSGI environment to take into account our # Re-parse the WSGI environment to take into account our
# repository path component. # repository path component.
uenv = req.rawenv
yujaUnsubmitted
Not Done

Maybe needs if ispy3 ?

yuja: Maybe needs `if ispy3` ?
if pycompat.ispy3:
uenv = {k.decode('latin1'): v for k, v in
uenv.iteritems()}
req = requestmod.parserequestfromenv( req = requestmod.parserequestfromenv(
req.rawenv, reponame=virtualrepo, uenv, reponame=virtualrepo,
altbaseurl=self.ui.config('web', 'baseurl')) altbaseurl=self.ui.config('web', 'baseurl'))
try: try:
# ensure caller gets private copy of ui # ensure caller gets private copy of ui
repo = hg.repository(self.ui.copy(), real) repo = hg.repository(self.ui.copy(), real)
return hgweb_mod.hgweb(repo).run_wsgi(req, res) return hgweb_mod.hgweb(repo).run_wsgi(req, res)
except IOError as inst: except IOError as inst:
msg = encoding.strtolocal(inst.strerror) msg = encoding.strtolocal(inst.strerror)
raise ErrorResponse(HTTP_SERVER_ERROR, msg) raise ErrorResponse(HTTP_SERVER_ERROR, msg)