git/t/t9812-git-p4-wildcards.sh
Pete Wyckoff 79467e61aa git p4: handle files with wildcards when doing RCS scrubbing
Commit 9d7d446 (git p4: submit files with wildcards, 2012-04-29)
fixed problems with handling files that had p4 wildcard
characters, like "@" and "*".  But it missed one case, that of
RCS keyword scrubbing, which uses "p4 fstat" to extract type
information.  Fix it by calling wildcard_encode() on the raw
filename.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-01-22 08:06:19 -08:00

218 lines
4.9 KiB
Bash
Executable file

#!/bin/sh
test_description='git p4 wildcards'
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
start_p4d
'
test_expect_success 'add p4 files with wildcards in the names' '
(
cd "$cli" &&
printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
p4 add file2 &&
echo file-wild-hash >file-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
echo file-wild-star >file-wild\*star
fi &&
echo file-wild-at >file-wild@at &&
echo file-wild-percent >file-wild%percent &&
p4 add -f file-wild* &&
p4 submit -d "file wildcards"
)
'
test_expect_success 'wildcard files git p4 clone' '
git p4 clone --dest="$git" //depot &&
test_when_finished cleanup_git &&
(
cd "$git" &&
test -f file-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
test -f file-wild\*star
fi &&
test -f file-wild@at &&
test -f file-wild%percent
)
'
test_expect_success 'wildcard files submit back to p4, add' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
echo git-wild-hash >git-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
echo git-wild-star >git-wild\*star
fi &&
echo git-wild-at >git-wild@at &&
echo git-wild-percent >git-wild%percent &&
git add git-wild* &&
git commit -m "add some wildcard filenames" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit
) &&
(
cd "$cli" &&
test_path_is_file git-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
test_path_is_file git-wild\*star
fi &&
test_path_is_file git-wild@at &&
test_path_is_file git-wild%percent
)
'
test_expect_success 'wildcard files submit back to p4, modify' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
echo new-line >>git-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
echo new-line >>git-wild\*star
fi &&
echo new-line >>git-wild@at &&
echo new-line >>git-wild%percent &&
git add git-wild* &&
git commit -m "modify the wildcard files" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit
) &&
(
cd "$cli" &&
test_line_count = 2 git-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
test_line_count = 2 git-wild\*star
fi &&
test_line_count = 2 git-wild@at &&
test_line_count = 2 git-wild%percent
)
'
test_expect_success 'wildcard files submit back to p4, copy' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
cp file2 git-wild-cp#hash &&
git add git-wild-cp#hash &&
cp git-wild#hash file-wild-3 &&
git add file-wild-3 &&
git commit -m "wildcard copies" &&
git config git-p4.detectCopies true &&
git config git-p4.detectCopiesHarder true &&
git config git-p4.skipSubmitEdit true &&
git p4 submit
) &&
(
cd "$cli" &&
test_path_is_file git-wild-cp#hash &&
test_path_is_file file-wild-3
)
'
test_expect_success 'wildcard files submit back to p4, rename' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
git mv git-wild@at file-wild-4 &&
git mv file-wild-3 git-wild-cp%percent &&
git commit -m "wildcard renames" &&
git config git-p4.detectRenames true &&
git config git-p4.skipSubmitEdit true &&
git p4 submit
) &&
(
cd "$cli" &&
test_path_is_missing git-wild@at &&
test_path_is_file git-wild-cp%percent
)
'
test_expect_success 'wildcard files submit back to p4, delete' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
git rm git-wild* &&
git commit -m "delete the wildcard files" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit
) &&
(
cd "$cli" &&
test_path_is_missing git-wild#hash &&
if test_have_prereq NOT_MINGW NOT_CYGWIN
then
test_path_is_missing git-wild\*star
fi &&
test_path_is_missing git-wild@at &&
test_path_is_missing git-wild%percent
)
'
test_expect_success 'p4 deleted a wildcard file' '
(
cd "$cli" &&
echo "wild delete test" >wild@delete &&
p4 add -f wild@delete &&
p4 submit -d "add wild@delete"
) &&
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
test_path_is_file wild@delete
) &&
(
cd "$cli" &&
# must use its encoded name
p4 delete wild%40delete &&
p4 submit -d "delete wild@delete"
) &&
(
cd "$git" &&
git p4 sync &&
git merge --ff-only p4/master &&
test_path_is_missing wild@delete
)
'
test_expect_success 'wildcard files requiring keyword scrub' '
(
cd "$cli" &&
cat <<-\EOF >scrub@wild &&
$Id$
line2
EOF
p4 add -t text+k -f scrub@wild &&
p4 submit -d "scrub at wild"
) &&
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
git config git-p4.skipSubmitEdit true &&
git config git-p4.attemptRCSCleanup true &&
sed "s/^line2/line2 edit/" <scrub@wild >scrub@wild.tmp &&
mv -f scrub@wild.tmp scrub@wild &&
git commit -m "scrub at wild line2 edit" scrub@wild &&
git p4 submit
)
'
test_expect_success 'kill p4d' '
kill_p4d
'
test_done