Mercurial > public > mercurial-scm > hg
annotate tests/filtertmp.py @ 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 | b26c4a89a143 |
children |
rev | line source |
---|---|
10468
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 #!/usr/bin/env python |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 # |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 # This used to be a simple sed call like: |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 # |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 # $ sed "s:$HGTMP:*HGTMP*:" |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 # |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 # But $HGTMP has ':' under Windows which breaks the sed call. |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 # |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 import sys, os |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 input = sys.stdin.read() |
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 input = input.replace(os.sep, '/') |
10469
b26c4a89a143
Fix test-push-validation under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10468
diff
changeset
|
13 hgtmp = os.environ['HGTMP'].replace(os.sep, '/') |
b26c4a89a143
Fix test-push-validation under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10468
diff
changeset
|
14 input = input.replace(hgtmp, '$HGTMP') |
10468
2250fc372d34
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 sys.stdout.write(input) |