#!/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 test_revert_basic() { local testroot=`test_init revert_basic` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "modified epsilon/zeta" > $testroot/wt/epsilon/zeta echo 'R epsilon/zeta' > $testroot/stdout.expected (cd $testroot/wt && got revert epsilon/zeta > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "zeta" > $testroot/content.expected cat $testroot/wt/epsilon/zeta > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content fi test_done "$testroot" "$ret" } test_revert_rm() { local testroot=`test_init revert_rm` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got rm beta >/dev/null) echo 'R beta' > $testroot/stdout.expected (cd $testroot/wt && got revert beta > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "beta" > $testroot/content.expected cat $testroot/wt/beta > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content fi test_done "$testroot" "$ret" } test_revert_add() { local testroot=`test_init revert_add` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "new file" > $testroot/wt/new (cd $testroot/wt && got add new >/dev/null) echo 'R new' > $testroot/stdout.expected (cd $testroot/wt && got revert new > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "new file" > $testroot/content.expected cat $testroot/wt/new > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content test_done "$testroot" "$ret" return 1 fi echo '? new' > $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_multiple() { local testroot=`test_init revert_multiple` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha echo "modified epsilon/zeta" > $testroot/wt/epsilon/zeta echo 'R alpha' > $testroot/stdout.expected echo 'R epsilon/zeta' >> $testroot/stdout.expected (cd $testroot/wt && got revert alpha epsilon/zeta > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "alpha" > $testroot/content.expected cat $testroot/wt/alpha > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content test_done "$testroot" "$ret" return 1 fi echo "zeta" > $testroot/content.expected cat $testroot/wt/epsilon/zeta > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content fi test_done "$testroot" "$ret" } test_revert_file_in_new_subdir() { local testroot=`test_init revert_file_in_new_subdir` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi mkdir -p $testroot/wt/newdir echo new > $testroot/wt/newdir/new (cd $testroot/wt && got add newdir/new > /dev/null) (cd $testroot/wt && got revert newdir/new > $testroot/stdout) echo "R newdir/new" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo "? newdir/new" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_no_arguments() { local testroot=`test_init revert_no_arguments` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "modified epsilon/zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && got revert > $testroot/stdout 2> $testroot/stderr) ret=$? if [ $ret -eq 0 ]; then echo "revert command succeeded unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "usage: got revert [-p] [-F response-script] [-R] path ..." \ > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stderr.expected $testroot/stderr fi test_done "$testroot" "$ret" } test_revert_directory() { local testroot=`test_init revert_directory` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "modified epsilon/zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && got revert . > $testroot/stdout 2> $testroot/stderr) ret=$? if [ $ret -eq 0 ]; then echo "got revert command succeeded unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo "got: reverting directories requires -R option" \ > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "$ret" return 1 fi echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got revert -R . > $testroot/stdout) echo 'R epsilon/zeta' > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "zeta" > $testroot/content.expected cat $testroot/wt/epsilon/zeta > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content fi test_done "$testroot" "$ret" } test_revert_directory_unknown() { local testroot=`test_init revert_directory_unknown` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha echo "new untracked file" > $testroot/wt/epsilon/new_file echo "modified epsilon/zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && got revert -R . > $testroot/stdout) echo 'R alpha' > $testroot/stdout.expected echo 'R epsilon/zeta' >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "new untracked file" > $testroot/content.expected cat $testroot/wt/epsilon/new_file > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content test_done "$testroot" "$ret" return 1 fi echo "zeta" > $testroot/content.expected cat $testroot/wt/epsilon/zeta > $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content fi test_done "$testroot" "$ret" } test_revert_patch() { local testroot=`test_init revert_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 -ne 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 diff > $testroot/numbers.diff) # don't revert any hunks printf "n\nn\nn\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ numbers > $testroot/stdout) ret=$? if [ $ret -ne 0 ]; then echo "got revert 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 -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff > $testroot/stdout) cmp -s $testroot/numbers.diff $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/numbers.diff $testroot/stdout test_done "$testroot" "$ret" return 1 fi # revert first hunk printf "y\nn\nn\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ numbers > $testroot/stdout) ret=$? if [ $ret -ne 0 ]; then echo "got revert 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 -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "diff $testroot/wt" > $testroot/stdout.expected echo "commit - $commit_id" >> $testroot/stdout.expected echo "path + $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 < $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi # put first hunk back sed -i -e 's/^2$/a/' $testroot/wt/numbers # revert middle hunk printf "n\ny\nn\n" > $testroot/patchscript (cd $testroot/wt && got revert -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 -ne 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 $testroot/wt" > $testroot/stdout.expected echo "commit - $commit_id" >> $testroot/stdout.expected echo "path + $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 < $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ numbers > $testroot/stdout) cat > $testroot/stdout.expected < $testroot/stdout) echo "diff $testroot/wt" > $testroot/stdout.expected echo "commit - $commit_id" >> $testroot/stdout.expected echo "path + $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 -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi echo "new" > $testroot/wt/epsilon/new (cd $testroot/wt && got add epsilon/new > /dev/null) printf "n\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ epsilon/new > $testroot/stdout) echo "A epsilon/new" > $testroot/stdout.expected echo "revert this addition? [y/n] n" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 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 -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi printf "y\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ epsilon/new > $testroot/stdout) echo "A epsilon/new" > $testroot/stdout.expected echo "revert this addition? [y/n] y" >> $testroot/stdout.expected echo "R epsilon/new" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo "? epsilon/new" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_patch_removed() { local testroot=`test_init revert_patch_removed` local commit_id=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got rm beta > /dev/null) printf "n\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ beta > $testroot/stdout) echo "D beta" > $testroot/stdout.expected echo "revert this deletion? [y/n] n" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 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 -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi printf "y\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ beta > $testroot/stdout) echo "D beta" > $testroot/stdout.expected echo "revert this deletion? [y/n] y" >> $testroot/stdout.expected echo "R beta" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_patch_one_change() { local testroot=`test_init revert_patch_one_change` 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 -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi # Ensure file size is changed. Avoids race condition causing test # failures where 'got revert' does not see changes to revert if # timestamps and size in stat info remain unchanged. sed -i -e 's/^2$/aa/' $testroot/wt/numbers # revert change with -p printf "y\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p \ numbers > $testroot/stdout) ret=$? if [ $ret -ne 0 ]; then echo "got revert command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi cat > $testroot/stdout.expected <&2 test_done "$testroot" "1" return 1 fi cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got diff > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_added_subtree() { local testroot=`test_init revert_added_subtree` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi mkdir -p $testroot/wt/epsilon/foo/bar/baz mkdir -p $testroot/wt/epsilon/foo/bar/bax echo "new file" > $testroot/wt/epsilon/foo/a.o echo "new file" > $testroot/wt/epsilon/foo/a.o echo "new file" > $testroot/wt/epsilon/foo/bar/b.o echo "new file" > $testroot/wt/epsilon/foo/bar/b.d echo "new file" > $testroot/wt/epsilon/foo/bar/baz/f.o echo "new file" > $testroot/wt/epsilon/foo/bar/baz/f.d echo "new file" > $testroot/wt/epsilon/foo/bar/baz/c.o echo "new file" > $testroot/wt/epsilon/foo/bar/baz/c.d echo "new file" > $testroot/wt/epsilon/foo/bar/bax/e.o echo "new file" > $testroot/wt/epsilon/foo/bar/bax/e.d echo "new file" > $testroot/wt/epsilon/foo/bar/bax/x.o echo "new file" > $testroot/wt/epsilon/foo/bar/bax/x.d (cd $testroot/wt && got add -R epsilon >/dev/null) echo "R epsilon/foo/a.o" > $testroot/stdout.expected echo "R epsilon/foo/bar/b.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/b.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/e.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/e.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/x.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/x.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/c.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/c.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/f.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/f.o" >> $testroot/stdout.expected (cd $testroot/wt && got revert -R . > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "? epsilon/foo/a.o" > $testroot/stdout.expected echo "? epsilon/foo/bar/b.d" >> $testroot/stdout.expected echo "? epsilon/foo/bar/b.o" >> $testroot/stdout.expected echo "? epsilon/foo/bar/bax/e.d" >> $testroot/stdout.expected echo "? epsilon/foo/bar/bax/e.o" >> $testroot/stdout.expected echo "? epsilon/foo/bar/bax/x.d" >> $testroot/stdout.expected echo "? epsilon/foo/bar/bax/x.o" >> $testroot/stdout.expected echo "? epsilon/foo/bar/baz/c.d" >> $testroot/stdout.expected echo "? epsilon/foo/bar/baz/c.o" >> $testroot/stdout.expected echo "? epsilon/foo/bar/baz/f.d" >> $testroot/stdout.expected echo "? epsilon/foo/bar/baz/f.o" >> $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_deleted_subtree() { local testroot=`test_init revert_deleted_subtree` got checkout $testroot/repo $testroot/wt > /dev/null ret=$? if [ $ret -ne 0 ]; then test_done "$testroot" "$ret" return 1 fi mkdir -p $testroot/wt/epsilon/foo/bar/baz mkdir -p $testroot/wt/epsilon/foo/bar/bax echo "new file" > $testroot/wt/epsilon/foo/a.o echo "new file" > $testroot/wt/epsilon/foo/a.o echo "new file" > $testroot/wt/epsilon/foo/bar/b.o echo "new file" > $testroot/wt/epsilon/foo/bar/b.d echo "new file" > $testroot/wt/epsilon/foo/bar/baz/f.o echo "new file" > $testroot/wt/epsilon/foo/bar/baz/f.d echo "new file" > $testroot/wt/epsilon/foo/bar/baz/c.o echo "new file" > $testroot/wt/epsilon/foo/bar/baz/c.d echo "new file" > $testroot/wt/epsilon/foo/bar/bax/e.o echo "new file" > $testroot/wt/epsilon/foo/bar/bax/e.d echo "new file" > $testroot/wt/epsilon/foo/bar/bax/x.o echo "new file" > $testroot/wt/epsilon/foo/bar/bax/x.d (cd $testroot/wt && got add -R epsilon >/dev/null) (cd $testroot/wt && got commit -m "add subtree" >/dev/null) # now delete and revert the entire subtree (cd $testroot/wt && got rm -R epsilon/foo >/dev/null) echo "R epsilon/foo/a.o" > $testroot/stdout.expected echo "R epsilon/foo/bar/b.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/b.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/e.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/e.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/x.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/bax/x.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/c.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/c.o" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/f.d" >> $testroot/stdout.expected echo "R epsilon/foo/bar/baz/f.o" >> $testroot/stdout.expected (cd $testroot/wt && got revert -R . > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo -n > $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_revert_symlink() { local testroot=`test_init revert_symlink` (cd $testroot/repo && ln -s alpha alpha.link) (cd $testroot/repo && ln -s epsilon epsilon.link) (cd $testroot/repo && ln -s /etc/passwd passwd.link) (cd $testroot/repo && ln -s ../beta epsilon/beta.link) (cd $testroot/repo && ln -s nonexistent nonexistent.link) (cd $testroot/repo && ln -sf epsilon/zeta zeta.link) (cd $testroot/repo && git add .) git_commit $testroot/repo -m "add symlinks" local commit_id1=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null # symlink to file A now points to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # symlink to a directory A now points to file B (cd $testroot/wt && ln -sfh beta epsilon.link) # "bad" symlink now contains a different target path echo "foo" > $testroot/wt/passwd.link # relative symlink to directory A now points to relative directory B (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) # an unversioned symlink (cd $testroot/wt && ln -sf .got/foo dotgotfoo.link) # symlink to file A now points to non-existent file B (cd $testroot/wt && ln -sf nonexistent2 nonexistent.link) # removed symlink (cd $testroot/wt && got rm zeta.link > /dev/null) # added symlink (cd $testroot/wt && ln -sf beta new.link) (cd $testroot/wt && got add new.link > /dev/null) (cd $testroot/wt && got revert alpha.link epsilon.link \ passwd.link epsilon/beta.link dotgotfoo.link \ nonexistent.link zeta.link new.link > $testroot/stdout) cat > $testroot/stdout.expected < $testroot/stdout echo "alpha" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if ! [ -h $testroot/wt/epsilon.link ]; then echo "epsilon.link is not a symlink" test_done "$testroot" "1" return 1 fi readlink $testroot/wt/epsilon.link > $testroot/stdout echo "epsilon" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ -h $testroot/wt/passwd.link ]; then echo "passwd.link should not be a symlink" >&2 test_done "$testroot" "1" return 1 fi echo -n "/etc/passwd" > $testroot/content.expected cp $testroot/wt/passwd.link $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content test_done "$testroot" "$ret" return 1 fi readlink $testroot/wt/epsilon/beta.link > $testroot/stdout echo "../beta" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi readlink $testroot/wt/nonexistent.link > $testroot/stdout echo "nonexistent" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ ! -h $testroot/wt/dotgotfoo.link ]; then echo "dotgotfoo.link is not a symlink " >&2 test_done "$testroot" "1" return 1 fi readlink $testroot/wt/dotgotfoo.link > $testroot/stdout echo ".got/foo" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ ! -h $testroot/wt/zeta.link ]; then echo -n "zeta.link is not a symlink" >&2 test_done "$testroot" "1" return 1 fi readlink $testroot/wt/zeta.link > $testroot/stdout echo "epsilon/zeta" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ ! -h $testroot/wt/new.link ]; then echo -n "new.link is not a symlink" >&2 test_done "$testroot" "1" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo "? dotgotfoo.link" > $testroot/stdout.expected echo "? new.link" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout return 1 fi test_done "$testroot" "$ret" } test_revert_patch_symlink() { local testroot=`test_init revert_patch_symlink` (cd $testroot/repo && ln -s alpha alpha.link) (cd $testroot/repo && ln -s epsilon epsilon.link) (cd $testroot/repo && ln -s /etc/passwd passwd.link) (cd $testroot/repo && ln -s ../beta epsilon/beta.link) (cd $testroot/repo && ln -s nonexistent nonexistent.link) (cd $testroot/repo && ln -sf epsilon/zeta zeta.link) (cd $testroot/repo && ln -sf epsilon/zeta zeta2.link) (cd $testroot/repo && git add .) git_commit $testroot/repo -m "add symlinks" local commit_id1=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null # symlink to file A now points to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # symlink to a directory A now points to file B (cd $testroot/wt && ln -sfh beta epsilon.link) # "bad" symlink now contains a different target path echo "foo" > $testroot/wt/passwd.link # relative symlink to directory A now points to relative directory B (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) # an unversioned symlink (cd $testroot/wt && ln -sf .got/foo dotgotfoo.link) # symlink to file A now points to non-existent file B (cd $testroot/wt && ln -sf nonexistent2 nonexistent.link) # removed symlink (cd $testroot/wt && got rm zeta.link > /dev/null) (cd $testroot/wt && got rm zeta2.link > /dev/null) # added symlink (cd $testroot/wt && ln -sf beta new.link) (cd $testroot/wt && got add new.link > /dev/null) (cd $testroot/wt && ln -sf beta zeta3.link) (cd $testroot/wt && got add zeta3.link > /dev/null) printf "y\nn\ny\nn\ny\ny\nn\ny\ny\n" > $testroot/patchscript (cd $testroot/wt && got revert -F $testroot/patchscript -p -R . \ > $testroot/stdout) ret=$? if [ $ret -ne 0 ]; then echo "got revert command failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi cat > $testroot/stdout.expected < $testroot/stdout echo "alpha" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if ! [ -h $testroot/wt/epsilon.link ]; then echo "epsilon.link is not a symlink" test_done "$testroot" "1" return 1 fi readlink $testroot/wt/epsilon.link > $testroot/stdout echo "epsilon" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ -h $testroot/wt/passwd.link ]; then echo "passwd.link should not be a symlink" >&2 test_done "$testroot" "1" return 1 fi echo -n "/etc/passwd" > $testroot/content.expected cp $testroot/wt/passwd.link $testroot/content cmp -s $testroot/content.expected $testroot/content ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/content.expected $testroot/content test_done "$testroot" "$ret" return 1 fi readlink $testroot/wt/epsilon/beta.link > $testroot/stdout echo "../gamma" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi readlink $testroot/wt/nonexistent.link > $testroot/stdout echo "nonexistent" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ ! -h $testroot/wt/dotgotfoo.link ]; then echo "dotgotfoo.link is not a symlink " >&2 test_done "$testroot" "1" return 1 fi readlink $testroot/wt/dotgotfoo.link > $testroot/stdout echo ".got/foo" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ -e $testroot/wt/zeta.link ]; then echo -n "zeta.link should not exist on disk" >&2 test_done "$testroot" "1" return 1 fi if [ ! -h $testroot/wt/zeta2.link ]; then echo -n "zeta2.link is not a symlink" >&2 test_done "$testroot" "1" return 1 fi readlink $testroot/wt/zeta2.link > $testroot/stdout echo "epsilon/zeta" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ ! -h $testroot/wt/zeta3.link ]; then echo -n "zeta3.link is not a symlink" >&2 test_done "$testroot" "1" return 1 fi readlink $testroot/wt/zeta3.link > $testroot/stdout echo "beta" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi if [ ! -h $testroot/wt/new.link ]; then echo -n "new.link is not a symlink" >&2 test_done "$testroot" "1" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo "? dotgotfoo.link" > $testroot/stdout.expected echo "M epsilon/beta.link" >> $testroot/stdout.expected echo "A new.link" >> $testroot/stdout.expected echo "D zeta.link" >> $testroot/stdout.expected echo "? zeta3.link" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then diff -u $testroot/stdout.expected $testroot/stdout return 1 fi test_done "$testroot" "$ret" } test_parseargs "$@" run_test test_revert_basic run_test test_revert_rm run_test test_revert_add run_test test_revert_multiple run_test test_revert_file_in_new_subdir run_test test_revert_no_arguments run_test test_revert_directory run_test test_revert_directory_unknown run_test test_revert_patch run_test test_revert_patch_added run_test test_revert_patch_removed run_test test_revert_patch_one_change run_test test_revert_added_subtree run_test test_revert_deleted_subtree run_test test_revert_symlink run_test test_revert_patch_symlink