Mercurial > public > mercurial-scm > hg
annotate tests/test-filebranch @ 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 | 3f754be7abbb |
| children | 4c94b6d0fb1c |
| rev | line source |
|---|---|
| 990 | 1 #!/bin/sh |
| 2 | |
| 3 # This test makes sure that we don't mark a file as merged with its ancestor | |
| 4 # when we do a merge. | |
| 5 | |
|
4293
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
6 cat <<EOF > merge |
|
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
7 import sys, os |
|
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
8 print "merging for", os.path.basename(sys.argv[1]) |
| 990 | 9 EOF |
|
4293
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
10 HGMERGE="python ../merge"; export HGMERGE |
| 990 | 11 |
| 12 echo creating base | |
| 13 hg init a | |
| 14 cd a | |
| 15 echo 1 > foo | |
| 16 echo 1 > bar | |
| 17 echo 1 > baz | |
| 18 echo 1 > quux | |
| 19 hg add foo bar baz quux | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
20 hg commit -m "base" -d "1000000 0" |
| 990 | 21 |
| 22 cd .. | |
| 23 hg clone a b | |
| 24 | |
| 25 echo creating branch a | |
| 26 cd a | |
| 27 echo 2a > foo | |
| 28 echo 2a > bar | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
29 hg commit -m "branch a" -d "1000000 0" |
| 990 | 30 |
| 31 echo creating branch b | |
| 32 | |
| 33 cd .. | |
| 34 cd b | |
| 35 echo 2b > foo | |
| 36 echo 2b > baz | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
37 hg commit -m "branch b" -d "1000000 0" |
| 990 | 38 |
| 39 echo "we shouldn't have anything but n state here" | |
|
6329
3f754be7abbb
tests: fix repeatability for test-filebranch with dirstate granularity
Matt Mackall <mpm@selenic.com>
parents:
6296
diff
changeset
|
40 hg debugstate --nodates | grep -v "^n" |
| 990 | 41 |
| 42 echo merging | |
| 43 hg pull ../a | |
|
4293
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
44 hg merge -v |
| 990 | 45 |
| 46 echo 2m > foo | |
| 47 echo 2b > baz | |
| 48 echo new > quux | |
| 49 | |
| 50 echo "we shouldn't have anything but foo in merge state here" | |
|
6296
a9e6b8875805
debugstate: add --nodates
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5858
diff
changeset
|
51 hg debugstate --nodates | grep "^m" |
| 990 | 52 |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
53 hg ci -m "merge" -d "1000000 0" |
| 990 | 54 |
| 55 echo "main: we should have a merge here" | |
|
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
56 hg debugindex .hg/store/00changelog.i |
| 990 | 57 |
| 993 | 58 echo "log should show foo and quux changed" |
| 59 hg log -v -r tip | |
| 60 | |
| 990 | 61 echo "foo: we should have a merge here" |
|
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
62 hg debugindex .hg/store/data/foo.i |
| 990 | 63 |
| 64 echo "bar: we shouldn't have a merge here" | |
|
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
65 hg debugindex .hg/store/data/bar.i |
| 990 | 66 |
| 67 echo "baz: we shouldn't have a merge here" | |
|
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
68 hg debugindex .hg/store/data/baz.i |
| 990 | 69 |
| 70 echo "quux: we shouldn't have a merge here" | |
|
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
71 hg debugindex .hg/store/data/quux.i |
| 990 | 72 |
| 993 | 73 echo "manifest entries should match tips of all files" |
| 3736 | 74 hg manifest --debug |
| 993 | 75 |
| 990 | 76 echo "everything should be clean now" |
| 77 hg status | |
| 78 | |
| 79 hg verify |