cvsserver: Add some useful commandline options

diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index dde5d865ba98e9cce266c9cae406bada7143fd30..71cbb72e1bc2e8b11c248c01cb7559e43ddabe04 100755 (executable)
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -5,17 +5,7 @@
 test_description='Tests git-rev-list --bisect functionality'
 
 . ./test-lib.sh
-. ../t6000-lib.sh
-
-bc_expr()
-{
-bc <<EOF
-scale=1
-define abs(x) { if (x>=0) { return x; } else { return -x; } }
-define floor(x) { save=scale; scale=0; result=x/1; scale=save; return result; }
-$*
-EOF
-}
+. ../t6000lib.sh # t6xxx specific functions
 
 # usage: test_bisection max-diff bisect-option head ^prune...
 #
@@ -31,12 +21,23 @@ test_bisection_diff()
         _head=$1
        shift 1
        _bisection_size=$(git-rev-list $_bisection "$@" | wc -l)
-       [ -n "$_list_size" -a -n "$_bisection_size" ] || error "test_bisection_diff failed"
-       test_expect_success "bisection diff $_bisect_option $_head $* <= $_max_diff" "[ $(bc_expr "floor(abs($_list_size/2)-$_bisection_size)") -le $_max_diff ]"
+       [ -n "$_list_size" -a -n "$_bisection_size" ] ||
+       error "test_bisection_diff failed"
+
+       # Test if bisection size is close to half of list size within
+       # tolerance.
+       #
+       _bisect_err=`expr $_list_size - $_bisection_size \* 2`
+       test "$_bisect_err" -lt 0 && _bisect_err=`expr 0 - $_bisect_err`
+       _bisect_err=`expr $_bisect_err / 2` ; # floor
+
+       test_expect_success \
+       "bisection diff $_bisect_option $_head $* <= $_max_diff" \
+       'test $_bisect_err -le $_max_diff'
 }
 
 date >path0
-git-update-cache --add path0
+git-update-index --add path0
 save_tag tree git-write-tree
 on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
 on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root
@@ -57,7 +58,7 @@ on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3
 on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
 on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
 on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
-tag l5 > .git/HEAD
+git-update-ref HEAD $(tag l5)
 
 
 #     E
@@ -113,20 +114,10 @@ on_committer_date "1971-08-16 00:00:04" save_tag u4 unique_commit u4 tree -p u0
 on_committer_date "1971-08-16 00:00:05" save_tag u5 unique_commit u5 tree -p u0
 on_committer_date "1971-08-16 00:00:06" save_tag V unique_commit V tree -p u1 -p u2 -p u3 -p u4 -p u5
 
-
-#
-# cd to t/trash and use 
-#
-#    git-rev-list ... 2>&1 | sed "$(cat sed.script)" 
-#
-# if you ever want to manually debug the operation of git-rev-list
-#
-echo $sed_script > sed.script
-
 test_sequence()
 {
-       _bisect_option=$1       
-       
+       _bisect_option=$1
+
        test_bisection_diff 0 $_bisect_option l0 ^root
        test_bisection_diff 0 $_bisect_option l1 ^root
        test_bisection_diff 0 $_bisect_option l2 ^root
@@ -161,9 +152,9 @@ test_sequence()
        test_bisection_diff 0 $_bisect_option u3 ^U
        test_bisection_diff 0 $_bisect_option u4 ^U
        test_bisection_diff 0 $_bisect_option u5 ^U
-       
+
 #
-# the following illustrate's Linus' binary bug blatt idea. 
+# the following illustrates Linus' binary bug blatt idea.
 #
 # assume the bug is actually at l3, but you don't know that - all you know is that l3 is broken
 # and it wasn't broken before
@@ -172,7 +163,7 @@ test_sequence()
 # the bisection point is the head - this is the bad point.
 #
 
-test_output_expect_success "--bisect l5 ^root" 'git-rev-list $_bisect_option l5 ^root' <<EOF
+test_output_expect_success "$_bisect_option l5 ^root" 'git-rev-list $_bisect_option l5 ^root' <<EOF
 c3
 EOF