##// END OF EJS Templates
subrepo: calculate _relpath for hgsubrepo based on self instead of parent...
subrepo: calculate _relpath for hgsubrepo based on self instead of parent Prior to 105758d1b37b, the subrelpath() (now _relpath) for hgsubrepo was calculated by removing the root path of the outermost repo from the root path of the subrepo. Since the root paths use platform specific separators, and the relative path is printed by various commands, the output of these commands require a glob (and check-code.py enforces this). In an effort to be generic to all subrepos, 105758d1b37b started calculating this path based on the parent repo, and then joining the subrepo path in .hgsub. One of the tests in test-subrepo.t creates a subrepo inside a directory, so the path being joined contained '/' instead of '\'. This made the test fail with a '~' status, because the glob is unnecessary[1]. Removing them made the test work, but then check-code complains. We can't just drop the check-code rule, because sub-subrepos are still joined with '\'. Presumably the other subrepo types have this issue as well, but there likely isn't a test with git or svn repos inside a subdirectory. This simply restores the exact _relpath value (and output) for hgsubrepos prior to 105758d1b37b. [1] http://www.selenic.com/pipermail/mercurial-devel/2015-April/068720.html

File last commit:

r22046:7a9cbb31 default
r24786:56e15db9 default
Show More
test-hgweb-raw.t
58 lines | 2.0 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
r15446
Matt Mackall
tests: unify test-hgweb-raw
r12441 Test raw style of hgweb
$ hg init test
$ cd test
$ mkdir sub
Mads Kiilerich
tests: use a different evil name in test-hgweb-raw.t...
r16973 $ cat >'sub/some text%.txt' <<ENDSOME
Matt Mackall
tests: unify test-hgweb-raw
r12441 > This is just some random text
> that will go inside the file and take a few lines.
> It is very boring to read, but computers don't
> care about things like that.
> ENDSOME
Mads Kiilerich
tests: use a different evil name in test-hgweb-raw.t...
r16973 $ hg add 'sub/some text%.txt'
Matt Mackall
tests: unify test-hgweb-raw
r12441 $ hg commit -d "1 0" -m "Just some text"
$ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt
Matt Mackall
tests: fix shutdown race in test-hgweb-raw
r16298
Augie Fackler
test-hgweb-raw.t: use killdaemons instead of kill `cat pidfile`
r18589 $ "$TESTDIR/killdaemons.py" hg.pid
Matt Mackall
tests: fix shutdown race in test-hgweb-raw
r16298
Matt Mackall
tests: unify test-hgweb-raw
r12441 $ cat getoutput.txt
200 Script output follows
Matt Mackall
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)...
r15004 content-type: application/binary
content-length: 157
Mads Kiilerich
tests: use a different evil name in test-hgweb-raw.t...
r16973 content-disposition: inline; filename="some text%.txt"
Matt Mackall
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)...
r15004
This is just some random text
that will go inside the file and take a few lines.
It is very boring to read, but computers don't
care about things like that.
$ cat access.log error.log
Mads Kiilerich
tests: use a different evil name in test-hgweb-raw.t...
r16973 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)
Matt Mackall
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)...
r15004
$ rm access.log error.log
$ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \
> --config web.guessmime=True
$ cat hg.pid >> $DAEMON_PIDS
Mads Kiilerich
tests: prepare get-with-headers.py for MSYS...
r17017 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt
Augie Fackler
test-hgweb-raw.t: use killdaemons instead of kill `cat pidfile`
r18589 $ "$TESTDIR/killdaemons.py" hg.pid
Matt Mackall
tests: fix shutdown race in test-hgweb-raw
r16298
Matt Mackall
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)...
r15004 $ cat getoutput.txt
200 Script output follows
Matt Mackall
tests: unify test-hgweb-raw
r12441 content-type: text/plain; charset="ascii"
content-length: 157
Mads Kiilerich
tests: use a different evil name in test-hgweb-raw.t...
r16973 content-disposition: inline; filename="some text%.txt"
Matt Mackall
tests: unify test-hgweb-raw
r12441
This is just some random text
that will go inside the file and take a few lines.
It is very boring to read, but computers don't
care about things like that.
$ cat access.log error.log
Mads Kiilerich
tests: use a different evil name in test-hgweb-raw.t...
r16973 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)
Matt Mackall
tests: unify test-hgweb-raw
r12441
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..