ui-shared.c: use html_url_arg()

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>

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/setup.sh b/tests/setup.sh
index e37306e..1457dd5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -18,62 +18,74 @@
 
 mkrepo() {
 	name=$1
 	count=$2
 	dir=$PWD
 	test -d $name && return
 	printf "Creating testrepo %s\n" $name
 	mkdir -p $name
 	cd $name
 	git init
 	for ((n=1; n<=count; n++))
 	do
 		echo $n >file-$n
 		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
 }
 
 setup_repos()
 {
 	rm -rf trash/cache
 	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
 
 cache-size=1021
 snapshots=tar.gz tar.bz zip
 enable-log-filecount=1
 enable-log-linecount=1
 summary-log=5
 summary-branches=5
 summary-tags=5
 
 repo.url=foo
 repo.path=$PWD/trash/repos/foo/.git
 # Do not specify a description for this repo, as it then will be assigned
 # the constant value "[no description]" (which actually used to cause a
 # segfault).
 
 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
 }
 
 prepare_tests()
 {
 	setup_repos
 	rm -f test-output.log 2>/dev/null
 	test_count=0
 	test_failed=0
 	echo "[$0]" "$@" >test-output.log
 	echo "$@" "($0)"
 }
 
 tests_done()
 {
 	printf "\n"
@@ -100,17 +112,16 @@ run_test()
 		printf " %2d) %-60s [ok]\n" $test_count "$desc"
 	else
 		((test_failed++))
 		printf " %2d) %-60s [failed]\n" $test_count "$desc"
 	fi
 }
 
 cgit_query()
 {
 	CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
 }
 
 cgit_url()
 {
 	CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
-