#!/bin/sh # # Copyright (c) 2019 Stefan Sperling # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. # # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. . ./common.sh function test_unstage_basic { local testroot=`test_init unstage_basic` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified file" > $testroot/wt/alpha (cd $testroot/wt && got rm beta > /dev/null) echo "new file" > $testroot/wt/foo (cd $testroot/wt && got add foo > /dev/null) echo ' M alpha' > $testroot/stdout.expected echo ' D beta' >> $testroot/stdout.expected echo ' A foo' >> $testroot/stdout.expected (cd $testroot/wt && got stage alpha beta foo > /dev/null) (cd $testroot/wt && got unstage > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got unstage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo 'G alpha' > $testroot/stdout.expected echo 'D beta' >> $testroot/stdout.expected echo 'G foo' >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo 'M alpha' > $testroot/stdout.expected echo 'D beta' >> $testroot/stdout.expected echo 'A foo' >> $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_unstage_unversioned { local testroot=`test_init unstage_unversioned` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified file" > $testroot/wt/alpha (cd $testroot/wt && got rm beta > /dev/null) echo "new file" > $testroot/wt/foo (cd $testroot/wt && got add foo > /dev/null) echo ' M alpha' > $testroot/stdout.expected echo ' D beta' >> $testroot/stdout.expected echo ' A foo' >> $testroot/stdout.expected (cd $testroot/wt && got stage > /dev/null) touch $testroot/wt/unversioned-file (cd $testroot/wt && got status > $testroot/stdout) echo ' M alpha' > $testroot/stdout.expected echo ' D beta' >> $testroot/stdout.expected echo ' A foo' >> $testroot/stdout.expected echo "? unversioned-file" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got unstage > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got unstage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo 'G alpha' > $testroot/stdout.expected echo 'D beta' >> $testroot/stdout.expected echo 'G foo' >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got stage > /dev/null) # unstaging an unversioned path is a no-op (cd $testroot/wt && got unstage unversioned > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got unstage command failed unexpectedly" >&2 test_done "$testroot" "$ret" return 1 fi echo ' M alpha' > $testroot/stdout.expected echo ' D beta' >> $testroot/stdout.expected echo ' A foo' >> $testroot/stdout.expected echo "? unversioned-file" >> $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_unstage_nonexistent { local testroot=`test_init unstage_nonexistent` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified file" > $testroot/wt/alpha (cd $testroot/wt && got rm beta > /dev/null) echo "new file" > $testroot/wt/foo (cd $testroot/wt && got add foo > /dev/null) echo ' M alpha' > $testroot/stdout.expected echo ' D beta' >> $testroot/stdout.expected echo ' A foo' >> $testroot/stdout.expected (cd $testroot/wt && got stage > /dev/null) # unstaging a non-existent file is a no-op (cd $testroot/wt && got unstage nonexistent-file > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got unstage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_unstage_patch { local testroot=`test_init unstage_patch` jot 16 > $testroot/repo/numbers (cd $testroot/repo && git add numbers) git_commit $testroot/repo -m "added numbers file" local commit_id=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi sed -i -e 's/^2$/a/' $testroot/wt/numbers sed -i -e 's/^7$/b/' $testroot/wt/numbers sed -i -e 's/^16$/c/' $testroot/wt/numbers (cd $testroot/wt && got stage > /dev/null) ret="$?" if [ "$ret" != "0" ]; then echo "got stage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi # don't unstage any hunks printf "n\nn\nn\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ numbers > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got unstage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi cat > $testroot/stdout.expected < $testroot/stdout) echo " M numbers" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi # unstage middle hunk printf "n\ny\nn\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ numbers > $testroot/stdout) cat > $testroot/stdout.expected < $testroot/stdout) echo "MM numbers" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff -s > $testroot/stdout) echo "diff $commit_id $testroot/wt (staged changes)" \ > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected got tree -r $testroot/repo -i -c $commit_id \ | grep 'numbers$' | cut -d' ' -f 1 \ >> $testroot/stdout.expected echo -n 'blob + ' >> $testroot/stdout.expected (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \ >> $testroot/stdout.expected cat >> $testroot/stdout.expected < $testroot/stdout) echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 | \ tr -d '\n' >> $testroot/stdout.expected echo " (staged)" >> $testroot/stdout.expected echo "file + numbers" >> $testroot/stdout.expected cat >> $testroot/stdout.expected </dev/null) ret="$?" if [ "$ret" != "0" ]; then echo "got stage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo " M numbers" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi # unstage last hunk printf "n\nn\ny\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ numbers > $testroot/stdout) cat > $testroot/stdout.expected < $testroot/stdout) echo "MM numbers" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff -s > $testroot/stdout) echo "diff $commit_id $testroot/wt (staged changes)" \ > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected got tree -r $testroot/repo -i -c $commit_id \ | grep 'numbers$' | cut -d' ' -f 1 \ >> $testroot/stdout.expected echo -n 'blob + ' >> $testroot/stdout.expected (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \ >> $testroot/stdout.expected cat >> $testroot/stdout.expected < $testroot/stdout) echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 | \ tr -d '\n' >> $testroot/stdout.expected echo " (staged)" >> $testroot/stdout.expected echo "file + numbers" >> $testroot/stdout.expected cat >> $testroot/stdout.expected </dev/null) ret="$?" if [ "$ret" != "0" ]; then echo "got stage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo " M numbers" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi # unstage all hunks printf "y\ny\ny\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ numbers > $testroot/stdout) cat > $testroot/stdout.expected < $testroot/stdout) echo "M numbers" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff -s > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff > $testroot/stdout) echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected got tree -r $testroot/repo -i -c $commit_id \ | grep 'numbers$' | cut -d' ' -f 1 \ >> $testroot/stdout.expected echo 'file + numbers' >> $testroot/stdout.expected cat >> $testroot/stdout.expected < /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "new" > $testroot/wt/epsilon/new (cd $testroot/wt && got add epsilon/new > /dev/null) (cd $testroot/wt && got stage > /dev/null) printf "y\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ epsilon/new > $testroot/stdout) echo "A epsilon/new" > $testroot/stdout.expected echo "unstage this addition? [y/n] y" >> $testroot/stdout.expected echo "G epsilon/new" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo "A epsilon/new" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff -s > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff > $testroot/stdout) echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected echo 'blob - /dev/null' >> $testroot/stdout.expected echo 'file + epsilon/new' >> $testroot/stdout.expected echo "--- epsilon/new" >> $testroot/stdout.expected echo "+++ epsilon/new" >> $testroot/stdout.expected echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected echo "+new" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_unstage_patch_removed { local testroot=`test_init unstage_patch_removed` local commit_id=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got rm beta > /dev/null) (cd $testroot/wt && got stage > /dev/null) printf "y\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ beta > $testroot/stdout) echo "D beta" > $testroot/stdout.expected echo "unstage this deletion? [y/n] y" >> $testroot/stdout.expected echo "D beta" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo "D beta" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff -s > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff > $testroot/stdout) echo "diff $commit_id $testroot/wt" \ > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \ >> $testroot/stdout.expected echo 'file + /dev/null' >> $testroot/stdout.expected echo "--- beta" >> $testroot/stdout.expected echo "+++ beta" >> $testroot/stdout.expected echo "@@ -1 +0,0 @@" >> $testroot/stdout.expected echo "-beta" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_unstage_patch_quit { local testroot=`test_init unstage_patch_quit` jot 16 > $testroot/repo/numbers echo zzz > $testroot/repo/zzz (cd $testroot/repo && git add numbers zzz) git_commit $testroot/repo -m "added files" local commit_id=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi sed -i -e 's/^2$/a/' $testroot/wt/numbers sed -i -e 's/^7$/b/' $testroot/wt/numbers sed -i -e 's/^16$/c/' $testroot/wt/numbers (cd $testroot/wt && got rm zzz > /dev/null) (cd $testroot/wt && got stage > /dev/null) # unstage first hunk and quit; and don't pass a path argument to # ensure that we don't skip asking about the 'zzz' file after 'quit' printf "y\nq\nn\n" > $testroot/patchscript (cd $testroot/wt && got unstage -F $testroot/patchscript -p \ > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got unstage command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi cat > $testroot/stdout.expected < $testroot/stdout) echo "MM numbers" > $testroot/stdout.expected echo " D zzz" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff > $testroot/stdout) echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 | \ tr -d '\n' >> $testroot/stdout.expected echo " (staged)" >> $testroot/stdout.expected echo "file + numbers" >> $testroot/stdout.expected echo "--- numbers" >> $testroot/stdout.expected echo "+++ numbers" >> $testroot/stdout.expected echo "@@ -1,5 +1,5 @@" >> $testroot/stdout.expected echo " 1" >> $testroot/stdout.expected echo "-2" >> $testroot/stdout.expected echo "+a" >> $testroot/stdout.expected echo " 3" >> $testroot/stdout.expected echo " 4" >> $testroot/stdout.expected echo " 5" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff -s > $testroot/stdout) echo "diff $commit_id $testroot/wt (staged changes)" \ > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected got tree -r $testroot/repo -i -c $commit_id \ | grep 'numbers$' | cut -d' ' -f 1 \ >> $testroot/stdout.expected echo -n 'blob + ' >> $testroot/stdout.expected (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \ >> $testroot/stdout.expected cat >> $testroot/stdout.expected <> $testroot/stdout.expected got tree -r $testroot/repo -i | grep 'zzz$' | cut -d' ' -f 1 \ >> $testroot/stdout.expected echo 'blob + /dev/null' >> $testroot/stdout.expected echo "--- zzz" >> $testroot/stdout.expected echo "+++ /dev/null" >> $testroot/stdout.expected echo "@@ -1 +0,0 @@" >> $testroot/stdout.expected echo "-zzz" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } run_test test_unstage_basic run_test test_unstage_unversioned run_test test_unstage_nonexistent run_test test_unstage_patch run_test test_unstage_patch_added run_test test_unstage_patch_removed run_test test_unstage_patch_quit