comparison mercurial/hgweb/hgweb_mod.py @ 3327:e6353b7b102a

NWI base URL detection fixes

3324:34f08b8883cf

            def spliturl(req):
                def firstitem(query):
                    return query.split('&', 1)[0].split(';', 1)[0]

                root = req.env.get('REQUEST_URI', '').split('?', 1)[0]
                pi = req.env.get('PATH_INFO', '')
                if pi:
                    root = root[:-len(pi)]
                
                if req.env.has_key('REPO_NAME'):
                    base = '/' + req.env['REPO_NAME']
                else:
                    base = root

                if pi:
                    while pi.startswith('//'):
                        pi = pi[1:]
                    if pi.startswith(base):
                        if len(pi) > len(base):
                            base += '/'
                            query = pi[len(base):]
                        else:
                            if req.env.has_key('REPO_NAME'):
                                # We are using hgwebdir
                                base += '/'
                            else:
                                base += '?'
                            query = firstitem(req.env['QUERY_STRING'])
                    else:
                        base += '/'
                        query = pi[1:]
                else:
                    base += '?'
                    query = firstitem(req.env['QUERY_STRING'])

                return (root + base, query)

            req.url, query = spliturl(req)

            if req.form.has_key('cmd'):
                # old style

3327:e6353b7b102a

            def spliturl(req):
                def firstitem(query):
                    return query.split('&', 1)[0].split(';', 1)[0]

                def normurl(url):
                    inner = '/'.join([x for x in url.split('/') if x])
                    tl = len(url) > 1 and url.endswith('/') and '/' or ''

                    return '%s%s%s' % (url.startswith('/') and '/' or '',
                                       inner, tl)

                root = normurl(req.env.get('REQUEST_URI', '').split('?', 1)[0])
                pi = normurl(req.env.get('PATH_INFO', ''))
                if pi:
                    # strip leading /
                    pi = pi[1:]
                    if pi:
                        root = root[:-len(pi)]
                    if req.env.has_key('REPO_NAME'):
                        rn = req.env['REPO_NAME'] + '/'
                        root += rn
                        query = pi[len(rn):]
                    else:
                        query = pi
                else:
                    root += '?'
                    query = firstitem(req.env['QUERY_STRING'])

                return (root, query)

            req.url, query = spliturl(req)

            if req.form.has_key('cmd'):
                # old style