[thirdparty/git.git] / t / t9400-git-cvsserver-server.sh

#!/bin/sh
#
# Copyright (c) 2007 Frank Lichtenheld
#

test_description='git-cvsserver access

tests read access to a git repository with the
cvs CLI client via git-cvsserver server'

. ./test-lib.sh

if ! test_have_prereq PERL; then
	skip_all='skipping git cvsserver tests, perl not available'
	test_done
fi
cvs >/dev/null 2>&1
if test $? -ne 1
then
    skip_all='skipping git-cvsserver tests, cvs not found'
    test_done
fi
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
    skip_all='skipping git-cvsserver tests, Perl SQLite interface unavailable'
    test_done
}

WORKDIR=$PWD
SERVERDIR=$PWD/gitcvs.git
git_config="$SERVERDIR/config"
CVSROOT=":fork:$SERVERDIR"
CVSWORK="$PWD/cvswork"
CVS_SERVER=git-cvsserver
export CVSROOT CVS_SERVER

rm -rf "$CVSWORK" "$SERVERDIR"
test_expect_success 'setup' '
  git config push.default matching &&
  echo >empty &&
  git add empty &&
  git commit -q -m "First Commit" &&
  mkdir secondroot &&
  ( cd secondroot &&
  git init &&
  touch secondrootfile &&
  git add secondrootfile &&
  git commit -m "second root") &&
  git fetch secondroot master &&
  git merge --allow-unrelated-histories FETCH_HEAD &&
  git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
  GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
  GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
  GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
  echo cvsuser:cvGVEarMLnhlA > "$SERVERDIR/auth.db"
'

# note that cvs doesn't accept absolute pathnames
# as argument to co -d
test_expect_success 'basic checkout' \
  'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
   test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
   test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"'

#------------------------
# PSERVER AUTHENTICATION
#------------------------

cat >request-anonymous  <<EOF
BEGIN AUTH REQUEST
$SERVERDIR
anonymous

END AUTH REQUEST
EOF

cat >request-git  <<EOF
BEGIN AUTH REQUEST
$SERVERDIR
git

END AUTH REQUEST
EOF

cat >login-anonymous <<EOF
BEGIN VERIFICATION REQUEST
$SERVERDIR
anonymous

END VERIFICATION REQUEST
EOF

cat >login-git <<EOF
BEGIN VERIFICATION REQUEST
$SERVERDIR
git

END VERIFICATION REQUEST
EOF

cat >login-git-ok <<EOF
BEGIN VERIFICATION REQUEST
$SERVERDIR
cvsuser
Ah<Z:yZZ30 e
END VERIFICATION REQUEST
EOF

test_expect_success 'pserver authentication' \
  'cat request-anonymous | git-cvsserver pserver >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'pserver authentication failure (non-anonymous user)' \
  'if cat request-git | git-cvsserver pserver >log 2>&1
   then
       false
   else
       true
   fi &&
   sed -ne \$p log | grep "^I HATE YOU\$"'

test_expect_success 'pserver authentication success (non-anonymous user with password)' \
  'cat login-git-ok | git-cvsserver pserver >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'pserver authentication (login)' \
  'cat login-anonymous | git-cvsserver pserver >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'pserver authentication failure (login/non-anonymous user)' \
  'if cat login-git | git-cvsserver pserver >log 2>&1
   then
       false
   else
       true
   fi &&
   sed -ne \$p log | grep "^I HATE YOU\$"'


# misuse pserver authentication for testing of req_Root

cat >request-relative  <<EOF
BEGIN AUTH REQUEST
gitcvs.git
anonymous

END AUTH REQUEST
EOF

cat >request-conflict  <<EOF
BEGIN AUTH REQUEST
$SERVERDIR
anonymous

END AUTH REQUEST
Root $WORKDIR
EOF

test_expect_success 'req_Root failure (relative pathname)' \
  'if cat request-relative | git-cvsserver pserver >log 2>&1
   then
       echo unexpected success
       false
   else
       true
   fi &&
   tail log | grep "^error 1 Root must be an absolute pathname$"'

test_expect_success 'req_Root failure (conflicting roots)' \
  'cat request-conflict | git-cvsserver pserver >log 2>&1 &&
   tail log | grep "^error 1 Conflicting roots specified$"'

test_expect_success 'req_Root (strict paths)' \
  'cat request-anonymous | git-cvsserver --strict-paths pserver "$SERVERDIR" >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'req_Root failure (strict-paths)' '
    ! cat request-anonymous |
    git-cvsserver --strict-paths pserver "$WORKDIR" >log 2>&1
'

test_expect_success 'req_Root (w/o strict-paths)' \
  'cat request-anonymous | git-cvsserver pserver "$WORKDIR/" >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'req_Root failure (w/o strict-paths)' '
    ! cat request-anonymous |
    git-cvsserver pserver "$WORKDIR/gitcvs" >log 2>&1
'

cat >request-base  <<EOF
BEGIN AUTH REQUEST
/gitcvs.git
anonymous

END AUTH REQUEST
Root /gitcvs.git
EOF

test_expect_success 'req_Root (base-path)' \
  'cat request-base | git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'req_Root failure (base-path)' '
    ! cat request-anonymous |
    git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" >log 2>&1
'

GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false || exit 1

test_expect_success 'req_Root (export-all)' \
  'cat request-anonymous | git-cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

