This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2661

hgweb: fix up trailing slash detection on Python 3
ClosedPublic

Authored by durin42 on Mar 4 2018, 1:12 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG250f3168d907: hgweb: fix up trailing slash detection on Python 3
Summary

Fixes a couple of hgweb tests.

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.Mar 4 2018, 1:12 PM
indygreg accepted this revision.Mar 4 2018, 2:13 PM
This revision is now accepted and ready to land.Mar 4 2018, 2:13 PM
Closed by commit rHG250f3168d907: hgweb: fix up trailing slash detection on Python 3 (authored by durin42). · Explain WhyMar 4 2018, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6589

contrib/python3-whitelist

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-hghave.t test-hghave.t
test-hgignore.t test-hgignore.t
test-hgk.t test-hgk.t
test-hgweb-bundle.t
test-hgweb-descend-empties.t
test-hgweb-removed.t test-hgweb-removed.t
test-histedit-arguments.t test-histedit-arguments.t
test-histedit-base.t test-histedit-base.t
test-histedit-bookmark-motion.t test-histedit-bookmark-motion.t
test-histedit-commute.t test-histedit-commute.t
test-histedit-drop.t test-histedit-drop.t
test-histedit-edit.t test-histedit-edit.t
test-histedit-fold-non-commute.t test-histedit-fold-non-commute.t

mercurial/hgweb/webcommands.py

path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0]) path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
mf = ctx.manifest() mf = ctx.manifest()
node = ctx.node() node = ctx.node()
files = {} files = {}
dirs = {} dirs = {}
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
if path and path[-1] != "/": if path and path[-1:] != "/":
path += "/" path += "/"
l = len(path) l = len(path)
abspath = "/" + path abspath = "/" + path
for full, n in mf.iteritems(): for full, n in mf.iteritems():
# the virtual path (working copy path) used for the full # the virtual path (working copy path) used for the full
# (repository) path # (repository) path
f = decodepath(full) f = decodepath(full)

mercurial/hgweb/webutil.py

pycompat, pycompat,
templatefilters, templatefilters,
templatekw, templatekw,
ui as uimod, ui as uimod,
util, util,
) )
def up(p): def up(p):
if p[0] != "/": if p[0:1] != "/":
p = "/" + p p = "/" + p
if p[-1] == "/": if p[-1:] == "/":
p = p[:-1] p = p[:-1]
up = os.path.dirname(p) up = os.path.dirname(p)
if up == "/": if up == "/":
return "/" return "/"
return up + "/" return up + "/"
def _navseq(step, firststep=None): def _navseq(step, firststep=None):
if firststep: if firststep: