Commit 5bda3ef83752a447e1afc97850d2bd6bd250ca55
2020-02-09T11:51:29
extend 'backout' tests; covers segfault found by semarie@ (fixed in 3c24af98)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168
diff --git a/regress/cmdline/backout.sh b/regress/cmdline/backout.sh
index 32c9222..9784f97 100755
--- a/regress/cmdline/backout.sh
+++ b/regress/cmdline/backout.sh
@@ -26,8 +26,11 @@ function test_backout_basic {
return 1
fi
+ echo "new" > $testroot/wt/new
+ (cd $testroot/wt && got add new > /dev/null)
echo "modified alpha" > $testroot/wt/alpha
- (cd $testroot/wt && got commit -m "changing alpha" > /dev/null)
+ (cd $testroot/wt && got rm epsilon/zeta > /dev/null)
+ (cd $testroot/wt && got commit -m "bad changes" > /dev/null)
local bad_commit=`git_show_head $testroot/repo`
@@ -42,6 +45,8 @@ function test_backout_basic {
(cd $testroot/wt && got backout $bad_commit > $testroot/stdout)
echo "G alpha" > $testroot/stdout.expected
+ echo "A epsilon/zeta" >> $testroot/stdout.expected
+ echo "D new" >> $testroot/stdout.expected
echo "Backed out commit $bad_commit" >> $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
@@ -61,7 +66,21 @@ function test_backout_basic {
return 1
fi
+ if [ -e "$testroot/wt/new" ]; then
+ echo "file '$testroot/wt/new' still exists on disk" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ if [ ! -e "$testroot/wt/epsilon/zeta" ]; then
+ echo "file '$testroot/wt/epsilon/zeta' is missing on disk" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
echo 'M alpha' > $testroot/stdout.expected
+ echo 'A epsilon/zeta' >> $testroot/stdout.expected
+ echo 'D new' >> $testroot/stdout.expected
(cd $testroot/wt && got status > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
@@ -71,4 +90,119 @@ function test_backout_basic {
test_done "$testroot" "$ret"
}
+function test_backout_edits_for_file_since_deleted {
+ local testroot=`test_init backout_edits_for_file_since_deleted`
+
+ got checkout $testroot/repo $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo "modified alpha" > $testroot/wt/alpha
+ (cd $testroot/wt && got commit -m "changing alpha" > /dev/null)
+
+ local bad_commit=`git_show_head $testroot/repo`
+
+
+ (cd $testroot/wt && got update > /dev/null)
+
+ (cd $testroot/wt && got rm alpha > /dev/null)
+ (cd $testroot/wt && got commit -m "removing alpha" > /dev/null)
+
+ (cd $testroot/wt && got update > /dev/null)
+
+ (cd $testroot/wt && got backout $bad_commit > $testroot/stdout)
+
+ echo "! alpha" > $testroot/stdout.expected
+ echo "Backed out commit $bad_commit" >> $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
+
+ if [ -e "$testroot/wt/alpha" ]; then
+ echo "file '$testroot/wt/alpha' still exists on disk" >&2
+ 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" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ fi
+ test_done "$testroot" "$ret"
+}
+
+function test_backout_next_commit {
+ local testroot=`test_init backout_next_commit`
+ local commit0=`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
+
+ echo "new" > $testroot/wt/new
+ (cd $testroot/wt && got add new > /dev/null)
+ echo "modified alpha" > $testroot/wt/alpha
+ (cd $testroot/wt && got rm epsilon/zeta > /dev/null)
+ (cd $testroot/wt && got commit -m "bad changes" > /dev/null)
+
+ local bad_commit=`git_show_head $testroot/repo`
+
+ (cd $testroot/wt && got update -c $commit0 > /dev/null)
+
+ (cd $testroot/wt && got backout $bad_commit > $testroot/stdout)
+
+ echo "G alpha" > $testroot/stdout.expected
+ echo "G epsilon/zeta" >> $testroot/stdout.expected
+ echo "! new" >> $testroot/stdout.expected
+ echo "Backed out commit $bad_commit" >> $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
+
+ if [ -e "$testroot/wt/new" ]; then
+ echo "file '$testroot/wt/new' still exists on disk" >&2
+ 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" != "0" ]; then
+ diff -u $testroot/content.expected $testroot/content
+ 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" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ fi
+ test_done "$testroot" "$ret"
+}
+
+
run_test test_backout_basic
+run_test test_backout_edits_for_file_since_deleted
+run_test test_backout_next_commit