test_expect_success 'req_Root failure (export-all w/o whitelist)' \
  '! (cat request-anonymous | git-cvsserver --export-all pserver >log 2>&1 || false)'

test_expect_success 'req_Root (everything together)' \
  'cat request-base | git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
   sed -ne \$p log | grep "^I LOVE YOU\$"'

GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true || exit 1

#--------------
# CONFIG TESTS
#--------------

test_expect_success 'gitcvs.enabled = false' \
  'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
   then
     echo unexpected cvs success
     false
   else
     true
   fi &&
   grep "GITCVS emulation disabled" cvs.log &&
   test ! -d cvswork2'

rm -fr cvswork2
test_expect_success 'gitcvs.ext.enabled = true' \
  'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
   GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
   test_cmp cvswork cvswork2'

rm -fr cvswork2
test_expect_success 'gitcvs.ext.enabled = false' \
  'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
   GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
   then
     echo unexpected cvs success
     false
   else
     true
   fi &&
   grep "GITCVS emulation disabled" cvs.log &&
   test ! -d cvswork2'

rm -fr cvswork2
test_expect_success 'gitcvs.dbname' \
  'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
   GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
   test_cmp cvswork cvswork2 &&
   test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
   cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'

rm -fr cvswork2
test_expect_success 'gitcvs.ext.dbname' \
  'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
   GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
   GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
   test_cmp cvswork cvswork2 &&
   test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
   test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
   cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'


#------------
# CVS UPDATE
#------------

rm -fr "$SERVERDIR"
cd "$WORKDIR" &&
git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" ||
exit 1

test_expect_success 'cvs update (create new file)' \
  'echo testfile1 >testfile1 &&
   git add testfile1 &&
   git commit -q -m "Add testfile1" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
   test_cmp testfile1 ../testfile1'

cd "$WORKDIR"
test_expect_success 'cvs update (update existing file)' \
  'echo line 2 >>testfile1 &&
   git add testfile1 &&
   git commit -q -m "Append to testfile1" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
   test_cmp testfile1 ../testfile1'

cd "$WORKDIR"
#TODO: cvsserver doesn't support update w/o -d
test_expect_failure "cvs update w/o -d doesn't create subdir (TODO)" '
   mkdir test &&
   echo >test/empty &&
   git add test &&
   git commit -q -m "Single Subdirectory" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test ! -d test
'

cd "$WORKDIR"
test_expect_success 'cvs update (subdirectories)' \
  '(for dir in A A/B A/B/C A/D E; do
      mkdir $dir &&
      echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
      git add $dir
   done) &&
   git commit -q -m "deep sub directory structure" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update -d &&
   (for dir in A A/B A/B/C A/D E; do
      filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
      if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
	test_cmp "$dir/$filename" "../$dir/$filename"; then
        :
      else
        echo >failure
      fi
    done) &&
   test ! -f failure'

cd "$WORKDIR"
test_expect_success 'cvs update (delete file)' \
  'git rm testfile1 &&
   git commit -q -m "Remove testfile1" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test -z "$(grep testfile1 CVS/Entries)" &&
   test ! -f testfile1'

cd "$WORKDIR"
test_expect_success 'cvs update (re-add deleted file)' \
  'echo readded testfile >testfile1 &&
   git add testfile1 &&
   git commit -q -m "Re-Add testfile1" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
   test_cmp testfile1 ../testfile1'

cd "$WORKDIR"
test_expect_success 'cvs update (merge)' \
  'echo Line 0 >expected &&
   for i in 1 2 3 4 5 6 7
   do
     echo Line $i >>merge &&
     echo Line $i >>expected
   done &&
   echo Line 8 >>expected &&
   git add merge &&
   git commit -q -m "Merge test (pre-merge)" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
   test_cmp merge ../merge &&
   ( echo Line 0 && cat merge ) >merge.tmp &&
   mv merge.tmp merge &&
   cd "$WORKDIR" &&
   echo Line 8 >>merge &&
   git add merge &&
   git commit -q -m "Merge test (merge)" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   sleep 1 && touch merge &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test_cmp merge ../expected'

cd "$WORKDIR"

cat >expected.C <<EOF
<<<<<<< merge.mine
Line 0
=======
LINE 0
>>>>>>> merge.1.3
EOF

for i in 1 2 3 4 5 6 7 8
do
  echo Line $i >>expected.C
done

test_expect_success 'cvs update (conflict merge)' \
  '( echo LINE 0 && cat merge ) >merge.tmp &&
   mv merge.tmp merge &&
   git add merge &&
   git commit -q -m "Merge test (conflict)" &&
   git push gitcvs.git >/dev/null &&
   cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update &&
   test_cmp merge ../expected.C'

cd "$WORKDIR"
test_expect_success 'cvs update (-C)' \
  'cd cvswork &&
   GIT_CONFIG="$git_config" cvs -Q update -C &&
   test_cmp merge ../merge'

cd "$WORKDIR"
test_expect_success 'cvs update (merge no-op)' \
   'echo Line 9 >>merge &&
    cp merge cvswork/merge &&
    git add merge &&
    git commit -q -m "Merge test (no-op)" &&
    git push gitcvs.git >/dev/null &&
    cd cvswork &&
    sleep 1 && touch merge &&
    GIT_CONFIG="$git_config" cvs -Q update &&
    test_cmp merge ../merge'

cd "$WORKDIR"
test_expect_success 'cvs update (-p)' '
    touch really-empty &&
    echo Line 1 > no-lf &&
    printf "Line 2" >> no-lf &&
    git add really-empty no-lf &&
    git commit -q -m "Update -p test" &&
    git push gitcvs.git >/dev/null &&
    cd cvswork &&
    GIT_CONFIG="$git_config" cvs update &&
    for i in merge no-lf empty really-empty; do
	GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
	test_cmp $i.out ../$i || return 1
    done
'

cd "$WORKDIR"
test_expect_success 'cvs update (module list supports packed refs)' '
    GIT_DIR="$SERVERDIR" git pack-refs --all &&
    GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
    grep "cvs update: New directory \`master'\''" < out
'

#------------
# CVS STATUS
#------------

cd "$WORKDIR"
test_expect_success 'cvs status' '
    mkdir status.dir &&
    echo Line > status.dir/status.file &&
    echo Line > status.file &&
    git add status.dir status.file &&
    git commit -q -m "Status test" &&
    git push gitcvs.git >/dev/null &&
    cd cvswork &&
    GIT_CONFIG="$git_config" cvs update &&
    GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
    test_line_count = 2 ../out
'

cd "$WORKDIR"
test_expect_success 'cvs status (nonrecursive)' '
    cd cvswork &&
    GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
    test_line_count = 1 ../out
'

cd "$WORKDIR"
test_expect_success 'cvs status (no subdirs in header)' '
    cd cvswork &&
    GIT_CONFIG="$git_config" cvs status | grep ^File: >../out &&
    ! grep / <../out
'

#------------
# CVS CHECKOUT
#------------

cd "$WORKDIR"
test_expect_success 'cvs co -c (shows module database)' '
    GIT_CONFIG="$git_config" cvs co -c > out &&
    grep "^master[	 ][ 	]*master$" <out &&
    ! grep -v "^master[	 ][ 	]*master$" <out
'

#------------
# CVS LOG
#------------

# Known issues with git-cvsserver current log output:
#  - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
#  - CVS normally does not internally add a blank first line
#    or a last line with nothing but a space to log messages.
#  - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
#    tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
#    it converts to local time zone.  git-cvsserver doesn't do the +0000
#    or the MT tags...
#  - The latest 1.12.x releases add a "commitid:" field on to the end of the
#    "date:" line (after "lines:").  Maybe we could stick git's commit id
#    in it?  Or does CVS expect a certain number of bits (too few for
#    a full sha1)?
#
# Given the above, expect the following test to break if git-cvsserver's
# log output is improved.  The test is just to ensure it doesn't
# accidentally get worse.

sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
x
xRCS file: $WORKDIR/gitcvs.git/master/merge,v
xWorking file: merge
xhead: 1.4
xbranch:
xlocks: strict
xaccess list:
xsymbolic names:
xkeyword substitution: kv
xtotal revisions: 4;	selected revisions: 4
xdescription:
x----------------------------
xrevision 1.4
xdate: __DATE__;  author: author;  state: Exp;  lines: +2 -3
x
xMerge test (no-op)
xSP
x----------------------------
xrevision 1.3
xdate: __DATE__;  author: author;  state: Exp;  lines: +2 -3
x
xMerge test (conflict)
xSP
x----------------------------
xrevision 1.2
xdate: __DATE__;  author: author;  state: Exp;  lines: +2 -3
x
xMerge test (merge)
xSP
x----------------------------
xrevision 1.1
xdate: __DATE__;  author: author;  state: Exp;  lines: +2 -3
x
xMerge test (pre-merge)
xSP
x=============================================================================
EOF
expectStat="$?"

cd "$WORKDIR"
test_expect_success 'cvs log' '
    cd cvswork &&
    test x"$expectStat" = x"0" &&
    GIT_CONFIG="$git_config" cvs log merge >../out &&
    sed -e "s%2[0-9][0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]%__DATE__%" ../out > ../actual &&
    test_cmp ../expect ../actual
'

#------------
# CVS ANNOTATE
#------------

cd "$WORKDIR"
test_expect_success 'cvs annotate' '
    cd cvswork &&
    GIT_CONFIG="$git_config" cvs annotate merge >../out &&
    sed -e "s/ .*//" ../out >../actual &&
    for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
    test_cmp ../expect ../actual
'

#------------
# running via git-shell
#------------

cd "$WORKDIR"

test_expect_success 'create remote-cvs helper' '
	write_script remote-cvs <<-\EOF
	exec git shell -c "cvs server"
	EOF
'

test_expect_success 'cvs server does not run with vanilla git-shell' '
	(
		cd cvswork &&
		CVS_SERVER=$WORKDIR/remote-cvs &&
		export CVS_SERVER &&
		test_must_fail cvs log merge
	)
'

test_expect_success 'configure git shell to run cvs server' '
	mkdir "$HOME"/git-shell-commands &&

	write_script "$HOME"/git-shell-commands/cvs <<-\EOF &&
	if ! test $# = 1 && test "$1" = "server"
	then
		echo >&2 "git-cvsserver only handles \"server\""
		exit 1
	fi
	exec git cvsserver server
	EOF

	# Should not be used, but part of the recommended setup
	write_script "$HOME"/git-shell-commands/no-interactive-login <<-\EOF
	echo Interactive login forbidden
	EOF
'

test_expect_success 'cvs server can run with recommended config' '
	(
		cd cvswork &&
		CVS_SERVER=$WORKDIR/remote-cvs &&
		export CVS_SERVER &&
		cvs log merge
	)
'

test_done
Commit	Line	Data
b3b53439 FL	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2007 Frank Lichtenheld
	4	#
	5
	6	test_description='git-cvsserver access
	7
	8	tests read access to a git repository with the
	9	cvs CLI client via git-cvsserver server'
	10
	11	. ./test-lib.sh
	12
1b19ccd2	13	if ! test_have_prereq PERL; then
fadb5156	14	skip_all='skipping git cvsserver tests, perl not available'
1b19ccd2 JK	15	test_done
1b19ccd2 JK	16	fi
b3b53439 FL	17	cvs >/dev/null 2>&1
	18	if test $? -ne 1
	19	then
fadb5156	20	skip_all='skipping git-cvsserver tests, cvs not found'
b3b53439	21	test_done
b3b53439	22	fi
94221d22	23	perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 \|\| {
fadb5156	24	skip_all='skipping git-cvsserver tests, Perl SQLite interface unavailable'
469be5b2	25	test_done
469be5b2	26	}
b3b53439	27
fd318a94 JS	28	WORKDIR=$PWD
fd318a94 JS	29	SERVERDIR=$PWD/gitcvs.git
a25907da	30	git_config="$SERVERDIR/config"
b3b53439	31	CVSROOT=":fork:$SERVERDIR"
fd318a94	32	CVSWORK="$PWD/cvswork"
b3b53439 FL	33	CVS_SERVER=git-cvsserver
	34	export CVSROOT CVS_SERVER
	35
	36	rm -rf "$CVSWORK" "$SERVERDIR"
75493765	37	test_expect_success 'setup' '
a1c54d7b	38	git config push.default matching &&
75493765	39	echo >empty &&
b3b53439 FL	40	git add empty &&
b3b53439 FL	41	git commit -q -m "First Commit" &&
e509db99 SP	42	mkdir secondroot &&
	43	( cd secondroot &&
	44	git init &&
	45	touch secondrootfile &&
	46	git add secondrootfile &&
	47	git commit -m "second root") &&
e379fdf3 JH	48	git fetch secondroot master &&
e379fdf3 JH	49	git merge --allow-unrelated-histories FETCH_HEAD &&
7fd3ef1f	50	git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
b3b53439	51	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
1dd3f291 ÆAB	52	GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
	53	GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
	54	echo cvsuser:cvGVEarMLnhlA > "$SERVERDIR/auth.db"
75493765	55	'
b3b53439 FL	56
	57	# note that cvs doesn't accept absolute pathnames
	58	# as argument to co -d
	59	test_expect_success 'basic checkout' \
a25907da	60	'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
a48fcd83	61	test "$(echo $(grep -v ^D cvswork/CVS/Entries\|cut -d/ -f2,3,5 \| head -n 1))" = "empty/1.1/" &&
b4ce54fc	62	test "$(echo $(grep -v ^D cvswork/CVS/Entries\|cut -d/ -f2,3,5 \| sed -ne \$p))" = "secondrootfile/1.1/"'
b3b53439	63
240ba7f2 FL	64	#------------------------
	65	# PSERVER AUTHENTICATION
	66	#------------------------
	67
	68	cat >request-anonymous <<EOF
	69	BEGIN AUTH REQUEST
	70	$SERVERDIR
	71	anonymous
	72
	73	END AUTH REQUEST
	74	EOF
	75
	76	cat >request-git <<EOF
	77	BEGIN AUTH REQUEST
	78	$SERVERDIR
	79	git
	80
	81	END AUTH REQUEST
	82	EOF
	83
24a97d84 FL	84	cat >login-anonymous <<EOF
	85	BEGIN VERIFICATION REQUEST
	86	$SERVERDIR
	87	anonymous
	88
	89	END VERIFICATION REQUEST
	90	EOF
	91
	92	cat >login-git <<EOF
	93	BEGIN VERIFICATION REQUEST
	94	$SERVERDIR
	95	git
	96
	97	END VERIFICATION REQUEST
	98	EOF
	99
1dd3f291 ÆAB	100	cat >login-git-ok <<EOF
	101	BEGIN VERIFICATION REQUEST
	102	$SERVERDIR
	103	cvsuser
	104	Ah<Z:yZZ30 e
	105	END VERIFICATION REQUEST
	106	EOF
	107
240ba7f2 FL	108	test_expect_success 'pserver authentication' \
240ba7f2 FL	109	'cat request-anonymous \| git-cvsserver pserver >log 2>&1 &&
9524cf29	110	sed -ne \$p log \| grep "^I LOVE YOU\$"'
240ba7f2 FL	111
	112	test_expect_success 'pserver authentication failure (non-anonymous user)' \
	113	'if cat request-git \| git-cvsserver pserver >log 2>&1
	114	then
	115	false
	116	else
	117	true
	118	fi &&
9524cf29	119	sed -ne \$p log \| grep "^I HATE YOU\$"'
240ba7f2	120
1dd3f291 ÆAB	121	test_expect_success 'pserver authentication success (non-anonymous user with password)' \
	122	'cat login-git-ok \| git-cvsserver pserver >log 2>&1 &&
	123	sed -ne \$p log \| grep "^I LOVE YOU\$"'
	124
24a97d84 FL	125	test_expect_success 'pserver authentication (login)' \
24a97d84 FL	126	'cat login-anonymous \| git-cvsserver pserver >log 2>&1 &&
9524cf29	127	sed -ne \$p log \| grep "^I LOVE YOU\$"'
24a97d84 FL	128
	129	test_expect_success 'pserver authentication failure (login/non-anonymous user)' \
	130	'if cat login-git \| git-cvsserver pserver >log 2>&1
	131	then
	132	false
	133	else
	134	true
	135	fi &&
9524cf29	136	sed -ne \$p log \| grep "^I HATE YOU\$"'
24a97d84	137
240ba7f2	138
4890888d FL	139	# misuse pserver authentication for testing of req_Root
	140
	141	cat >request-relative <<EOF
	142	BEGIN AUTH REQUEST
	143	gitcvs.git
	144	anonymous
	145
	146	END AUTH REQUEST
	147	EOF
	148
	149	cat >request-conflict <<EOF
	150	BEGIN AUTH REQUEST
	151	$SERVERDIR
	152	anonymous
	153
	154	END AUTH REQUEST
	155	Root $WORKDIR
	156	EOF
	157
	158	test_expect_success 'req_Root failure (relative pathname)' \
	159	'if cat request-relative \| git-cvsserver pserver >log 2>&1
	160	then
	161	echo unexpected success
	162	false
	163	else
	164	true
	165	fi &&
aadbe44f	166	tail log \| grep "^error 1 Root must be an absolute pathname$"'
4890888d FL	167
	168	test_expect_success 'req_Root failure (conflicting roots)' \
	169	'cat request-conflict \| git-cvsserver pserver >log 2>&1 &&
aadbe44f	170	tail log \| grep "^error 1 Conflicting roots specified$"'
4890888d	171
693b6327	172	test_expect_success 'req_Root (strict paths)' \
f69e836f	173	'cat request-anonymous \| git-cvsserver --strict-paths pserver "$SERVERDIR" >log 2>&1 &&
9524cf29	174	sed -ne \$p log \| grep "^I LOVE YOU\$"'
693b6327	175
41ac414e JH	176	test_expect_success 'req_Root failure (strict-paths)' '
41ac414e JH	177	! cat request-anonymous \|
f69e836f	178	git-cvsserver --strict-paths pserver "$WORKDIR" >log 2>&1
41ac414e	179	'
693b6327 FL	180
693b6327 FL	181	test_expect_success 'req_Root (w/o strict-paths)' \
f69e836f	182	'cat request-anonymous \| git-cvsserver pserver "$WORKDIR/" >log 2>&1 &&
9524cf29	183	sed -ne \$p log \| grep "^I LOVE YOU\$"'
693b6327	184
41ac414e JH	185	test_expect_success 'req_Root failure (w/o strict-paths)' '
41ac414e JH	186	! cat request-anonymous \|
f69e836f	187	git-cvsserver pserver "$WORKDIR/gitcvs" >log 2>&1
41ac414e	188	'
693b6327 FL	189
	190	cat >request-base <<EOF
	191	BEGIN AUTH REQUEST
	192	/gitcvs.git
	193	anonymous
	194
	195	END AUTH REQUEST
fd1cd91e	196	Root /gitcvs.git
693b6327 FL	197	EOF
	198
	199	test_expect_success 'req_Root (base-path)' \
f69e836f	200	'cat request-base \| git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
9524cf29	201	sed -ne \$p log \| grep "^I LOVE YOU\$"'
693b6327	202
41ac414e JH	203	test_expect_success 'req_Root failure (base-path)' '
41ac414e JH	204	! cat request-anonymous \|
f69e836f	205	git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" >log 2>&1
41ac414e	206	'
4890888d	207
226bccb9 FL	208	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false \|\| exit 1
	209
	210	test_expect_success 'req_Root (export-all)' \
f69e836f	211	'cat request-anonymous \| git-cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
9524cf29	212	sed -ne \$p log \| grep "^I LOVE YOU\$"'
226bccb9	213
41ac414e JH	214	test_expect_success 'req_Root failure (export-all w/o whitelist)' \
41ac414e JH	215	'! (cat request-anonymous \| git-cvsserver --export-all pserver >log 2>&1 \|\| false)'
226bccb9 FL	216
226bccb9 FL	217	test_expect_success 'req_Root (everything together)' \
f69e836f	218	'cat request-base \| git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
9524cf29	219	sed -ne \$p log \| grep "^I LOVE YOU\$"'
226bccb9 FL	220
	221	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true \|\| exit 1
	222
1d431b22 FL	223	#--------------
	224	# CONFIG TESTS
	225	#--------------
	226
	227	test_expect_success 'gitcvs.enabled = false' \
	228	'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
	229	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
	230	then
	231	echo unexpected cvs success
	232	false
	233	else
	234	true
	235	fi &&
aadbe44f	236	grep "GITCVS emulation disabled" cvs.log &&
1d431b22 FL	237	test ! -d cvswork2'
	238
	239	rm -fr cvswork2
	240	test_expect_success 'gitcvs.ext.enabled = true' \
	241	'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
	242	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
	243	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
4a2284b9	244	test_cmp cvswork cvswork2'
1d431b22 FL	245
	246	rm -fr cvswork2
	247	test_expect_success 'gitcvs.ext.enabled = false' \
	248	'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
	249	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
	250	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
	251	then
	252	echo unexpected cvs success
	253	false
	254	else
	255	true
	256	fi &&
aadbe44f	257	grep "GITCVS emulation disabled" cvs.log &&
1d431b22 FL	258	test ! -d cvswork2'
	259
	260	rm -fr cvswork2
	261	test_expect_success 'gitcvs.dbname' \
	262	'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
	263	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
	264	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
4a2284b9	265	test_cmp cvswork cvswork2 &&
1d431b22 FL	266	test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
	267	cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'
	268
	269	rm -fr cvswork2
	270	test_expect_success 'gitcvs.ext.dbname' \
	271	'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
	272	GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
	273	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
	274	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
4a2284b9	275	test_cmp cvswork cvswork2 &&
1d431b22 FL	276	test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
	277	test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
	278	cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'
	279
	280
	281	#------------
	282	# CVS UPDATE
	283	#------------
	284
	285	rm -fr "$SERVERDIR"
	286	cd "$WORKDIR" &&
7fd3ef1f	287	git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
1d431b22	288	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
db1696b8	289	GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" \|\|
1d431b22 FL	290	exit 1
1d431b22 FL	291
b3b53439 FL	292	test_expect_success 'cvs update (create new file)' \
	293	'echo testfile1 >testfile1 &&
	294	git add testfile1 &&
	295	git commit -q -m "Add testfile1" &&
	296	git push gitcvs.git >/dev/null &&
	297	cd cvswork &&
a25907da	298	GIT_CONFIG="$git_config" cvs -Q update &&
b3b53439	299	test "$(echo $(grep testfile1 CVS/Entries\|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
4a2284b9	300	test_cmp testfile1 ../testfile1'
b3b53439 FL	301
	302	cd "$WORKDIR"
	303	test_expect_success 'cvs update (update existing file)' \
	304	'echo line 2 >>testfile1 &&
	305	git add testfile1 &&
	306	git commit -q -m "Append to testfile1" &&
	307	git push gitcvs.git >/dev/null &&
	308	cd cvswork &&
a25907da	309	GIT_CONFIG="$git_config" cvs -Q update &&
b3b53439	310	test "$(echo $(grep testfile1 CVS/Entries\|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
4a2284b9	311	test_cmp testfile1 ../testfile1'
b3b53439 FL	312
	313	cd "$WORKDIR"
	314	#TODO: cvsserver doesn't support update w/o -d
41ac414e JH	315	test_expect_failure "cvs update w/o -d doesn't create subdir (TODO)" '
41ac414e JH	316	mkdir test &&
b3b53439 FL	317	echo >test/empty &&
	318	git add test &&
	319	git commit -q -m "Single Subdirectory" &&
	320	git push gitcvs.git >/dev/null &&
	321	cd cvswork &&
a25907da	322	GIT_CONFIG="$git_config" cvs -Q update &&
41ac414e JH	323	test ! -d test
41ac414e JH	324	'
b3b53439 FL	325
	326	cd "$WORKDIR"
	327	test_expect_success 'cvs update (subdirectories)' \
	328	'(for dir in A A/B A/B/C A/D E; do
	329	mkdir $dir &&
	330	echo "test file in $dir" >"$dir/file_in_$(echo $dir\|sed -e "s#/# #g")" &&
02779185	331	git add $dir
b3b53439 FL	332	done) &&
	333	git commit -q -m "deep sub directory structure" &&
	334	git push gitcvs.git >/dev/null &&
	335	cd cvswork &&
a25907da	336	GIT_CONFIG="$git_config" cvs -Q update -d &&
b3b53439 FL	337	(for dir in A A/B A/B/C A/D E; do
	338	filename="file_in_$(echo $dir\|sed -e "s#/# #g")" &&
	339	if test "$(echo $(grep -v ^D $dir/CVS/Entries\|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
4a2284b9	340	test_cmp "$dir/$filename" "../$dir/$filename"; then
b3b53439 FL	341	:
	342	else
	343	echo >failure
	344	fi
	345	done) &&
	346	test ! -f failure'
	347
	348	cd "$WORKDIR"
	349	test_expect_success 'cvs update (delete file)' \
	350	'git rm testfile1 &&
	351	git commit -q -m "Remove testfile1" &&
	352	git push gitcvs.git >/dev/null &&
	353	cd cvswork &&
a25907da	354	GIT_CONFIG="$git_config" cvs -Q update &&
b3b53439 FL	355	test -z "$(grep testfile1 CVS/Entries)" &&
	356	test ! -f testfile1'
	357
	358	cd "$WORKDIR"
	359	test_expect_success 'cvs update (re-add deleted file)' \
	360	'echo readded testfile >testfile1 &&
	361	git add testfile1 &&
	362	git commit -q -m "Re-Add testfile1" &&
	363	git push gitcvs.git >/dev/null &&
	364	cd cvswork &&
a25907da	365	GIT_CONFIG="$git_config" cvs -Q update &&
b3b53439	366	test "$(echo $(grep testfile1 CVS/Entries\|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
4a2284b9	367	test_cmp testfile1 ../testfile1'
b3b53439	368
1978659a FL	369	cd "$WORKDIR"
	370	test_expect_success 'cvs update (merge)' \
	371	'echo Line 0 >expected &&
	372	for i in 1 2 3 4 5 6 7
	373	do
cff4243d	374	echo Line $i >>merge &&
1978659a FL	375	echo Line $i >>expected
	376	done &&
	377	echo Line 8 >>expected &&
	378	git add merge &&
	379	git commit -q -m "Merge test (pre-merge)" &&
	380	git push gitcvs.git >/dev/null &&
	381	cd cvswork &&
	382	GIT_CONFIG="$git_config" cvs -Q update &&
	383	test "$(echo $(grep merge CVS/Entries\|cut -d/ -f2,3,5))" = "merge/1.1/" &&
4a2284b9	384	test_cmp merge ../merge &&
cff4243d	385	( echo Line 0 && cat merge ) >merge.tmp &&
1978659a FL	386	mv merge.tmp merge &&
	387	cd "$WORKDIR" &&
	388	echo Line 8 >>merge &&
	389	git add merge &&
	390	git commit -q -m "Merge test (merge)" &&
	391	git push gitcvs.git >/dev/null &&
	392	cd cvswork &&
b3c81cff	393	sleep 1 && touch merge &&
1978659a	394	GIT_CONFIG="$git_config" cvs -Q update &&
4a2284b9	395	test_cmp merge ../expected'
1978659a FL	396
	397	cd "$WORKDIR"
	398
	399	cat >expected.C <<EOF
	400	<<<<<<< merge.mine
	401	Line 0
	402	=======
	403	LINE 0
ab07681f	404	>>>>>>> merge.1.3
1978659a FL	405	EOF
	406
	407	for i in 1 2 3 4 5 6 7 8
	408	do
	409	echo Line $i >>expected.C
	410	done
	411
	412	test_expect_success 'cvs update (conflict merge)' \
cff4243d	413	'( echo LINE 0 && cat merge ) >merge.tmp &&
1978659a FL	414	mv merge.tmp merge &&
	415	git add merge &&
	416	git commit -q -m "Merge test (conflict)" &&
	417	git push gitcvs.git >/dev/null &&
	418	cd cvswork &&
	419	GIT_CONFIG="$git_config" cvs -Q update &&
4a2284b9	420	test_cmp merge ../expected.C'
1978659a FL	421
	422	cd "$WORKDIR"
	423	test_expect_success 'cvs update (-C)' \
	424	'cd cvswork &&
	425	GIT_CONFIG="$git_config" cvs -Q update -C &&
4a2284b9	426	test_cmp merge ../merge'
1978659a FL	427
	428	cd "$WORKDIR"
	429	test_expect_success 'cvs update (merge no-op)' \
	430	'echo Line 9 >>merge &&
	431	cp merge cvswork/merge &&
	432	git add merge &&
	433	git commit -q -m "Merge test (no-op)" &&
	434	git push gitcvs.git >/dev/null &&
	435	cd cvswork &&
b3c81cff	436	sleep 1 && touch merge &&
1978659a	437	GIT_CONFIG="$git_config" cvs -Q update &&
4a2284b9	438	test_cmp merge ../merge'
1978659a	439
6e8937a0 DD	440	cd "$WORKDIR"
	441	test_expect_success 'cvs update (-p)' '
	442	touch really-empty &&
	443	echo Line 1 > no-lf &&
6ecfd91d	444	printf "Line 2" >> no-lf &&
6e8937a0 DD	445	git add really-empty no-lf &&
	446	git commit -q -m "Update -p test" &&
	447	git push gitcvs.git >/dev/null &&
	448	cd cvswork &&
	449	GIT_CONFIG="$git_config" cvs update &&
6e8937a0	450	for i in merge no-lf empty really-empty; do
54ce2e9b SG	451	GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
	452	test_cmp $i.out ../$i \|\| return 1
	453	done
6e8937a0 DD	454	'
6e8937a0 DD	455
b0f2ecf5 LN	456	cd "$WORKDIR"
	457	test_expect_success 'cvs update (module list supports packed refs)' '
	458	GIT_DIR="$SERVERDIR" git pack-refs --all &&
	459	GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
	460	grep "cvs update: New directory \`master'\''" < out
	461	'
	462
dded801a DD	463	#------------
	464	# CVS STATUS
	465	#------------
	466
	467	cd "$WORKDIR"
	468	test_expect_success 'cvs status' '
	469	mkdir status.dir &&
	470	echo Line > status.dir/status.file &&
	471	echo Line > status.file &&
	472	git add status.dir status.file &&
	473	git commit -q -m "Status test" &&
	474	git push gitcvs.git >/dev/null &&
	475	cd cvswork &&
	476	GIT_CONFIG="$git_config" cvs update &&
	477	GIT_CONFIG="$git_config" cvs status \| grep "^File: status.file" >../out &&
3fb0459b	478	test_line_count = 2 ../out
dded801a DD	479	'
	480
	481	cd "$WORKDIR"
	482	test_expect_success 'cvs status (nonrecursive)' '
	483	cd cvswork &&
	484	GIT_CONFIG="$git_config" cvs status -l \| grep "^File: status.file" >../out &&
