Mercurial > public > mercurial-scm > hg
annotate tests/test-convert-authormap @ 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 | 6c82beaaa11a |
children |
rev | line source |
---|---|
7961
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
1 #!/bin/sh |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
2 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
3 cat >> $HGRCPATH <<EOF |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
4 [extensions] |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
5 convert= |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
6 EOF |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
7 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
8 # Prepare orig repo |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
9 hg init orig |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
10 cd orig |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
11 echo foo > foo |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7968
diff
changeset
|
12 HGUSER='user name' hg ci -qAm 'foo' |
7961
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
13 cd .. |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
14 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
15 # Explicit --authors |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
16 cat > authormap.txt <<EOF |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
17 user name = Long User Name |
7962
62154415821f
convert: fix authormap handling of lines without '='
Marti Raudsepp <marti@juffo.org>
parents:
7961
diff
changeset
|
18 |
7968
43b70a964e0d
convert: handle comments starting with '#' in authormap files
Marti Raudsepp <marti@juffo.org>
parents:
7962
diff
changeset
|
19 # comment |
7962
62154415821f
convert: fix authormap handling of lines without '='
Marti Raudsepp <marti@juffo.org>
parents:
7961
diff
changeset
|
20 this line is ignored |
7961
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
21 EOF |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
22 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
23 hg convert --authors authormap.txt orig new |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
24 echo $? |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
25 cat new/.hg/authormap |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
26 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
27 hg -Rnew log |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
28 rm -rf new |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
29 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
30 # Implicit .hg/authormap |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
31 hg init new |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
32 mv authormap.txt new/.hg/authormap |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
33 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
34 hg convert orig new |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
35 echo $? |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
36 |
52e442fe43f4
convert: Add testcase for convert authormap.
Marti Raudsepp <marti@juffo.org>
parents:
diff
changeset
|
37 hg -Rnew log |