blob: 9502f2438aeeb47c0881b80326a4152002fc23ad [file] [log] [blame]
Frank Lichtenheldb3b53432007-05-02 02:45:22 +02001#!/bin/sh
2#
3# Copyright (c) 2007 Frank Lichtenheld
4#
5
6test_description='git-cvsserver access
7
8tests read access to a git repository with the
9cvs CLI client via git-cvsserver server'
10
11. ./test-lib.sh
12
Jeff King1b19ccd2009-04-03 15:33:59 -040013if ! test_have_prereq PERL; then
Ævar Arnfjörð Bjarmasonfadb5152010-06-24 17:44:48 +000014 skip_all='skipping git cvsserver tests, perl not available'
Jeff King1b19ccd2009-04-03 15:33:59 -040015 test_done
16fi
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020017cvs >/dev/null 2>&1
18if test $? -ne 1
19then
Ævar Arnfjörð Bjarmasonfadb5152010-06-24 17:44:48 +000020 skip_all='skipping git-cvsserver tests, cvs not found'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020021 test_done
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020022fi
Philippe Bruhat (BooK)be38ca32009-11-17 09:42:39 +010023"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
Ævar Arnfjörð Bjarmasonfadb5152010-06-24 17:44:48 +000024 skip_all='skipping git-cvsserver tests, Perl SQLite interface unavailable'
Junio C Hamano469be5b2007-05-09 09:19:42 -070025 test_done
Junio C Hamano469be5b2007-05-09 09:19:42 -070026}
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020027
28unset GIT_DIR GIT_CONFIG
29WORKDIR=$(pwd)
30SERVERDIR=$(pwd)/gitcvs.git
Junio Hamanoa25907d2007-05-11 16:35:18 -070031git_config="$SERVERDIR/config"
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020032CVSROOT=":fork:$SERVERDIR"
Junio Hamanoa25907d2007-05-11 16:35:18 -070033CVSWORK="$(pwd)/cvswork"
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020034CVS_SERVER=git-cvsserver
35export CVSROOT CVS_SERVER
36
37rm -rf "$CVSWORK" "$SERVERDIR"
Steffen Prohaska75493762008-01-26 10:54:05 +010038test_expect_success 'setup' '
39 echo >empty &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020040 git add empty &&
41 git commit -q -m "First Commit" &&
Steffen Prohaskae509db92008-01-26 10:54:06 +010042 mkdir secondroot &&
43 ( cd secondroot &&
44 git init &&
45 touch secondrootfile &&
46 git add secondrootfile &&
47 git commit -m "second root") &&
48 git pull secondroot master &&
Johannes Sixt7fd3ef12009-03-07 00:04:09 +010049 git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020050 GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
Ævar Arnfjörð Bjarmason1dd3f292010-05-15 02:46:04 +000051 GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
52 GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
53 echo cvsuser:cvGVEarMLnhlA > "$SERVERDIR/auth.db"
Steffen Prohaska75493762008-01-26 10:54:05 +010054'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020055
56# note that cvs doesn't accept absolute pathnames
57# as argument to co -d
58test_expect_success 'basic checkout' \
Junio Hamanoa25907d2007-05-11 16:35:18 -070059 'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
Jonathan Niedera48fcd82010-10-30 20:46:54 -050060 test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
Jeff Kingb4ce54f2008-03-12 17:34:34 -040061 test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +020062
Frank Lichtenheld240ba7f2007-05-21 00:31:58 +020063#------------------------
64# PSERVER AUTHENTICATION
65#------------------------
66
67cat >request-anonymous <<EOF
68BEGIN AUTH REQUEST
69$SERVERDIR
70anonymous
71
72END AUTH REQUEST
73EOF
74
75cat >request-git <<EOF
76BEGIN AUTH REQUEST
77$SERVERDIR
78git
79
80END AUTH REQUEST
81EOF
82
Frank Lichtenheld24a97d82007-05-27 14:33:10 +020083cat >login-anonymous <<EOF
84BEGIN VERIFICATION REQUEST
85$SERVERDIR
86anonymous
87
88END VERIFICATION REQUEST
89EOF
90
91cat >login-git <<EOF
92BEGIN VERIFICATION REQUEST
93$SERVERDIR
94git
95
96END VERIFICATION REQUEST
97EOF
98
Ævar Arnfjörð Bjarmason1dd3f292010-05-15 02:46:04 +000099cat >login-git-ok <<EOF
100BEGIN VERIFICATION REQUEST
101$SERVERDIR
102cvsuser
103Ah<Z:yZZ30 e
104END VERIFICATION REQUEST
105EOF
106
Frank Lichtenheld240ba7f2007-05-21 00:31:58 +0200107test_expect_success 'pserver authentication' \
108 'cat request-anonymous | git-cvsserver pserver >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800109 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld240ba7f2007-05-21 00:31:58 +0200110
111test_expect_success 'pserver authentication failure (non-anonymous user)' \
112 'if cat request-git | git-cvsserver pserver >log 2>&1
113 then
114 false
115 else
116 true
117 fi &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800118 sed -ne \$p log | grep "^I HATE YOU\$"'
Frank Lichtenheld240ba7f2007-05-21 00:31:58 +0200119
Ævar Arnfjörð Bjarmason1dd3f292010-05-15 02:46:04 +0000120test_expect_success 'pserver authentication success (non-anonymous user with password)' \
121 'cat login-git-ok | git-cvsserver pserver >log 2>&1 &&
122 sed -ne \$p log | grep "^I LOVE YOU\$"'
123
Frank Lichtenheld24a97d82007-05-27 14:33:10 +0200124test_expect_success 'pserver authentication (login)' \
125 'cat login-anonymous | git-cvsserver pserver >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800126 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld24a97d82007-05-27 14:33:10 +0200127
128test_expect_success 'pserver authentication failure (login/non-anonymous user)' \
129 'if cat login-git | git-cvsserver pserver >log 2>&1
130 then
131 false
132 else
133 true
134 fi &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800135 sed -ne \$p log | grep "^I HATE YOU\$"'
Frank Lichtenheld24a97d82007-05-27 14:33:10 +0200136
Frank Lichtenheld240ba7f2007-05-21 00:31:58 +0200137
Frank Lichtenheld48908882007-06-07 16:57:00 +0200138# misuse pserver authentication for testing of req_Root
139
140cat >request-relative <<EOF
141BEGIN AUTH REQUEST
142gitcvs.git
143anonymous
144
145END AUTH REQUEST
146EOF
147
148cat >request-conflict <<EOF
149BEGIN AUTH REQUEST
150$SERVERDIR
151anonymous
152
153END AUTH REQUEST
154Root $WORKDIR
155EOF
156
157test_expect_success 'req_Root failure (relative pathname)' \
158 'if cat request-relative | git-cvsserver pserver >log 2>&1
159 then
160 echo unexpected success
161 false
162 else
163 true
164 fi &&
Jeff Kingaadbe442008-03-12 17:32:17 -0400165 tail log | grep "^error 1 Root must be an absolute pathname$"'
Frank Lichtenheld48908882007-06-07 16:57:00 +0200166
167test_expect_success 'req_Root failure (conflicting roots)' \
168 'cat request-conflict | git-cvsserver pserver >log 2>&1 &&
Jeff Kingaadbe442008-03-12 17:32:17 -0400169 tail log | grep "^error 1 Conflicting roots specified$"'
Frank Lichtenheld48908882007-06-07 16:57:00 +0200170
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200171test_expect_success 'req_Root (strict paths)' \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400172 'cat request-anonymous | git-cvsserver --strict-paths pserver "$SERVERDIR" >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800173 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200174
Junio C Hamano41ac4142008-02-01 01:50:53 -0800175test_expect_success 'req_Root failure (strict-paths)' '
176 ! cat request-anonymous |
Bryan Donlanf69e8362008-05-04 01:37:59 -0400177 git-cvsserver --strict-paths pserver "$WORKDIR" >log 2>&1
Junio C Hamano41ac4142008-02-01 01:50:53 -0800178'
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200179
180test_expect_success 'req_Root (w/o strict-paths)' \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400181 'cat request-anonymous | git-cvsserver pserver "$WORKDIR/" >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800182 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200183
Junio C Hamano41ac4142008-02-01 01:50:53 -0800184test_expect_success 'req_Root failure (w/o strict-paths)' '
185 ! cat request-anonymous |
Bryan Donlanf69e8362008-05-04 01:37:59 -0400186 git-cvsserver pserver "$WORKDIR/gitcvs" >log 2>&1
Junio C Hamano41ac4142008-02-01 01:50:53 -0800187'
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200188
189cat >request-base <<EOF
190BEGIN AUTH REQUEST
191/gitcvs.git
192anonymous
193
194END AUTH REQUEST
Frank Lichtenheldfd1cd912007-06-15 03:01:52 +0200195Root /gitcvs.git
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200196EOF
197
198test_expect_success 'req_Root (base-path)' \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400199 'cat request-base | git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800200 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld693b6322007-06-07 16:57:01 +0200201
Junio C Hamano41ac4142008-02-01 01:50:53 -0800202test_expect_success 'req_Root failure (base-path)' '
203 ! cat request-anonymous |
Bryan Donlanf69e8362008-05-04 01:37:59 -0400204 git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" >log 2>&1
Junio C Hamano41ac4142008-02-01 01:50:53 -0800205'
Frank Lichtenheld48908882007-06-07 16:57:00 +0200206
Frank Lichtenheld226bccb2007-06-15 03:01:53 +0200207GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false || exit 1
208
209test_expect_success 'req_Root (export-all)' \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400210 'cat request-anonymous | git-cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800211 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld226bccb2007-06-15 03:01:53 +0200212
Junio C Hamano41ac4142008-02-01 01:50:53 -0800213test_expect_success 'req_Root failure (export-all w/o whitelist)' \
214 '! (cat request-anonymous | git-cvsserver --export-all pserver >log 2>&1 || false)'
Frank Lichtenheld226bccb2007-06-15 03:01:53 +0200215
216test_expect_success 'req_Root (everything together)' \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400217 'cat request-base | git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
Stephen Boyd9524cf22010-01-26 15:08:31 -0800218 sed -ne \$p log | grep "^I LOVE YOU\$"'
Frank Lichtenheld226bccb2007-06-15 03:01:53 +0200219
220GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true || exit 1
221
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200222#--------------
223# CONFIG TESTS
224#--------------
225
226test_expect_success 'gitcvs.enabled = false' \
227 'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
228 if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
229 then
230 echo unexpected cvs success
231 false
232 else
233 true
234 fi &&
Jeff Kingaadbe442008-03-12 17:32:17 -0400235 grep "GITCVS emulation disabled" cvs.log &&
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200236 test ! -d cvswork2'
237
238rm -fr cvswork2
239test_expect_success 'gitcvs.ext.enabled = true' \
240 'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
241 GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
242 GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800243 test_cmp cvswork cvswork2'
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200244
245rm -fr cvswork2
246test_expect_success 'gitcvs.ext.enabled = false' \
247 'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
248 GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
249 if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
250 then
251 echo unexpected cvs success
252 false
253 else
254 true
255 fi &&
Jeff Kingaadbe442008-03-12 17:32:17 -0400256 grep "GITCVS emulation disabled" cvs.log &&
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200257 test ! -d cvswork2'
258
259rm -fr cvswork2
260test_expect_success 'gitcvs.dbname' \
261 'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
262 GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
263 GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800264 test_cmp cvswork cvswork2 &&
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200265 test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
266 cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'
267
268rm -fr cvswork2
269test_expect_success 'gitcvs.ext.dbname' \
270 'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
271 GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
272 GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
273 GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800274 test_cmp cvswork cvswork2 &&
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200275 test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
276 test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
277 cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'
278
279
280#------------
281# CVS UPDATE
282#------------
283
284rm -fr "$SERVERDIR"
285cd "$WORKDIR" &&
Johannes Sixt7fd3ef12009-03-07 00:04:09 +0100286git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200287GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
Frank Lichtenhelddb1696b2007-06-25 16:00:24 +0200288GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" ||
Frank Lichtenheld1d431b22007-05-21 00:31:56 +0200289exit 1
290
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200291test_expect_success 'cvs update (create new file)' \
292 'echo testfile1 >testfile1 &&
293 git add testfile1 &&
294 git commit -q -m "Add testfile1" &&
295 git push gitcvs.git >/dev/null &&
296 cd cvswork &&
Junio Hamanoa25907d2007-05-11 16:35:18 -0700297 GIT_CONFIG="$git_config" cvs -Q update &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200298 test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800299 test_cmp testfile1 ../testfile1'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200300
301cd "$WORKDIR"
302test_expect_success 'cvs update (update existing file)' \
303 'echo line 2 >>testfile1 &&
304 git add testfile1 &&
305 git commit -q -m "Append to testfile1" &&
306 git push gitcvs.git >/dev/null &&
307 cd cvswork &&
Junio Hamanoa25907d2007-05-11 16:35:18 -0700308 GIT_CONFIG="$git_config" cvs -Q update &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200309 test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800310 test_cmp testfile1 ../testfile1'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200311
312cd "$WORKDIR"
313#TODO: cvsserver doesn't support update w/o -d
Junio C Hamano41ac4142008-02-01 01:50:53 -0800314test_expect_failure "cvs update w/o -d doesn't create subdir (TODO)" '
315 mkdir test &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200316 echo >test/empty &&
317 git add test &&
318 git commit -q -m "Single Subdirectory" &&
319 git push gitcvs.git >/dev/null &&
320 cd cvswork &&
Junio Hamanoa25907d2007-05-11 16:35:18 -0700321 GIT_CONFIG="$git_config" cvs -Q update &&
Junio C Hamano41ac4142008-02-01 01:50:53 -0800322 test ! -d test
323'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200324
325cd "$WORKDIR"
326test_expect_success 'cvs update (subdirectories)' \
327 '(for dir in A A/B A/B/C A/D E; do
328 mkdir $dir &&
329 echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")" &&
330 git add $dir;
331 done) &&
332 git commit -q -m "deep sub directory structure" &&
333 git push gitcvs.git >/dev/null &&
334 cd cvswork &&
Junio Hamanoa25907d2007-05-11 16:35:18 -0700335 GIT_CONFIG="$git_config" cvs -Q update -d &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200336 (for dir in A A/B A/B/C A/D E; do
337 filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
338 if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800339 test_cmp "$dir/$filename" "../$dir/$filename"; then
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200340 :
341 else
342 echo >failure
343 fi
344 done) &&
345 test ! -f failure'
346
347cd "$WORKDIR"
348test_expect_success 'cvs update (delete file)' \
349 'git rm testfile1 &&
350 git commit -q -m "Remove testfile1" &&
351 git push gitcvs.git >/dev/null &&
352 cd cvswork &&
Junio Hamanoa25907d2007-05-11 16:35:18 -0700353 GIT_CONFIG="$git_config" cvs -Q update &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200354 test -z "$(grep testfile1 CVS/Entries)" &&
355 test ! -f testfile1'
356
357cd "$WORKDIR"
358test_expect_success 'cvs update (re-add deleted file)' \
359 'echo readded testfile >testfile1 &&
360 git add testfile1 &&
361 git commit -q -m "Re-Add testfile1" &&
362 git push gitcvs.git >/dev/null &&
363 cd cvswork &&
Junio Hamanoa25907d2007-05-11 16:35:18 -0700364 GIT_CONFIG="$git_config" cvs -Q update &&
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200365 test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800366 test_cmp testfile1 ../testfile1'
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200367
Frank Lichtenheld19786592007-05-21 00:31:57 +0200368cd "$WORKDIR"
369test_expect_success 'cvs update (merge)' \
370 'echo Line 0 >expected &&
371 for i in 1 2 3 4 5 6 7
372 do
373 echo Line $i >>merge
374 echo Line $i >>expected
375 done &&
376 echo Line 8 >>expected &&
377 git add merge &&
378 git commit -q -m "Merge test (pre-merge)" &&
379 git push gitcvs.git >/dev/null &&
380 cd cvswork &&
381 GIT_CONFIG="$git_config" cvs -Q update &&
382 test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800383 test_cmp merge ../merge &&
Frank Lichtenheld19786592007-05-21 00:31:57 +0200384 ( echo Line 0; cat merge ) >merge.tmp &&
385 mv merge.tmp merge &&
386 cd "$WORKDIR" &&
387 echo Line 8 >>merge &&
388 git add merge &&
389 git commit -q -m "Merge test (merge)" &&
390 git push gitcvs.git >/dev/null &&
391 cd cvswork &&
Frank Lichtenheldb3c81cf2007-05-27 14:33:09 +0200392 sleep 1 && touch merge &&
Frank Lichtenheld19786592007-05-21 00:31:57 +0200393 GIT_CONFIG="$git_config" cvs -Q update &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800394 test_cmp merge ../expected'
Frank Lichtenheld19786592007-05-21 00:31:57 +0200395
396cd "$WORKDIR"
397
398cat >expected.C <<EOF
399<<<<<<< merge.mine
400Line 0
401=======
402LINE 0
Matthew Ogilvieab076812012-10-13 23:42:21 -0600403>>>>>>> merge.1.3
Frank Lichtenheld19786592007-05-21 00:31:57 +0200404EOF
405
406for i in 1 2 3 4 5 6 7 8
407do
408 echo Line $i >>expected.C
409done
410
411test_expect_success 'cvs update (conflict merge)' \
412 '( echo LINE 0; cat merge ) >merge.tmp &&
413 mv merge.tmp merge &&
414 git add merge &&
415 git commit -q -m "Merge test (conflict)" &&
416 git push gitcvs.git >/dev/null &&
417 cd cvswork &&
418 GIT_CONFIG="$git_config" cvs -Q update &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800419 test_cmp merge ../expected.C'
Frank Lichtenheld19786592007-05-21 00:31:57 +0200420
421cd "$WORKDIR"
422test_expect_success 'cvs update (-C)' \
423 'cd cvswork &&
424 GIT_CONFIG="$git_config" cvs -Q update -C &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800425 test_cmp merge ../merge'
Frank Lichtenheld19786592007-05-21 00:31:57 +0200426
427cd "$WORKDIR"
428test_expect_success 'cvs update (merge no-op)' \
429 'echo Line 9 >>merge &&
430 cp merge cvswork/merge &&
431 git add merge &&
432 git commit -q -m "Merge test (no-op)" &&
433 git push gitcvs.git >/dev/null &&
434 cd cvswork &&
Frank Lichtenheldb3c81cf2007-05-27 14:33:09 +0200435 sleep 1 && touch merge &&
Frank Lichtenheld19786592007-05-21 00:31:57 +0200436 GIT_CONFIG="$git_config" cvs -Q update &&
Junio C Hamano4a2284b2010-03-11 21:40:33 -0800437 test_cmp merge ../merge'
Frank Lichtenheld19786592007-05-21 00:31:57 +0200438
Damien Diederen6e8937a2008-03-27 23:18:23 +0100439cd "$WORKDIR"
440test_expect_success 'cvs update (-p)' '
441 touch really-empty &&
442 echo Line 1 > no-lf &&
Brian Gernhardt6ecfd912008-10-31 01:09:13 -0400443 printf "Line 2" >> no-lf &&
Damien Diederen6e8937a2008-03-27 23:18:23 +0100444 git add really-empty no-lf &&
445 git commit -q -m "Update -p test" &&
446 git push gitcvs.git >/dev/null &&
447 cd cvswork &&
448 GIT_CONFIG="$git_config" cvs update &&
449 rm -f failures &&
450 for i in merge no-lf empty really-empty; do
451 GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
Gary V. Vaughan4fdf71b2010-05-14 09:31:37 +0000452 test_cmp $i.out ../$i >>failures 2>&1
Damien Diederen6e8937a2008-03-27 23:18:23 +0100453 done &&
454 test -z "$(cat failures)"
455'
456
Lars Noschinskib0f2ecf2008-07-17 19:00:28 +0200457cd "$WORKDIR"
458test_expect_success 'cvs update (module list supports packed refs)' '
459 GIT_DIR="$SERVERDIR" git pack-refs --all &&
460 GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
461 grep "cvs update: New directory \`master'\''" < out
462'
463
Damien Diederendded8012008-03-27 23:18:02 +0100464#------------
465# CVS STATUS
466#------------
467
468cd "$WORKDIR"
469test_expect_success 'cvs status' '
470 mkdir status.dir &&
471 echo Line > status.dir/status.file &&
472 echo Line > status.file &&
473 git add status.dir status.file &&
474 git commit -q -m "Status test" &&
475 git push gitcvs.git >/dev/null &&
476 cd cvswork &&
477 GIT_CONFIG="$git_config" cvs update &&
478 GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
Stefano Lattarini3fb04592012-04-11 13:24:01 +0200479 test_line_count = 2 ../out
Damien Diederendded8012008-03-27 23:18:02 +0100480'
481
482cd "$WORKDIR"
483test_expect_success 'cvs status (nonrecursive)' '
484 cd cvswork &&
485 GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
Stefano Lattarini3fb04592012-04-11 13:24:01 +0200486 test_line_count = 1 ../out
Damien Diederendded8012008-03-27 23:18:02 +0100487'
488
489cd "$WORKDIR"
490test_expect_success 'cvs status (no subdirs in header)' '
491 cd cvswork &&
492 GIT_CONFIG="$git_config" cvs status | grep ^File: >../out &&
493 ! grep / <../out
494'
495
Fabian Emmes42f7a2d2008-07-17 19:00:30 +0200496#------------
497# CVS CHECKOUT
498#------------
499
500cd "$WORKDIR"
501test_expect_success 'cvs co -c (shows module database)' '
502 GIT_CONFIG="$git_config" cvs co -c > out &&
Junio C Hamano27187812012-04-19 13:05:26 -0700503 grep "^master[ ][ ]*master$" <out &&
504 ! grep -v "^master[ ][ ]*master$" <out
Fabian Emmes42f7a2d2008-07-17 19:00:30 +0200505'
506
Junio C Hamano7ceacdf2008-09-05 00:57:35 -0700507#------------
Matthew Ogilvieef6fd722012-10-13 23:42:14 -0600508# CVS LOG
509#------------
510
511# Known issues with git-cvsserver current log output:
512# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
513# - CVS normally does not internally add a blank first line
514# nor a last line with nothing but a space to log messages.
515# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
516# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
517# it converts to local time zone. git-cvsserver doesn't do the +0000
518# or the MT tags...
519# - The latest 1.12.x releases add a "commitid:" field on to the end of the
520# "date:" line (after "lines:"). Maybe we could stick git's commit id
521# in it? Or does CVS expect a certain number of bits (too few for
522# a full sha1)?
523#
524# Given the above, expect the following test to break if git-cvsserver's
525# log output is improved. The test is just to ensure it doesn't
526# accidentally get worse.
527
528sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
529x
530xRCS file: $WORKDIR/gitcvs.git/master/merge,v
531xWorking file: merge
532xhead: 1.4
533xbranch:
534xlocks: strict
535xaccess list:
536xsymbolic names:
537xkeyword substitution: kv
538xtotal revisions: 4; selected revisions: 4
539xdescription:
540x----------------------------
541xrevision 1.4
542xdate: __DATE__; author: author; state: Exp; lines: +2 -3
543x
544xMerge test (no-op)
545xSP
546x----------------------------
547xrevision 1.3
548xdate: __DATE__; author: author; state: Exp; lines: +2 -3
549x
550xMerge test (conflict)
551xSP
552x----------------------------
553xrevision 1.2
554xdate: __DATE__; author: author; state: Exp; lines: +2 -3
555x
556xMerge test (merge)
557xSP
558x----------------------------
559xrevision 1.1
560xdate: __DATE__; author: author; state: Exp; lines: +2 -3
561x
562xMerge test (pre-merge)
563xSP
564x=============================================================================
565EOF
566expectStat="$?"
567
568cd "$WORKDIR"
569test_expect_success 'cvs log' '
570 cd cvswork &&
571 test x"$expectStat" = x"0" &&
572 GIT_CONFIG="$git_config" cvs log merge >../out &&
573 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 &&
574 test_cmp ../expect ../actual
575'
576
577#------------
Junio C Hamano7ceacdf2008-09-05 00:57:35 -0700578# CVS ANNOTATE
579#------------
580
581cd "$WORKDIR"
582test_expect_success 'cvs annotate' '
583 cd cvswork &&
584 GIT_CONFIG="$git_config" cvs annotate merge >../out &&
585 sed -e "s/ .*//" ../out >../actual &&
586 for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
587 test_cmp ../expect ../actual
588'
589
Frank Lichtenheldb3b53432007-05-02 02:45:22 +0200590test_done