#!/bin/sh # # Copyright (c) Robin Rosenberg # test_description='Test export of commits to CVS' . ./test-lib.sh cvs >/dev/null 2>&1 if test $? -ne 1 then test_expect_success 'skipping git-cvsexportcommit tests, cvs not found' : test_done exit fi CVSROOT=$(pwd)/cvsroot CVSWORK=$(pwd)/cvswork GIT_DIR=$(pwd)/.git export CVSROOT CVSWORK GIT_DIR rm -rf "$CVSROOT" "$CVSWORK" mkdir "$CVSROOT" && cvs init && cvs -Q co -d "$CVSWORK" . && echo >empty && git add empty && git commit -q -a -m "Initial" 2>/dev/null || exit 1 check_entries () { # $1 == directory, $2 == expected grep '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual if test -z "$2" then >expected else printf '%s\n' "$2" | tr '|' '\012' >expected fi test_cmp expected actual } test_expect_success \ 'New file' \ 'mkdir A B C D E F && echo hello1 >A/newfile1.txt && echo hello2 >B/newfile2.txt && cp ../test9200a.png C/newfile3.png && cp ../test9200a.png D/newfile4.png && git add A/newfile1.txt && git add B/newfile2.txt && git add C/newfile3.png && git add D/newfile4.png && git commit -a -m "Test: New file" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "newfile1.txt/1.1/" && check_entries B "newfile2.txt/1.1/" && check_entries C "newfile3.png/1.1/-kb" && check_entries D "newfile4.png/1.1/-kb" && diff A/newfile1.txt ../A/newfile1.txt && diff B/newfile2.txt ../B/newfile2.txt && diff C/newfile3.png ../C/newfile3.png && diff D/newfile4.png ../D/newfile4.png )' test_expect_success \ 'Remove two files, add two and update two' \ 'echo Hello1 >>A/newfile1.txt && rm -f B/newfile2.txt && rm -f C/newfile3.png && echo Hello5 >E/newfile5.txt && cp ../test9200b.png D/newfile4.png && cp ../test9200a.png F/newfile6.png && git add E/newfile5.txt && git add F/newfile6.png && git commit -a -m "Test: Remove, add and update" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "newfile1.txt/1.2/" && check_entries B "" && check_entries C "" && check_entries D "newfile4.png/1.2/-kb" && check_entries E "newfile5.txt/1.1/" && check_entries F "newfile6.png/1.1/-kb" && diff A/newfile1.txt ../A/newfile1.txt && diff D/newfile4.png ../D/newfile4.png && diff E/newfile5.txt ../E/newfile5.txt && diff F/newfile6.png ../F/newfile6.png )' # Should fail (but only on the git-cvsexportcommit stage) test_expect_success \ 'Fail to change binary more than one generation old' \ 'cat F/newfile6.png >>D/newfile4.png && git commit -a -m "generatiion 1" && cat F/newfile6.png >>D/newfile4.png && git commit -a -m "generation 2" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && ! git cvsexportcommit -c $id )' #test_expect_success \ # 'Fail to remove binary file more than one generation old' \ # 'git reset --hard HEAD^ && # cat F/newfile6.png >>D/newfile4.png && # git commit -a -m "generation 2 (again)" && # rm -f D/newfile4.png && # git commit -a -m "generation 3" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # ! git cvsexportcommit -c $id # )' # We reuse the state from two tests back here # This test is here because a patch for only binary files will # fail with gnu patch, so cvsexportcommit must handle that. test_expect_success \ 'Remove only binary files' \ 'git reset --hard HEAD^^ && rm -f D/newfile4.png && git commit -a -m "test: remove only a binary file" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "newfile1.txt/1.2/" && check_entries B "" && check_entries C "" && check_entries D "" && check_entries E "newfile5.txt/1.1/" && check_entries F "newfile6.png/1.1/-kb" && diff A/newfile1.txt ../A/newfile1.txt && diff E/newfile5.txt ../E/newfile5.txt && diff F/newfile6.png ../F/newfile6.png )' test_expect_success \ 'Remove only a text file' \ 'rm -f A/newfile1.txt && git commit -a -m "test: remove only a binary file" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "" && check_entries B "" && check_entries C "" && check_entries D "" && check_entries E "newfile5.txt/1.1/" && check_entries F "newfile6.png/1.1/-kb" && diff E/newfile5.txt ../E/newfile5.txt && diff F/newfile6.png ../F/newfile6.png )' test_expect_success \ 'New file with spaces in file name' \ 'mkdir "G g" && echo ok then >"G g/with spaces.txt" && git add "G g/with spaces.txt" && \ cp ../test9200a.png "G g/with spaces.png" && \ git add "G g/with spaces.png" && git commit -a -m "With spaces" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git-cvsexportcommit -c $id && check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/" )' test_expect_success \ 'Update file with spaces in file name' \ 'echo Ok then >>"G g/with spaces.txt" && cat ../test9200a.png >>"G g/with spaces.png" && \ git add "G g/with spaces.png" && git commit -a -m "Update with spaces" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git-cvsexportcommit -c $id check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/" )' # Some filesystems mangle pathnames with UTF-8 characters -- # check and skip if p="Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" && mkdir -p "tst/$p" && date >"tst/$p/day" && found=$(find tst -type f -print) && test "z$found" = "ztst/$p/day" && rm -fr tst then # This test contains UTF-8 characters test_expect_success \ 'File with non-ascii file name' \ 'mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö && echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && cp ../test9200a.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && git commit -a -m "Går det så går det" && \ id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git-cvsexportcommit -v -c $id && check_entries \ "Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \ "gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/" )' fi rm -fr tst test_expect_success \ 'Mismatching patch should fail' \ 'date >>"E/newfile5.txt" && git add "E/newfile5.txt" && git commit -a -m "Update one" && date >>"E/newfile5.txt" && git add "E/newfile5.txt" && git commit -a -m "Update two" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && ! git-cvsexportcommit -c $id )' case "$(git config --bool core.filemode)" in false) ;; *) test_expect_success \ 'Retain execute bit' \ 'mkdir G && echo executeon >G/on && chmod +x G/on && echo executeoff >G/off && git add G/on && git add G/off && git commit -a -m "Execute test" && (cd "$CVSWORK" && git-cvsexportcommit -c HEAD test -x G/on && ! test -x G/off )' ;; esac test_expect_success '-w option should work with relative GIT_DIR' ' mkdir W && echo foobar >W/file1.txt && echo bazzle >W/file2.txt && git add W/file1.txt && git add W/file2.txt && git commit -m "More updates" && id=$(git rev-list --max-count=1 HEAD) && (cd "$GIT_DIR" && GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id && check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" && test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt && test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt ) ' test_expect_success 'check files before directories' ' echo Notes > release-notes && git add release-notes && git commit -m "Add release notes" release-notes && id=$(git rev-parse HEAD) && git cvsexportcommit -w "$CVSWORK" -c $id && echo new > DS && echo new > E/DS && echo modified > release-notes && git add DS E/DS release-notes && git commit -m "Add two files with the same basename" && id=$(git rev-parse HEAD) && git cvsexportcommit -w "$CVSWORK" -c $id && check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" && check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" && test_cmp "$CVSWORK/DS" DS && test_cmp "$CVSWORK/E/DS" E/DS && test_cmp "$CVSWORK/release-notes" release-notes ' test_expect_success 'commit a file with leading spaces in the name' ' echo space > " space" && git add " space" && git commit -m "Add a file with a leading space" && id=$(git rev-parse HEAD) && git cvsexportcommit -w "$CVSWORK" -c $id && check_entries "$CVSWORK" " space/1.1/|DS/1.1/|release-notes/1.2/" && test_cmp "$CVSWORK/ space" " space" ' test_done