Mercurial > hg
annotate tests/test-hgweb-raw.t @ 25122:755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
This will work for any command that creates its matcher via scmutil.match(), but
only the files command is tested here (both workingctx and basectx based tests).
The previous behavior was to completely ignore the files in the subrepo, even
though -S was given.
My first attempt was to teach context.walk() to optionally recurse, but once
that was in place and the complete file list was built up, the predicate test
would fail with 'path in nested repo' when a file in a subrepo was accessed
through the parent context.
There are two slightly surprising behaviors with this functionality. First, any
path provided inside the fileset isn't narrowed when it is passed to the
subrepo. I dont see any clean way to do that in the matcher. Fortunately, the
'subrepo()' fileset is the only one to take a path.
The second surprise is that status predicates are resolved against the subrepo,
not the parent like 'hg status -S' is. I don't see any way to fix that either,
given the path auditor error mentioned above.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 16 May 2015 00:36:35 -0400 |
parents | 7a9cbb315d84 |
children | 4d2b9b304ad0 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18589
diff
changeset
|
1 #require serve |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
15004
diff
changeset
|
2 |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
3 Test raw style of hgweb |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
4 |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
5 $ hg init test |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
6 $ cd test |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
7 $ mkdir sub |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
8 $ cat >'sub/some text%.txt' <<ENDSOME |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
9 > This is just some random text |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
10 > that will go inside the file and take a few lines. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
11 > It is very boring to read, but computers don't |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
12 > care about things like that. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
13 > ENDSOME |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
14 $ hg add 'sub/some text%.txt' |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
15 $ hg commit -d "1 0" -m "Just some text" |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
16 |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
17 $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid |
2532
84655f721f39
Add a test for getting raw files via the web UI.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
18 |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
19 $ cat hg.pid >> $DAEMON_PIDS |
17017
953faba28e91
tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
16973
diff
changeset
|
20 $ ("$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 |
16298
0eefd118f27e
tests: fix shutdown race in test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
21 |
18589
91aac2797c40
test-hgweb-raw.t: use killdaemons instead of kill `cat pidfile`
Augie Fackler <raf@durin42.com>
parents:
17017
diff
changeset
|
22 $ "$TESTDIR/killdaemons.py" hg.pid |
16298
0eefd118f27e
tests: fix shutdown race in test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
23 |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
24 $ cat getoutput.txt |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
25 200 Script output follows |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
26 content-type: application/binary |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
27 content-length: 157 |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
28 content-disposition: inline; filename="some text%.txt" |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
29 |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
30 This is just some random text |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
31 that will go inside the file and take a few lines. |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
32 It is very boring to read, but computers don't |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
33 care about things like that. |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
34 $ cat access.log error.log |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
35 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob) |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
36 |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
37 $ rm access.log error.log |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
38 $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \ |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
39 > --config web.guessmime=True |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
40 |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
41 $ cat hg.pid >> $DAEMON_PIDS |
17017
953faba28e91
tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
16973
diff
changeset
|
42 $ ("$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 |
18589
91aac2797c40
test-hgweb-raw.t: use killdaemons instead of kill `cat pidfile`
Augie Fackler <raf@durin42.com>
parents:
17017
diff
changeset
|
43 $ "$TESTDIR/killdaemons.py" hg.pid |
16298
0eefd118f27e
tests: fix shutdown race in test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
44 |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
45 $ cat getoutput.txt |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
46 200 Script output follows |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
47 content-type: text/plain; charset="ascii" |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
48 content-length: 157 |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
49 content-disposition: inline; filename="some text%.txt" |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
50 |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
51 This is just some random text |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
52 that will go inside the file and take a few lines. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
53 It is very boring to read, but computers don't |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
54 care about things like that. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
55 $ cat access.log error.log |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
56 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob) |
2532
84655f721f39
Add a test for getting raw files via the web UI.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
57 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16496
diff
changeset
|
58 $ cd .. |