-rwxr-xr-x | tests/setup.sh | 13 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 2 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 12 | ||||
-rw-r--r-- | ui-shared.c | 20 |
4 files changed, 36 insertions, 11 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index e37306e..1457dd5 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -32,4 +32,11 @@ mkrepo() { | |||
32 | git commit -m "commit $n" | 32 | git commit -m "commit $n" |
33 | done | 33 | done |
34 | if test "$3" = "testplus" | ||
35 | then | ||
36 | echo "hello" >a+b | ||
37 | git add a+b | ||
38 | git commit -m "add a+b" | ||
39 | git branch "1+2" | ||
40 | fi | ||
34 | cd $dir | 41 | cd $dir |
35 | } | 42 | } |
@@ -41,4 +48,5 @@ setup_repos() | |||
41 | mkrepo trash/repos/foo 5 >/dev/null | 48 | mkrepo trash/repos/foo 5 >/dev/null |
42 | mkrepo trash/repos/bar 50 >/dev/null | 49 | mkrepo trash/repos/bar 50 >/dev/null |
50 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null | ||
43 | cat >trash/cgitrc <<EOF | 51 | cat >trash/cgitrc <<EOF |
44 | virtual-root=/ | 52 | virtual-root=/ |
@@ -62,4 +70,8 @@ repo.url=bar | |||
62 | repo.path=$PWD/trash/repos/bar/.git | 70 | repo.path=$PWD/trash/repos/bar/.git |
63 | repo.desc=the bar repo | 71 | repo.desc=the bar repo |
72 | |||
73 | repo.url=foo+bar | ||
74 | repo.path=$PWD/trash/repos/foo+bar/.git | ||
75 | repo.desc=the foo+bar repo | ||
64 | EOF | 76 | EOF |
65 | } | 77 | } |
@@ -114,3 +126,2 @@ cgit_url() | |||
114 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 126 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
115 | } | 127 | } |
116 | |||
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh index 445af6a..07e39f9 100755 --- a/tests/t0101-index.sh +++ b/tests/t0101-index.sh | |||
@@ -10,4 +10,6 @@ run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' | |||
10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' | 10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' |
11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' | 11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' |
12 | run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp' | ||
13 | run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp' | ||
12 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' | 14 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' |
13 | run_test 'no log-link' '! grep -e "foo/log" trash/tmp' | 15 | run_test 'no log-link' '! grep -e "foo/log" trash/tmp' |
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh index 2516c72..0d62cc8 100755 --- a/tests/t0104-tree.sh +++ b/tests/t0104-tree.sh | |||
@@ -19,3 +19,15 @@ run_test 'no line 2' ' | |||
19 | ' | 19 | ' |
20 | 20 | ||
21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' | ||
22 | |||
23 | run_test 'verify a+b link' ' | ||
24 | grep -e "/foo+bar/tree/a+b" trash/tmp | ||
25 | ' | ||
26 | |||
27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' | ||
28 | |||
29 | run_test 'verify a+b?h=1+2 link' ' | ||
30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp | ||
31 | ' | ||
32 | |||
21 | tests_done | 33 | tests_done |
diff --git a/ui-shared.c b/ui-shared.c index c23bc75..a2f636c 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -222,12 +222,12 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
222 | html(ctx.cfg.script_name); | 222 | html(ctx.cfg.script_name); |
223 | html("?url="); | 223 | html("?url="); |
224 | html_attr(ctx.repo->url); | 224 | html_url_arg(ctx.repo->url); |
225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
226 | html("/"); | 226 | html("/"); |
227 | if (page) { | 227 | if (page) { |
228 | html(page); | 228 | html_url_arg(page); |
229 | html("/"); | 229 | html("/"); |
230 | if (path) | 230 | if (path) |
231 | html_attr(path); | 231 | html_url_arg(path); |
232 | } | 232 | } |
233 | delim = "&"; | 233 | delim = "&"; |
@@ -236,5 +236,5 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
236 | html(delim); | 236 | html(delim); |
237 | html("h="); | 237 | html("h="); |
238 | html_attr(head); | 238 | html_url_arg(head); |
239 | delim = "&"; | 239 | delim = "&"; |
240 | } | 240 | } |
@@ -251,5 +251,5 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
251 | html(delim); | 251 | html(delim); |
252 | html("id="); | 252 | html("id="); |
253 | html_attr(rev); | 253 | html_url_arg(rev); |
254 | } | 254 | } |
255 | html("'>"); | 255 | html("'>"); |
@@ -279,5 +279,5 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
279 | html(delim); | 279 | html(delim); |
280 | html("id="); | 280 | html("id="); |
281 | html_attr(rev); | 281 | html_url_arg(rev); |
282 | delim = "&"; | 282 | delim = "&"; |
283 | } | 283 | } |
@@ -285,9 +285,9 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
285 | html(delim); | 285 | html(delim); |
286 | html("qt="); | 286 | html("qt="); |
287 | html_attr(grep); | 287 | html_url_arg(grep); |
288 | delim = "&"; | 288 | delim = "&"; |
289 | html(delim); | 289 | html(delim); |
290 | html("q="); | 290 | html("q="); |
291 | html_attr(pattern); | 291 | html_url_arg(pattern); |
292 | } | 292 | } |
293 | if (ofs > 0) { | 293 | if (ofs > 0) { |
@@ -334,5 +334,5 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
334 | html(delim); | 334 | html(delim); |
335 | html("id="); | 335 | html("id="); |
336 | html_attr(new_rev); | 336 | html_url_arg(new_rev); |
337 | delim = "&"; | 337 | delim = "&"; |
338 | } | 338 | } |
@@ -340,5 +340,5 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
340 | html(delim); | 340 | html(delim); |
341 | html("id2="); | 341 | html("id2="); |
342 | html_attr(old_rev); | 342 | html_url_arg(old_rev); |
343 | } | 343 | } |
344 | html("'>"); | 344 | html("'>"); |