3fb0459b	485	test_line_count = 1 ../out
dded801a DD	486	'
	487
	488	cd "$WORKDIR"
	489	test_expect_success 'cvs status (no subdirs in header)' '
	490	cd cvswork &&
	491	GIT_CONFIG="$git_config" cvs status \| grep ^File: >../out &&
	492	! grep / <../out
	493	'
	494
42f7a2da FE	495	#------------
	496	# CVS CHECKOUT
	497	#------------
	498
	499	cd "$WORKDIR"
	500	test_expect_success 'cvs co -c (shows module database)' '
	501	GIT_CONFIG="$git_config" cvs co -c > out &&
27187817 JH	502	grep "^master[ ][ ]*master$" <out &&
27187817 JH	503	! grep -v "^master[ ][ ]*master$" <out
42f7a2da FE	504	'
42f7a2da FE	505
ef6fd72b MO	506	#------------
	507	# CVS LOG
	508	#------------
	509
	510	# Known issues with git-cvsserver current log output:
	511	# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
	512	# - CVS normally does not internally add a blank first line
235e8d59	513	# or a last line with nothing but a space to log messages.
ef6fd72b MO	514	# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
	515	# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
	516	# it converts to local time zone. git-cvsserver doesn't do the +0000
	517	# or the MT tags...
	518	# - The latest 1.12.x releases add a "commitid:" field on to the end of the
	519	# "date:" line (after "lines:"). Maybe we could stick git's commit id
	520	# in it? Or does CVS expect a certain number of bits (too few for
	521	# a full sha1)?
	522	#
	523	# Given the above, expect the following test to break if git-cvsserver's
	524	# log output is improved. The test is just to ensure it doesn't
	525	# accidentally get worse.
	526
	527	sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
	528	x
	529	xRCS file: $WORKDIR/gitcvs.git/master/merge,v
	530	xWorking file: merge
	531	xhead: 1.4
	532	xbranch:
	533	xlocks: strict
	534	xaccess list:
	535	xsymbolic names:
	536	xkeyword substitution: kv
	537	xtotal revisions: 4; selected revisions: 4
	538	xdescription:
	539	x----------------------------
	540	xrevision 1.4
	541	xdate: __DATE__; author: author; state: Exp; lines: +2 -3
	542	x
	543	xMerge test (no-op)
	544	xSP
	545	x----------------------------
	546	xrevision 1.3
	547	xdate: __DATE__; author: author; state: Exp; lines: +2 -3
	548	x
	549	xMerge test (conflict)
	550	xSP
	551	x----------------------------
	552	xrevision 1.2
	553	xdate: __DATE__; author: author; state: Exp; lines: +2 -3
	554	x
	555	xMerge test (merge)
	556	xSP
	557	x----------------------------
	558	xrevision 1.1
	559	xdate: __DATE__; author: author; state: Exp; lines: +2 -3
	560	x
	561	xMerge test (pre-merge)
	562	xSP
	563	x=============================================================================
	564	EOF
	565	expectStat="$?"
	566
	567	cd "$WORKDIR"
	568	test_expect_success 'cvs log' '
	569	cd cvswork &&
	570	test x"$expectStat" = x"0" &&
	571	GIT_CONFIG="$git_config" cvs log merge >../out &&
	572	sed -e "s%2[0-9][0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]%__DATE__%" ../out > ../actual &&
	573	test_cmp ../expect ../actual
	574	'
	575
7ceacdff JH	576	#------------
	577	# CVS ANNOTATE
	578	#------------
	579
	580	cd "$WORKDIR"
	581	test_expect_success 'cvs annotate' '
	582	cd cvswork &&
	583	GIT_CONFIG="$git_config" cvs annotate merge >../out &&
	584	sed -e "s/ .*//" ../out >../actual &&
	585	for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
	586	test_cmp ../expect ../actual
	587	'
	588
9a42c03c JK	589	#------------
	590	# running via git-shell
	591	#------------
	592
	593	cd "$WORKDIR"
	594
	595	test_expect_success 'create remote-cvs helper' '
	596	write_script remote-cvs <<-\EOF
	597	exec git shell -c "cvs server"
	598	EOF
	599	'
	600
	601	test_expect_success 'cvs server does not run with vanilla git-shell' '
	602	(
	603	cd cvswork &&
	604	CVS_SERVER=$WORKDIR/remote-cvs &&
	605	export CVS_SERVER &&
	606	test_must_fail cvs log merge
	607	)
	608	'
	609
	610	test_expect_success 'configure git shell to run cvs server' '
	611	mkdir "$HOME"/git-shell-commands &&
	612
	613	write_script "$HOME"/git-shell-commands/cvs <<-\EOF &&
	614	if ! test $# = 1 && test "$1" = "server"
	615	then
	616	echo >&2 "git-cvsserver only handles \"server\""
	617	exit 1
	618	fi
	619	exec git cvsserver server
	620	EOF
	621
	622	# Should not be used, but part of the recommended setup
	623	write_script "$HOME"/git-shell-commands/no-interactive-login <<-\EOF
	624	echo Interactive login forbidden
	625	EOF
	626	'
	627
	628	test_expect_success 'cvs server can run with recommended config' '
	629	(
	630	cd cvswork &&
	631	CVS_SERVER=$WORKDIR/remote-cvs &&
	632	export CVS_SERVER &&
	633	cvs log merge
	634	)
	635	'
	636
b3b53439	637	test_done