Mercurial > hg
view tests/test-non-interactive-wsgi @ 11109:a2bc2f2d77a9
subrepo: normalize path part of URLs so that pulling subrepos from webdir works
For a "all projects at root" repo layout eg:
/main
/sub
Where subrepos are used such that a clone of main has this layout:
./main/
./main/.hgsub
./main/sub/
And the .hgsub content is:
sub = ../sub
This allows a pull from a hgweb where main and sub are exposed
at the root (or same directory level)
The current code doesn't normalize the path component of a pull
url. this results in trying to pull from
http://server.com/hg/main/../sub
Current hgweb implementation doesn't reduce the path component
so this results in a 404 error though everything is setup logically.
This patch adresses this 404 error on the puller side
normalizing the URLs used for pulling sub repos. For this
example, the URL would be reduced to http://server.com/hg/sub
Fix + test
author | Edouard Gomez <ed.gomez@free.fr> |
---|---|
date | Sat, 01 May 2010 23:05:19 +0200 |
parents | 38864218c4cc |
children |
line wrap: on
line source
#!/bin/sh # Tests if hgweb can run without touching sys.stdin, as is required # by the WSGI standard and strictly implemented by mod_wsgi. mkdir repo cd repo hg init echo foo > bar hg add bar hg commit -m "test" hg tip cat > request.py <<EOF from mercurial import dispatch from mercurial.hgweb.hgweb_mod import hgweb from mercurial.ui import ui from mercurial import hg from StringIO import StringIO import os, sys class FileLike(object): def __init__(self, real): self.real = real def fileno(self): print >> sys.__stdout__, 'FILENO' return self.real.fileno() def read(self): print >> sys.__stdout__, 'READ' return self.real.read() def readline(self): print >> sys.__stdout__, 'READLINE' return self.real.readline() sys.stdin = FileLike(sys.stdin) errors = StringIO() input = StringIO() output = StringIO() def startrsp(headers, data): print '---- HEADERS' print headers print '---- DATA' print data return output.write env = { 'wsgi.version': (1, 0), 'wsgi.url_scheme': 'http', 'wsgi.errors': errors, 'wsgi.input': input, 'wsgi.multithread': False, 'wsgi.multiprocess': False, 'wsgi.run_once': False, 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '', 'PATH_INFO': '', 'QUERY_STRING': '', 'SERVER_NAME': '127.0.0.1', 'SERVER_PORT': os.environ['HGPORT'], 'SERVER_PROTOCOL': 'HTTP/1.0' } i = hgweb('.') i(env, startrsp) print '---- ERRORS' print errors.getvalue() print '---- OS.ENVIRON wsgi variables' print sorted([x for x in os.environ if x.startswith('wsgi')]) print '---- request.ENVIRON wsgi variables' print sorted([x for x in i.repo.ui.environ if x.startswith('wsgi')]) EOF python request.py