#!/bin/sh test_description='git p4 submit' . ./lib-git-p4.sh test_expect_success 'start p4d' ' start_p4d ' test_expect_success 'init depot' ' ( cd "$cli" && echo file1 >file1 && p4 add file1 && p4 submit -d "change 1" ) ' test_expect_success 'is_cli_file_writeable function' ' ( cd "$cli" && echo a >a && is_cli_file_writeable a && ! is_cli_file_writeable file1 && rm a ) ' test_expect_success 'submit with no client dir' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo file2 >file2 && git add file2 && git commit -m "git commit 2" && rm -rf "$cli" && git config git-p4.skipSubmitEdit true && git p4 submit ) && ( cd "$cli" && test_path_is_file file1 && test_path_is_file file2 ) ' # make two commits, but tell it to apply only from HEAD^ test_expect_success 'submit --origin' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && test_commit "file3" && test_commit "file4" && git config git-p4.skipSubmitEdit true && git p4 submit --origin=HEAD^ ) && ( cd "$cli" && test_path_is_missing "file3.t" && test_path_is_file "file4.t" ) ' test_expect_success 'submit --dry-run' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && test_commit "dry-run1" && test_commit "dry-run2" && git p4 submit --dry-run >out && test_i18ngrep "Would apply" out ) && ( cd "$cli" && test_path_is_missing "dry-run1.t" && test_path_is_missing "dry-run2.t" ) ' test_expect_success 'submit --dry-run --export-labels' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo dry-run1 >dry-run1 && git add dry-run1 && git commit -m "dry-run1" dry-run1 && git config git-p4.skipSubmitEdit true && git p4 submit && echo dry-run2 >dry-run2 && git add dry-run2 && git commit -m "dry-run2" dry-run2 && git tag -m "dry-run-tag1" dry-run-tag1 HEAD^ && git p4 submit --dry-run --export-labels >out && test_i18ngrep "Would create p4 label" out ) && ( cd "$cli" && test_path_is_file "dry-run1" && test_path_is_missing "dry-run2" ) ' test_expect_success 'submit with allowSubmit' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && test_commit "file5" && git config git-p4.skipSubmitEdit true && git config git-p4.allowSubmit "nobranch" && test_must_fail git p4 submit && git config git-p4.allowSubmit "nobranch,master" && git p4 submit ) ' test_expect_success 'submit with master branch name from argv' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && test_commit "file6" && git config git-p4.skipSubmitEdit true && test_must_fail git p4 submit nobranch && git branch otherbranch && git reset --hard HEAD^ && test_commit "file7" && git p4 submit otherbranch ) && ( cd "$cli" && test_path_is_file "file6.t" && test_path_is_missing "file7.t" ) ' test_expect_success 'allow submit from branch with same revision but different name' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && test_commit "file8" && git checkout -b branch1 && git checkout -b branch2 && git config git-p4.skipSubmitEdit true && git config git-p4.allowSubmit "branch1" && test_must_fail git p4 submit && git checkout branch1 && git p4 submit ) ' # # Basic submit tests, the five handled cases # test_expect_success 'submit modify' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && git config git-p4.skipSubmitEdit true && echo line >>file1 && git add file1 && git commit -m file1 && git p4 submit ) && ( cd "$cli" && test_path_is_file file1 && test_line_count = 2 file1 ) ' test_expect_success 'submit add' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && git config git-p4.skipSubmitEdit true && echo file13 >file13 && git add file13 && git commit -m file13 && git p4 submit ) && ( cd "$cli" && test_path_is_file file13 ) ' test_expect_success 'submit delete' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && git config git-p4.skipSubmitEdit true && git rm file4.t && git commit -m "delete file4.t" && git p4 submit ) && ( cd "$cli" && test_path_is_missing file4.t ) ' test_expect_success 'submit copy' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && git config git-p4.skipSubmitEdit true && git config git-p4.detectCopies true && git config git-p4.detectCopiesHarder true && cp file5.t file5.ta && git add file5.ta && git commit -m "copy to file5.ta" && git p4 submit ) && ( cd "$cli" && test_path_is_file file5.ta && ! is_cli_file_writeable file5.ta ) ' test_expect_success 'submit rename' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && git config git-p4.skipSubmitEdit true && git config git-p4.detectRenames true && git mv file6.t file6.ta && git commit -m "rename file6.t to file6.ta" && git p4 submit ) && ( cd "$cli" && test_path_is_missing file6.t && test_path_is_file file6.ta && ! is_cli_file_writeable file6.ta ) ' # # Converting git commit message to p4 change description, including # parsing out the optional Jobs: line. # test_expect_success 'simple one-line description' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo desc2 >desc2 && git add desc2 && cat >msg <<-EOF && One-line description line for desc2. EOF git commit -F - <msg && git config git-p4.skipSubmitEdit true && git p4 submit && change=$(p4 -G changes -m 1 //depot/... | \ marshal_dump change) && # marshal_dump always adds a newline p4 -G describe $change | marshal_dump desc | sed \$d >pmsg && test_cmp msg pmsg ) ' test_expect_success 'description with odd formatting' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo desc3 >desc3 && git add desc3 && ( printf "subject line\n\n\tExtra tab\nline.\n\n" && printf "Description:\n\tBogus description marker\n\n" && # git commit eats trailing newlines; only use one printf "Files:\n\tBogus descs marker\n" ) >msg && git commit -F - <msg && git config git-p4.skipSubmitEdit true && git p4 submit && change=$(p4 -G changes -m 1 //depot/... | \ marshal_dump change) && # marshal_dump always adds a newline p4 -G describe $change | marshal_dump desc | sed \$d >pmsg && test_cmp msg pmsg ) ' make_job() { name="$1" && tab="$(printf \\t)" && p4 job -o | \ sed -e "/^Job:/s/.*/Job: $name/" \ -e "/^Description/{ n; s/.*/$tab job text/; }" | \ p4 job -i } test_expect_success 'description with Jobs section at end' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo desc4 >desc4 && git add desc4 && echo 6060842 >jobname && ( printf "subject line\n\n\tExtra tab\nline.\n\n" && printf "Files:\n\tBogus files marker\n" && printf "Junk: 3164175\n" && printf "Jobs: $(cat jobname)\n" ) >msg && git commit -F - <msg && git config git-p4.skipSubmitEdit true && # build a job make_job $(cat jobname) && git p4 submit && change=$(p4 -G changes -m 1 //depot/... | \ marshal_dump change) && # marshal_dump always adds a newline p4 -G describe $change | marshal_dump desc | sed \$d >pmsg && # make sure Jobs line and all following is gone sed "/^Jobs:/,\$d" msg >jmsg && test_cmp jmsg pmsg && # make sure p4 knows about job p4 -G describe $change | marshal_dump job0 >job0 && test_cmp jobname job0 ) ' test_expect_success 'description with Jobs and values on separate lines' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo desc5 >desc5 && git add desc5 && echo PROJ-6060842 >jobname1 && echo PROJ-6060847 >jobname2 && ( printf "subject line\n\n\tExtra tab\nline.\n\n" && printf "Files:\n\tBogus files marker\n" && printf "Junk: 3164175\n" && printf "Jobs:\n" && printf "\t$(cat jobname1)\n" && printf "\t$(cat jobname2)\n" ) >msg && git commit -F - <msg && git config git-p4.skipSubmitEdit true && # build two jobs make_job $(cat jobname1) && make_job $(cat jobname2) && git p4 submit && change=$(p4 -G changes -m 1 //depot/... | \ marshal_dump change) && # marshal_dump always adds a newline p4 -G describe $change | marshal_dump desc | sed \$d >pmsg && # make sure Jobs line and all following is gone sed "/^Jobs:/,\$d" msg >jmsg && test_cmp jmsg pmsg && # make sure p4 knows about the two jobs p4 -G describe $change >change && ( marshal_dump job0 <change && marshal_dump job1 <change ) | sort >jobs && cat jobname1 jobname2 | sort >expected && test_cmp expected jobs ) ' test_expect_success 'description with Jobs section and bogus following text' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo desc6 >desc6 && git add desc6 && echo 6060843 >jobname && ( printf "subject line\n\n\tExtra tab\nline.\n\n" && printf "Files:\n\tBogus files marker\n" && printf "Junk: 3164175\n" && printf "Jobs: $(cat jobname)\n" && printf "MoreJunk: 3711\n" ) >msg && git commit -F - <msg && git config git-p4.skipSubmitEdit true && # build a job make_job $(cat jobname) && test_must_fail git p4 submit 2>err && test_i18ngrep "Unknown field name" err ) && ( cd "$cli" && p4 revert desc6 && rm -f desc6 ) ' test_expect_success 'submit --prepare-p4-only' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo prep-only-add >prep-only-add && git add prep-only-add && git commit -m "prep only add" && git p4 submit --prepare-p4-only >out && test_i18ngrep "prepared for submission" out && test_i18ngrep "must be deleted" out && test_i18ngrep ! "everything below this line is just the diff" out ) && ( cd "$cli" && test_path_is_file prep-only-add && p4 fstat -T action prep-only-add | grep -w add ) ' test_expect_success 'submit --shelve' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$cli" && p4 revert ... && cd "$git" && git config git-p4.skipSubmitEdit true && test_commit "shelveme1" && git p4 submit --origin=HEAD^ && echo 654321 >shelveme2.t && echo 123456 >>shelveme1.t && git add shelveme* && git commit -m"shelvetest" && git p4 submit --shelve --origin=HEAD^ && test_path_is_file shelveme1.t && test_path_is_file shelveme2.t ) && ( cd "$cli" && change=$(p4 -G changes -s shelved -m 1 //depot/... | \ marshal_dump change) && p4 describe -S $change | grep shelveme2 && p4 describe -S $change | grep 123456 && test_path_is_file shelveme1.t && test_path_is_missing shelveme2.t ) ' make_shelved_cl() { test_commit "$1" >/dev/null && git p4 submit --origin HEAD^ --shelve >/dev/null && p4 -G changes -s shelved -m 1 | marshal_dump change } # Update existing shelved changelists test_expect_success 'submit --update-shelve' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$cli" && p4 revert ... && cd "$git" && git config git-p4.skipSubmitEdit true && shelved_cl0=$(make_shelved_cl "shelved-change-0") && echo shelved_cl0=$shelved_cl0 && shelved_cl1=$(make_shelved_cl "shelved-change-1") && echo "updating shelved change lists $shelved_cl0 and $shelved_cl1" && echo "updated-line" >>shelf.t && echo added-file.t >added-file.t && git add shelf.t added-file.t && git rm -f shelved-change-1.t && git commit --amend -C HEAD && git show --stat HEAD && git p4 submit -v --origin HEAD~2 --update-shelve $shelved_cl0 --update-shelve $shelved_cl1 && echo "done git p4 submit" ) && ( cd "$cli" && change=$(p4 -G changes -s shelved -m 1 //depot/... | \ marshal_dump change) && p4 unshelve -c $change -s $change && grep -q updated-line shelf.t && p4 describe -S $change | grep added-file.t && test_path_is_missing shelved-change-1.t ) ' test_expect_success 'kill p4d' ' kill_p4d ' test_done