Mercurial > public > mercurial-scm > hg
view tests/test-extdiff @ 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 | c52057614c72 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "extdiff=" >> $HGRCPATH hg init a cd a echo a > a echo b > b hg add # should diff cloned directories hg extdiff -o -r $opt echo "[extdiff]" >> $HGRCPATH echo "cmd.falabala=echo" >> $HGRCPATH echo "opts.falabala=diffing" >> $HGRCPATH hg falabala hg help falabala hg ci -d '0 0' -mtest1 echo b >> a hg ci -d '1 0' -mtest2 # should diff cloned files directly hg falabala -r 0:1 # test diff during merge hg update -C 0 echo c >> c hg add c hg ci -m "new branch" -d '1 0' hg merge 1 # should diff cloned file against wc file hg falabala > out # cleanup the output since the wc is a tmp directory sed 's:\(diffing [^ ]* \).*\(\/test-extdiff\):\1[tmp]\2:' out # test --change option hg ci -d '2 0' -mtest3 hg falabala -c 1 # check diff are made from the first parent hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" #hg log echo echo '% test extdiff of multiple files in tmp dir:' hg update -C 0 > /dev/null echo changed > a echo changed > b chmod +x b echo '% diff in working directory, before' hg diff --git echo '% edit with extdiff -p' # prepare custom diff/edit tool cat > 'diff tool.py' << EOT #!/usr/bin/env python import time time.sleep(1) # avoid unchanged-timestamp problems file('a/a', 'ab').write('edited\n') file('a/b', 'ab').write('edited\n') EOT chmod +x 'diff tool.py' hg extdiff -p "`pwd`/diff tool.py" # will change to /tmp/extdiff.TMP and populate directories a.TMP and a and start tool echo '% diff in working directory, after' hg diff --git echo echo % test extdiff with --option hg extdiff -p echo -o this -c 1 hg falabala -o this -c 1 echo