#!/bin/sh global test_description := ''git p4 transparency to shell metachars in filenames'' source ./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 "file1" ) ' test_expect_success 'shell metachars in filenames' ' git p4 clone --dest="$git" //depot && test_when_finished cleanup_git && ( cd "$git" && git config git-p4.skipSubmitEditCheck true && echo f1 >foo\$bar && git add foo\$bar && echo f2 >"file with spaces" && git add "file with spaces" && git commit -m "add files" && P4EDITOR="test-chmtime +5" git p4 submit ) && ( cd "$cli" && p4 sync ... && test -e "file with spaces" && test -e "foo\$bar" ) ' test_expect_success 'deleting with shell metachars' ' git p4 clone --dest="$git" //depot && test_when_finished cleanup_git && ( cd "$git" && git config git-p4.skipSubmitEditCheck true && git rm foo\$bar && git rm file\ with\ spaces && git commit -m "remove files" && P4EDITOR="test-chmtime +5" git p4 submit ) && ( cd "$cli" && p4 sync ... && test ! -e "file with spaces" && test ! -e foo\$bar ) ' # Create a branch with a shell metachar in its name # # 1. //depot/main # 2. //depot/branch$3 test_expect_success 'branch with shell char' ' test_when_finished cleanup_git && test_create_repo "$git" && ( cd "$cli" && mkdir -p main && echo f1 >main/f1 && p4 add main/f1 && p4 submit -d "main/f1" && p4 integrate //depot/main/... //depot/branch\$3/... && p4 submit -d "integrate main to branch\$3" && echo f1 >branch\$3/shell_char_branch_file && p4 add branch\$3/shell_char_branch_file && p4 submit -d "branch\$3/shell_char_branch_file" && p4 branch -i <<-EOF && Branch: branch\$3 View: //depot/main/... //depot/branch\$3/... EOF p4 edit main/f1 && echo "a change" >> main/f1 && p4 submit -d "a change" main/f1 && p4 integrate -b branch\$3 && p4 resolve -am branch\$3/... && p4 submit -d "integrate main to branch\$3" && cd "$git" && git config git-p4.branchList main:branch\$3 && git p4 clone --dest=. --detect-branches //depot@all && git log --all --graph --decorate --stat && git reset --hard p4/depot/branch\$3 && test -f shell_char_branch_file && test -f f1 ) ' test_expect_success 'kill p4d' ' kill_p4d ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git p4 transparency to shell metachars in filenames">)} spids: [4] ) ] spids: [4] ) (C {(.)} {(./lib-git-p4.sh)}) (C {(test_expect_success)} {(SQ <"start p4d">)} {(SQ <"\n"> <"\tstart_p4d\n">)}) (C {(test_expect_success)} {(SQ <"init depot">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\techo file1 >file1 &&\n"> <"\t\tp4 add file1 &&\n"> <"\t\tp4 submit -d \"file1\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"shell metachars in filenames">)} { (SQ <"\n"> <"\tgit p4 clone --dest=\"$git\" //depot &&\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.skipSubmitEditCheck true &&\n"> <"\t\techo f1 >foo\\$bar &&\n"> <"\t\tgit add foo\\$bar &&\n"> <"\t\techo f2 >\"file with spaces\" &&\n"> <"\t\tgit add \"file with spaces\" &&\n"> <"\t\tgit commit -m \"add files\" &&\n"> <"\t\tP4EDITOR=\"test-chmtime +5\" git p4 submit\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\tp4 sync ... &&\n"> <"\t\ttest -e \"file with spaces\" &&\n"> <"\t\ttest -e \"foo\\$bar\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"deleting with shell metachars">)} { (SQ <"\n"> <"\tgit p4 clone --dest=\"$git\" //depot &&\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.skipSubmitEditCheck true &&\n"> <"\t\tgit rm foo\\$bar &&\n"> <"\t\tgit rm file\\ with\\ spaces &&\n"> <"\t\tgit commit -m \"remove files\" &&\n"> <"\t\tP4EDITOR=\"test-chmtime +5\" git p4 submit\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\tp4 sync ... &&\n"> <"\t\ttest ! -e \"file with spaces\" &&\n"> <"\t\ttest ! -e foo\\$bar\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"branch with shell char">)} { (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\n"> <"\t\tmkdir -p main &&\n"> <"\n"> <"\t\techo f1 >main/f1 &&\n"> <"\t\tp4 add main/f1 &&\n"> <"\t\tp4 submit -d \"main/f1\" &&\n"> <"\n"> <"\t\tp4 integrate //depot/main/... //depot/branch\\$3/... &&\n"> <"\t\tp4 submit -d \"integrate main to branch\\$3\" &&\n"> <"\n"> <"\t\techo f1 >branch\\$3/shell_char_branch_file &&\n"> <"\t\tp4 add branch\\$3/shell_char_branch_file &&\n"> <"\t\tp4 submit -d \"branch\\$3/shell_char_branch_file\" &&\n"> <"\n"> <"\t\tp4 branch -i <<-EOF &&\n"> <"\t\tBranch: branch\\$3\n"> <"\t\tView: //depot/main/... //depot/branch\\$3/...\n"> <"\t\tEOF\n"> <"\n"> <"\t\tp4 edit main/f1 &&\n"> <"\t\techo \"a change\" >> main/f1 &&\n"> <"\t\tp4 submit -d \"a change\" main/f1 &&\n"> <"\n"> <"\t\tp4 integrate -b branch\\$3 &&\n"> <"\t\tp4 resolve -am branch\\$3/... &&\n"> <"\t\tp4 submit -d \"integrate main to branch\\$3\" &&\n"> <"\n"> <"\t\tcd \"$git\" &&\n"> <"\n"> <"\t\tgit config git-p4.branchList main:branch\\$3 &&\n"> <"\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <"\t\tgit log --all --graph --decorate --stat &&\n"> <"\t\tgit reset --hard p4/depot/branch\\$3 &&\n"> <"\t\ttest -f shell_char_branch_file &&\n"> <"\t\ttest -f f1\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"kill p4d">)} {(SQ <"\n"> <"\tkill_p4d\n">)}) (C {(test_done)}) ] )