Merge branch 'jk/am-i-resolved-fix' into maint

diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index 48ec7679b8d9632259c3b319d11ad8eb1acd5ceb..1286a5b824b77d71061fb890d9f528b46ecc087d 100755 (executable)
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -19,8 +19,10 @@ test_expect_success 'init depot' '
                p4 add file1 &&
                p4 submit -d "change 1" &&
                : >file_to_delete &&
+               : >file_to_move &&
                p4 add file_to_delete &&
-               p4 submit -d "file to delete"
+               p4 add file_to_move &&
+               p4 submit -d "add files to delete"
        )
 '
 
@@ -36,6 +38,8 @@ test_expect_success 'create shelved changelist' '
                echo "new file" >file2 &&
                p4 add file2 &&
                p4 delete file_to_delete &&
+               p4 edit file_to_move &&
+               p4 move file_to_move moved_file &&
                p4 opened &&
                p4 shelve -i <<EOF
 Change: new
@@ -47,6 +51,8 @@ Files:
        //depot/file1
        //depot/file2
        //depot/file_to_delete
+       //depot/file_to_move
+       //depot/moved_file
 EOF
 
        ) &&
@@ -54,12 +60,14 @@ EOF
                cd "$git" &&
                change=$(last_shelved_change) &&
                git p4 unshelve $change &&
-               git show refs/remotes/p4/unshelved/$change | grep -q "Further description" &&
-               git cherry-pick refs/remotes/p4/unshelved/$change &&
+               git show refs/remotes/p4-unshelved/$change | grep -q "Further description" &&
+               git cherry-pick refs/remotes/p4-unshelved/$change &&
                test_path_is_file file2 &&
                test_cmp file1 "$cli"/file1 &&
                test_cmp file2 "$cli"/file2 &&
-               test_path_is_missing file_to_delete
+               test_path_is_missing file_to_delete &&
+               test_path_is_missing file_to_move &&
+               test_path_is_file moved_file
        )
 '
 
@@ -88,10 +96,22 @@ EOF
                cd "$git" &&
                change=$(last_shelved_change) &&
                git p4 unshelve $change &&
-               git diff refs/remotes/p4/unshelved/$change.0 refs/remotes/p4/unshelved/$change | grep -q file3
+               git diff refs/remotes/p4-unshelved/$change.0 refs/remotes/p4-unshelved/$change | grep -q file3
        )
 '
 
+shelve_one_file () {
+       description="Change to be unshelved" &&
+       file="$1" &&
+       p4 shelve -i <<EOF
+Change: new
+Description:
+       $description
+Files:
+       $file
+EOF
+}
+
 # This is the tricky case where the shelved changelist base revision doesn't
 # match git-p4's idea of the base revision
 #
@@ -108,31 +128,51 @@ test_expect_success 'create shelved changelist based on p4 change ahead of p4/ma
                p4 submit -d "change:foo" &&
                p4 edit file1 &&
                echo "bar" >>file1 &&
-               p4 shelve -i <<EOF &&
-Change: new
-Description:
-       Change to be unshelved
-Files:
-       //depot/file1
-EOF
+               shelve_one_file //depot/file1 &&
                change=$(last_shelved_change) &&
-               p4 describe -S $change | grep -q "Change to be unshelved"
+               p4 describe -S $change >out.txt &&
+               grep -q "Change to be unshelved" out.txt
        )
 '
 
-# Now try to unshelve it. git-p4 should refuse to do so.
+# Now try to unshelve it.
 test_expect_success 'try to unshelve the change' '
        test_when_finished cleanup_git &&
        (
                change=$(last_shelved_change) &&
                cd "$git" &&
-               test_must_fail git p4 unshelve $change 2>out.txt &&
-               grep -q "cannot unshelve" out.txt
+               git p4 unshelve $change >out.txt &&
+               grep -q "unshelved changelist $change" out.txt
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
+# Specify the origin. Create 2 unrelated files, and check that
+# we only get the one in HEAD~, not the one in HEAD.
+
+test_expect_success 'unshelve specifying the origin' '
+       (
+               cd "$cli" &&
+               : >unrelated_file0 &&
+               p4 add unrelated_file0 &&
+               p4 submit -d "unrelated" &&
+               : >unrelated_file1 &&
+               p4 add unrelated_file1 &&
+               p4 submit -d "unrelated" &&
+               : >file_to_shelve &&
+               p4 add file_to_shelve &&
+               shelve_one_file //depot/file_to_shelve
+       ) &&
+       test_when_finished cleanup_git &&
+       git p4 clone --dest="$git" //depot/@all &&
+       (
+               cd "$git" &&
+               change=$(last_shelved_change) &&
+               git p4 unshelve --origin HEAD~ $change &&
+               git checkout refs/remotes/p4-unshelved/$change &&
+               test_path_is_file unrelated_file0 &&
+               test_path_is_missing unrelated_file1 &&
+               test_path_is_file file_to_shelve
+       )
 '
 
 test_done