Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: make code to join url path simpler stable
authorYuya Nishihara <yuya@tcha.org>
Thu, 11 Mar 2010 00:28:31 +0900
branchstable
changeset 10675 3c05ecffe20d
parent 10674 6d87c20cd7a8
child 10676 13341047d517
child 10689 3b3bf520b428
hgweb: make code to join url path simpler Now SCRIPT_NAME never contains http://host:port part, we don't need to care about '://'.
mercurial/hgweb/hgwebdir_mod.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hgweb/hgwebdir_mod.py	Thu Mar 11 00:28:27 2010 +0900
+++ b/mercurial/hgweb/hgwebdir_mod.py	Thu Mar 11 00:28:31 2010 +0900
@@ -229,9 +229,7 @@
                     parts.insert(0, req.env['PATH_INFO'].rstrip('/'))
                 if req.env['SCRIPT_NAME']:
                     parts.insert(0, req.env['SCRIPT_NAME'])
-                m = re.match('((?:https?://)?)(.*)', '/'.join(parts))
-                # squish repeated slashes out of the path component
-                url = m.group(1) + re.sub('/+', '/', m.group(2)) + '/'
+                url = re.sub(r'/+', '/', '/'.join(parts) + '/')
 
                 # update time with local timezone
                 try:
mercurial