# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1160084715 25200
# Node ID 10277edf7e5bd14d8754f342808c66df6a1ed46f
# Parent  36fa5db79dd5c96546c5cb23da6d9aebb6564316
hgweb: fix NWI parsing when hgwebdir isn't at /

diff -r 36fa5db79dd5 -r 10277edf7e5b mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Thu Oct 05 14:27:14 2006 -0700
+++ b/mercurial/hgweb/hgweb_mod.py	Thu Oct 05 14:45:15 2006 -0700
@@ -653,11 +653,11 @@
                 def firstitem(query):
                     return query.split('&', 1)[0].split(';', 1)[0]
 
-                base = ''
+                root = req.env.get('SCRIPT_NAME', '')
                 if req.env.has_key('REPO_NAME'):
                     base = '/' + req.env['REPO_NAME']
-                elif req.env.get('SCRIPT_NAME'):
-                    base = req.env['SCRIPT_NAME']
+                else:
+                    base = root
 
                 pi = req.env.get('PATH_INFO')
                 if pi:
@@ -681,7 +681,7 @@
                     base += '?'
                     query = firstitem(req.env['QUERY_STRING'])
 
-                return (base, query)
+                return (root + base, query)
 
             req.url, query = spliturl(req)