Mercurial > hg > compact-paper

changeset 36713:250f3168d907 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix up trailing slash detection on Python 3 Fixes a couple of hgweb tests. Differential Revision: https://phab.mercurial-scm.org/D2661
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 13:04:12 -0500
parents 2442927cdd96
children 613954a17a25
files contrib/python3-whitelist mercurial/hgweb/webcommands.py mercurial/hgweb/webutil.py
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/python3-whitelist	Sun Mar 04 13:03:22 2018 -0500
+++ b/contrib/python3-whitelist	Sun Mar 04 13:04:12 2018 -0500
@@ -130,6 +130,8 @@
 test-hghave.t
 test-hgignore.t
 test-hgk.t
+test-hgweb-bundle.t
+test-hgweb-descend-empties.t
 test-hgweb-removed.t
 test-histedit-arguments.t
 test-histedit-base.t
--- a/mercurial/hgweb/webcommands.py	Sun Mar 04 13:03:22 2018 -0500
+++ b/mercurial/hgweb/webcommands.py	Sun Mar 04 13:04:12 2018 -0500
@@ -495,7 +495,7 @@
     dirs = {}
     parity = paritygen(web.stripecount)
 
-    if path and path[-1] != "/":
+    if path and path[-1:] != "/":
         path += "/"
     l = len(path)
     abspath = "/" + path
--- a/mercurial/hgweb/webutil.py	Sun Mar 04 13:03:22 2018 -0500
+++ b/mercurial/hgweb/webutil.py	Sun Mar 04 13:04:12 2018 -0500
@@ -38,9 +38,9 @@
 )
 
 def up(p):
-    if p[0] != "/":
+    if p[0:1] != "/":
         p = "/" + p
-    if p[-1] == "/":
+    if p[-1:] == "/":
         p = p[:-1]
     up = os.path.dirname(p)
     if up == "/":