3 last_shelved_change
() {
4 p4 changes
-s shelved
-m1 | cut
-d " " -f 2
7 test_description
='git p4 unshelve'
11 test_expect_success
'start p4d' '
15 test_expect_success
'init depot' '
20 p4 submit -d "change 1" &&
23 p4 add file_to_delete &&
24 p4 add file_to_move &&
25 p4 submit -d "add files to delete" &&
26 echo file_to_integrate >file_to_integrate &&
27 p4 add file_to_integrate &&
28 p4 submit -d "add file to integrate"
32 # Create an initial clone, with a commit unrelated to the P4 change
34 test_expect_success
'initial clone' '
35 git p4 clone --dest="$git" //depot/@all &&
36 test_commit -C "$git" "unrelated"
39 test_expect_success
'create shelved changelist' '
43 echo "a change" >>file1 &&
44 echo "new file" >file2 &&
46 p4 delete file_to_delete &&
47 p4 edit file_to_move &&
48 p4 move file_to_move moved_file &&
49 p4 integrate file_to_integrate integrated_file &&
60 //depot/file_to_delete
63 //depot/integrated_file
69 change=$(last_shelved_change) &&
70 git p4 unshelve $change &&
71 git show refs/remotes/p4-unshelved/$change | grep -q "Further description" &&
72 git cherry-pick refs/remotes/p4-unshelved/$change &&
73 test_path_is_file file2 &&
74 test_cmp file1 "$cli"/file1 &&
75 test_cmp file2 "$cli"/file2 &&
76 test_cmp file_to_integrate "$cli"/integrated_file &&
77 test_path_is_missing file_to_delete &&
78 test_path_is_missing file_to_move &&
79 test_path_is_file moved_file
83 test_expect_success
'update shelved changelist and re-unshelve' '
84 test_when_finished cleanup_git &&
87 change=$(last_shelved_change) &&
88 echo "file3" >file3 &&
89 p4 add -c $change file3 &&
90 p4 shelve -i -r <<EOF &&
100 //depot/file_to_delete
106 change=$(last_shelved_change) &&
107 git p4 unshelve $change &&
108 git diff refs/remotes/p4-unshelved/$change.0 refs/remotes/p4-unshelved/$change | grep -q file3
113 description
="Change to be unshelved" &&
124 # This is the tricky case where the shelved changelist base revision doesn't
125 # match git-p4's idea of the base revision
127 # We will attempt to unshelve a change that is based on a change one commit
130 test_expect_success
'create shelved changelist based on p4 change ahead of p4/master' '
131 git p4 clone --dest="$git" //depot/@all &&
136 echo "foo" >>file1 &&
137 p4 submit -d "change:foo" &&
139 echo "bar" >>file1 &&
140 shelve_one_file //depot/file1 &&
141 change=$(last_shelved_change) &&
142 p4 describe -S $change >out.txt &&
143 grep -q "Change to be unshelved" out.txt
147 # Now try to unshelve it.
148 test_expect_success
'try to unshelve the change' '
149 test_when_finished cleanup_git &&
151 change=$(last_shelved_change) &&
153 git p4 unshelve $change >out.txt &&
154 grep -q "unshelved changelist $change" out.txt
158 # Specify the origin. Create 2 unrelated files, and check that
159 # we only get the one in HEAD~, not the one in HEAD.
161 test_expect_success
'unshelve specifying the origin' '
164 : >unrelated_file0 &&
165 p4 add unrelated_file0 &&
166 p4 submit -d "unrelated" &&
167 : >unrelated_file1 &&
168 p4 add unrelated_file1 &&
169 p4 submit -d "unrelated" &&
171 p4 add file_to_shelve &&
172 shelve_one_file //depot/file_to_shelve
174 test_when_finished cleanup_git &&
175 git p4 clone --dest="$git" //depot/@all &&
178 change=$(last_shelved_change) &&
179 git p4 unshelve --origin HEAD~ $change &&
180 git checkout refs/remotes/p4-unshelved/$change &&
181 test_path_is_file unrelated_file0 &&
182 test_path_is_missing unrelated_file1 &&
183 test_path_is_file file_to_shelve