diff mercurial/hgweb/request.py @ 36808:0031e972ded2

hgweb: use the parsed application path directly Previously, we assigned a custom system string with a trailing slash to wsgirequest.url. The addition of the trailing slash felt arbitrary and seems to go against how things typically work in WSGI. We also want our URLs to be bytes, not system strings. And, assigning a custom attribute to wsgirequest felt wrong. This commit fixes all those things by removing the trailing slash from the app path, changing consumers to use that variable and to use it without a trailing slash, and removing the custom attribute from wsgirequest. We preserve the trailing slash on {url}. Also, makebreadcrumb strips the trailing slash. So no change to it was needed. Differential Revision: https://phab.mercurial-scm.org/D2736
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 08 Mar 2018 15:08:20 -0800
parents 69b2d0900cd7
children 3c15b84ab66c
line wrap: on
line diff
--- a/mercurial/hgweb/request.py	Thu Mar 08 12:59:25 2018 -0800
+++ b/mercurial/hgweb/request.py	Thu Mar 08 15:08:20 2018 -0800
@@ -146,14 +146,13 @@
     # root. We also exclude its path components from PATH_INFO when resolving
     # the dispatch path.
 
-    # TODO the use of trailing slashes in apppath is arguably wrong. We need it
-    # to appease low-level parts of hgweb_mod for now.
     apppath = env['SCRIPT_NAME']
-    if not apppath.endswith('/'):
-        apppath += '/'
 
     if env.get('REPO_NAME'):
-        apppath += env.get('REPO_NAME') + '/'
+        if not apppath.endswith('/'):
+            apppath += '/'
+
+        apppath += env.get('REPO_NAME')
 
     if 'PATH_INFO' in env:
         dispatchparts = env['PATH_INFO'].strip('/').split('/')