crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui-shared.c: use html_url_arg()

Browse Source 
The link-generating functions are updated to use the new html_url_arg
function, thereby fixing links to strange repos, branches and files.

Also, the test-suite is updated to verify some cases of strange urls.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-10-05 12:52:25 +02:00
parent a36a0d9dec
commit b575115d9d
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/setup.sh
View File

@ -31,6 +31,13 @@ mkrepo() {
git add file-$n
git commit -m "commit $n"
done
if test "$3" = "testplus"
then
echo "hello" >a+b
git add a+b
git commit -m "add a+b"
git branch "1+2"
fi
cd $dir
}
@ -40,6 +47,7 @@ setup_repos()
mkdir -p trash/cache
mkrepo trash/repos/foo 5 >/dev/null
mkrepo trash/repos/bar 50 >/dev/null
mkrepo trash/repos/foo+bar 10 testplus >/dev/null
cat >trash/cgitrc <<EOF
virtual-root=/
cache-root=$PWD/trash/cache
@ -61,6 +69,10 @@ repo.path=$PWD/trash/repos/foo/.git
repo.url=bar
repo.path=$PWD/trash/repos/bar/.git
repo.desc=the bar repo
repo.url=foo+bar
repo.path=$PWD/trash/repos/foo+bar/.git
repo.desc=the foo+bar repo
EOF
}
@ -113,4 +125,3 @@ cgit_url()
{
CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
}

2
tests/t0101-index.sh
View File

@ -9,6 +9,8 @@ run_test 'find foo repo' 'grep -e "foo" trash/tmp'
run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp'
run_test 'find bar repo' 'grep -e "bar" trash/tmp'
run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp'
run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp'
run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp'
run_test 'no log-link' '! grep -e "foo/log" trash/tmp'

12
tests/t0104-tree.sh
View File

@ -18,4 +18,16 @@ run_test 'no line 2' '
grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
'
run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
run_test 'verify a+b link' '
grep -e "/foo+bar/tree/a+b" trash/tmp
'
run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
run_test 'verify a+b?h=1+2 link' '
grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
'
tests_done

20
ui-shared.c
View File

@ -221,21 +221,21 @@ static char *repolink(char *title, char *class, char *page, char *head,
} else {
html(ctx.cfg.script_name);
html("?url=");
html_attr(ctx.repo->url);
html_url_arg(ctx.repo->url);
if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
html("/");
if (page) {
html(page);
html_url_arg(page);
html("/");
if (path)
html_attr(path);
html_url_arg(path);
}
delim = "&amp;";
}
if (head && strcmp(head, ctx.repo->defbranch)) {
html(delim);
html("h=");
html_attr(head);
html_url_arg(head);
delim = "&amp;";
}
return fmt("%s", delim);
@ -250,7 +250,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
if (rev && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_attr(rev);
html_url_arg(rev);
}
html("'>");
html_txt(name);
@ -278,17 +278,17 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
if (rev && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_attr(rev);
html_url_arg(rev);
delim = "&";
}
if (grep && pattern) {
html(delim);
html("qt=");
html_attr(grep);
html_url_arg(grep);
delim = "&";
html(delim);
html("q=");
html_attr(pattern);
html_url_arg(pattern);
}
if (ofs > 0) {
html(delim);
@ -333,13 +333,13 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
if (new_rev && strcmp(new_rev, ctx.qry.head)) {
html(delim);
html("id=");
html_attr(new_rev);
html_url_arg(new_rev);
delim = "&amp;";
}
if (old_rev) {
html(delim);
html("id2=");
html_attr(old_rev);
html_url_arg(old_rev);
}
html("'>");
html_txt(name);