thodg/got/regress/cmdline/backout.sh
Tag
-
Show log
Commit
-
Hash : 35ca1db7
Author :
Date : 2021-09-28T20:56:04
print additional stats about things that went wrong during a merge
-
regress/cmdline/backout.sh
-
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 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214
#!/bin/sh # # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org> # # 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_backout_basic() { local testroot=`test_init backout_basic` 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 > /dev/null) echo "modified beta" > $testroot/wt/beta (cd $testroot/wt && got commit -m "changing beta" > /dev/null) (cd $testroot/wt && got update > /dev/null) (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="$?" if [ "$ret" != "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" != "0" ]; then diff -u $testroot/content.expected $testroot/content 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 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="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } 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 echo -n "Files which had incoming changes but could not be found " \ >> $testroot/stdout.expected echo "in the work tree: 1" >> $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" } 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 echo -n "Files which had incoming changes but could not be found " \ >> $testroot/stdout.expected echo "in the work tree: 1" >> $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" } test_parseargs "$@" run_test test_backout_basic run_test test_backout_edits_for_file_since_deleted run_test test_backout_next_commit