3 0ebf8283 2019-07-24 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
5 0ebf8283 2019-07-24 stsp # Permission to use, copy, modify, and distribute this software for any
6 0ebf8283 2019-07-24 stsp # purpose with or without fee is hereby granted, provided that the above
7 0ebf8283 2019-07-24 stsp # copyright notice and this permission notice appear in all copies.
9 0ebf8283 2019-07-24 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 0ebf8283 2019-07-24 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 0ebf8283 2019-07-24 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 0ebf8283 2019-07-24 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 0ebf8283 2019-07-24 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 0ebf8283 2019-07-24 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 0ebf8283 2019-07-24 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 0ebf8283 2019-07-24 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_histedit_no_op() {
20 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_no_op`
22 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
23 e600f124 2021-03-21 stsp local orig_author_time=`git_show_author_time $testroot/repo`
25 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
26 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
27 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
28 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
29 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
30 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
31 ad324bf5 2021-09-21 stsp local old_author_time1=`git_show_author_time $testroot/repo`
33 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
34 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
35 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
36 e600f124 2021-03-21 stsp local old_author_time2=`git_show_author_time $testroot/repo`
38 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $old_commit2 \
39 86ac67ee 2019-07-25 stsp > $testroot/diff.expected
41 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
43 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
44 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
48 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" > $testroot/histedit-script
49 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
51 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
52 0ebf8283 2019-07-24 stsp > $testroot/stdout)
54 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
55 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
56 e600f124 2021-03-21 stsp local new_author_time2=`git_show_author_time $testroot/repo`
58 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
59 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
60 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
61 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
63 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
64 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
65 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
66 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> $short_new_commit1: committing changes" \
67 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
68 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
69 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
70 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
71 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
72 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
73 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
75 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
77 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
78 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
79 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
83 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/content.expected
84 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
85 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
87 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
88 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
89 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
93 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
94 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
95 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
99 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
100 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
101 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
103 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
104 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
105 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
109 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
111 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
112 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
114 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
115 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
116 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
120 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
121 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
122 0ebf8283 2019-07-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
123 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
124 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
126 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
127 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
128 86ac67ee 2019-07-25 stsp test_done "$testroot" "$ret"
132 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit2 \
133 86ac67ee 2019-07-25 stsp > $testroot/diff
134 885e96df 2023-03-06 naddy ed -s $testroot/diff.expected <<-EOF
135 885e96df 2023-03-06 naddy ,s/$old_commit2/$new_commit2/
138 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
140 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
141 86ac67ee 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
142 a615e0e7 2020-12-16 stsp test_done "$testroot" "$ret"
146 a615e0e7 2020-12-16 stsp (cd $testroot/wt && got update > $testroot/stdout)
148 a615e0e7 2020-12-16 stsp echo 'Already up-to-date' > $testroot/stdout.expected
149 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
151 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
152 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
153 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
157 e600f124 2021-03-21 stsp # We should have a backup of old commits
158 e600f124 2021-03-21 stsp (cd $testroot/repo && got histedit -l > $testroot/stdout)
159 ad324bf5 2021-09-21 stsp d_orig1=`date -u -r $old_author_time1 +"%G-%m-%d"`
160 3a6b8760 2021-08-31 naddy d_orig2=`date -u -r $old_author_time2 +"%a %b %e %X %Y UTC"`
161 3a6b8760 2021-08-31 naddy d_new2=`date -u -r $new_author_time2 +"%G-%m-%d"`
162 3a6b8760 2021-08-31 naddy d_orig=`date -u -r $orig_author_time +"%G-%m-%d"`
163 e600f124 2021-03-21 stsp cat > $testroot/stdout.expected <<EOF
164 e600f124 2021-03-21 stsp -----------------------------------------------
165 e600f124 2021-03-21 stsp commit $old_commit2 (formerly master)
166 e600f124 2021-03-21 stsp from: $GOT_AUTHOR
167 e600f124 2021-03-21 stsp date: $d_orig2
169 e600f124 2021-03-21 stsp committing to zeta on master
171 e600f124 2021-03-21 stsp has become commit $new_commit2 (master)
172 e600f124 2021-03-21 stsp $d_new2 $GOT_AUTHOR_11 committing to zeta on master
175 ad324bf5 2021-09-21 stsp local is_forked=true d_fork fork_commit fork_commit_msg
177 ad324bf5 2021-09-21 stsp if [ "$old_commit1" = "$new_commit1" ]; then
178 ad324bf5 2021-09-21 stsp if [ "$old_commit2" = "$new_commit2" ]; then
179 ad324bf5 2021-09-21 stsp is_forked=false
181 ad324bf5 2021-09-21 stsp d_fork=$d_orig1
182 ad324bf5 2021-09-21 stsp fork_commit=$new_commit1
183 ad324bf5 2021-09-21 stsp fork_commit_msg="committing changes"
186 ad324bf5 2021-09-21 stsp d_fork=$d_orig
187 ad324bf5 2021-09-21 stsp fork_commit=$orig_commit
188 ad324bf5 2021-09-21 stsp fork_commit_msg="adding the test tree"
191 ad324bf5 2021-09-21 stsp $is_forked && cat >> $testroot/stdout.expected <<EOF
192 ad324bf5 2021-09-21 stsp history forked at $fork_commit
193 ad324bf5 2021-09-21 stsp $d_fork $GOT_AUTHOR_11 $fork_commit_msg
196 a615e0e7 2020-12-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
198 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
199 a615e0e7 2020-12-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
200 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
204 643b85bc 2021-07-16 stsp (cd $testroot/repo && got histedit -X master \
205 643b85bc 2021-07-16 stsp > $testroot/stdout 2> $testroot/stderr)
206 643b85bc 2021-07-16 stsp echo -n "Deleted refs/got/backup/histedit/master/$new_commit2: " \
207 643b85bc 2021-07-16 stsp > $testroot/stdout.expected
208 643b85bc 2021-07-16 stsp echo "$old_commit2" >> $testroot/stdout.expected
209 643b85bc 2021-07-16 stsp echo -n > $testroot/stderr.expected
210 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
212 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
213 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
214 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
217 643b85bc 2021-07-16 stsp cmp -s $testroot/stderr.expected $testroot/stderr
219 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
220 643b85bc 2021-07-16 stsp diff -u $testroot/stderr.expected $testroot/stderr
221 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
225 643b85bc 2021-07-16 stsp (cd $testroot/repo && got histedit -l > $testroot/stdout)
226 643b85bc 2021-07-16 stsp echo -n > $testroot/stdout.expected
227 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
229 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
230 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
232 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
235 f6cae3ed 2020-09-13 naddy test_histedit_swap() {
236 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_swap`
238 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
240 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
241 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
242 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
243 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
244 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
245 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
247 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
248 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
249 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
251 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $old_commit2 \
252 86ac67ee 2019-07-25 stsp > $testroot/diff.expected
254 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
256 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
257 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
261 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" > $testroot/histedit-script
262 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" >> $testroot/histedit-script
264 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
265 0ebf8283 2019-07-24 stsp > $testroot/stdout)
267 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_parent_commit $testroot/repo`
268 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_head $testroot/repo`
270 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
271 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
272 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
273 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
275 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" > $testroot/stdout.expected
276 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
277 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
278 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
279 0ebf8283 2019-07-24 stsp echo "G alpha" >> $testroot/stdout.expected
280 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
281 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
282 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> $short_new_commit1: committing changes" \
283 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
284 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
285 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
287 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
289 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
290 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
291 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
295 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/content.expected
296 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
297 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
299 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
300 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
301 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
305 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
306 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
307 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
311 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
312 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
313 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
315 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
316 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
317 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
321 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
323 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
324 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
326 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
327 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
328 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
332 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
333 0ebf8283 2019-07-24 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
334 0ebf8283 2019-07-24 stsp echo "commit $new_commit2" >> $testroot/stdout.expected
335 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
336 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
338 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
339 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
340 86ac67ee 2019-07-25 stsp test_done "$testroot" "$ret"
344 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit1 \
345 86ac67ee 2019-07-25 stsp > $testroot/diff
346 885e96df 2023-03-06 naddy ed -s $testroot/diff.expected <<-EOF
347 885e96df 2023-03-06 naddy ,s/$old_commit2/$new_commit1/
350 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
352 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
353 86ac67ee 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
355 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
358 f6cae3ed 2020-09-13 naddy test_histedit_drop() {
359 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_drop`
360 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
362 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
363 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
364 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
365 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
366 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
367 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
369 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
370 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
371 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
373 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $old_commit1 $old_commit2 \
374 86ac67ee 2019-07-25 stsp > $testroot/diff.expected
376 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
378 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
379 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
383 0ebf8283 2019-07-24 stsp echo "drop $old_commit1" > $testroot/histedit-script
384 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
386 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
387 0ebf8283 2019-07-24 stsp > $testroot/stdout)
389 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
391 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
392 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
393 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
395 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> drop commit: committing changes" \
396 0ebf8283 2019-07-24 stsp > $testroot/stdout.expected
397 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
398 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
399 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
400 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
401 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
402 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
404 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
406 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
407 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
408 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
412 0ebf8283 2019-07-24 stsp for f in alpha beta; do
413 0ebf8283 2019-07-24 stsp echo "$f" > $testroot/content.expected
414 0ebf8283 2019-07-24 stsp cat $testroot/wt/$f > $testroot/content
415 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
417 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
418 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
419 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
424 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/new ]; then
425 0ebf8283 2019-07-24 stsp echo "file new exists on disk but should not" >&2
426 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
430 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
432 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
433 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
435 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
436 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
437 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
441 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
442 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
443 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
444 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
446 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
447 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
448 86ac67ee 2019-07-25 stsp test_done "$testroot" "$ret"
452 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit2 \
453 86ac67ee 2019-07-25 stsp > $testroot/diff
454 885e96df 2023-03-06 naddy ed -s $testroot/diff.expected <<-EOF
455 885e96df 2023-03-06 naddy ,s/$old_commit1/$orig_commit/
456 885e96df 2023-03-06 naddy ,s/$old_commit2/$new_commit2/
459 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
461 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
462 86ac67ee 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
464 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
467 f6cae3ed 2020-09-13 naddy test_histedit_fold() {
468 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_fold`
470 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
472 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
473 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
474 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
475 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
476 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
477 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
479 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
480 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
481 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
483 3f9de99f 2019-07-24 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
484 3f9de99f 2019-07-24 stsp git_commit $testroot/repo -m "committing to delta on master"
485 3f9de99f 2019-07-24 stsp local old_commit3=`git_show_head $testroot/repo`
487 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
489 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
490 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
494 0ebf8283 2019-07-24 stsp echo "fold $old_commit1" > $testroot/histedit-script
495 3f9de99f 2019-07-24 stsp echo "drop $old_commit2" >> $testroot/histedit-script
496 3f9de99f 2019-07-24 stsp echo "pick $old_commit3" >> $testroot/histedit-script
497 0ebf8283 2019-07-24 stsp echo "mesg committing folded changes" >> $testroot/histedit-script
499 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
500 0ebf8283 2019-07-24 stsp > $testroot/stdout)
502 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
503 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
505 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
506 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
507 3f9de99f 2019-07-24 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
508 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
509 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
511 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
512 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
513 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
514 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
515 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
516 3f9de99f 2019-07-24 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
517 3f9de99f 2019-07-24 stsp echo "drop commit: committing to zeta on master" \
518 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
519 3f9de99f 2019-07-24 stsp echo "G gamma/delta" >> $testroot/stdout.expected
520 3f9de99f 2019-07-24 stsp echo -n "$short_old_commit3 -> $short_new_commit2: " \
521 3f9de99f 2019-07-24 stsp >> $testroot/stdout.expected
522 0ebf8283 2019-07-24 stsp echo "committing folded changes" >> $testroot/stdout.expected
523 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
524 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
526 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
528 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
529 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
530 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
534 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/content.expected
535 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
536 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
538 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
539 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
540 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
544 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
545 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
546 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
550 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
551 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
552 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
554 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
555 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
556 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
560 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
562 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
563 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
565 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
566 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
567 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
571 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
572 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
573 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
574 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
576 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
577 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
579 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
582 f6cae3ed 2020-09-13 naddy test_histedit_edit() {
583 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_edit`
585 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
587 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
588 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
589 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
590 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
591 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
592 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
594 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
595 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
596 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
598 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
600 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
601 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
605 0ebf8283 2019-07-24 stsp echo "edit $old_commit1" > $testroot/histedit-script
606 0ebf8283 2019-07-24 stsp echo "mesg committing changes" >> $testroot/histedit-script
607 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
609 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
610 0ebf8283 2019-07-24 stsp > $testroot/stdout)
612 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
613 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
615 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
616 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
617 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
618 0ebf8283 2019-07-24 stsp echo "Stopping histedit for amending commit $old_commit1" \
619 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
620 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
622 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
623 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
624 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
628 0ebf8283 2019-07-24 stsp echo "edited modified alpha on master" > $testroot/wt/alpha
630 f032f1f7 2019-08-04 stsp # test interaction of 'got stage' and histedit -c
631 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got stage alpha > /dev/null)
632 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got histedit -c > $testroot/stdout \
633 f032f1f7 2019-08-04 stsp 2> $testroot/stderr)
635 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
636 f032f1f7 2019-08-04 stsp echo "histedit succeeded unexpectedly" >&2
637 f032f1f7 2019-08-04 stsp test_done "$testroot" "1"
640 f032f1f7 2019-08-04 stsp echo -n "got: work tree contains files with staged changes; " \
641 f032f1f7 2019-08-04 stsp > $testroot/stderr.expected
642 f032f1f7 2019-08-04 stsp echo "these changes must be committed or unstaged first" \
643 f032f1f7 2019-08-04 stsp >> $testroot/stderr.expected
644 f032f1f7 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
646 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
647 f032f1f7 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
648 f032f1f7 2019-08-04 stsp test_done "$testroot" "$ret"
652 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got unstage alpha > /dev/null)
653 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -c > $testroot/stdout)
655 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
656 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
658 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
659 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
661 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> $short_new_commit1: committing changes" \
662 0ebf8283 2019-07-24 stsp > $testroot/stdout.expected
663 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
664 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
665 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
666 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
667 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
668 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
670 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
672 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
673 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
674 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
678 0ebf8283 2019-07-24 stsp echo "edited modified alpha on master" > $testroot/content.expected
679 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
680 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
682 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
683 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
684 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
688 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
689 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
690 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
694 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
695 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
696 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
698 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
699 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
700 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
704 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
706 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
707 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
709 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
710 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
711 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
715 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
716 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
717 0ebf8283 2019-07-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
718 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
719 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
721 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
722 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
724 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
727 f6cae3ed 2020-09-13 naddy test_histedit_fold_last_commit() {
728 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_fold_last_commit`
730 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
732 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
733 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
734 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
735 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
736 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
737 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
739 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
740 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
741 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
743 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
745 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
746 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
750 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" > $testroot/histedit-script
751 0ebf8283 2019-07-24 stsp echo "fold $old_commit2" >> $testroot/histedit-script
753 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
754 0ebf8283 2019-07-24 stsp > $testroot/stdout 2> $testroot/stderr)
757 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
758 0ebf8283 2019-07-24 stsp echo "histedit succeeded unexpectedly" >&2
759 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
763 0ebf8283 2019-07-24 stsp echo "got: last commit in histedit script cannot be folded" \
764 0ebf8283 2019-07-24 stsp > $testroot/stderr.expected
766 0ebf8283 2019-07-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
768 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
769 0ebf8283 2019-07-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
771 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
774 f6cae3ed 2020-09-13 naddy test_histedit_missing_commit() {
775 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_missing_commit`
777 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
779 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
780 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
781 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
782 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
783 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
784 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
786 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
787 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
788 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
790 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
792 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
793 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
797 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" > $testroot/histedit-script
798 0ebf8283 2019-07-24 stsp echo "mesg committing changes" >> $testroot/histedit-script
800 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
801 0ebf8283 2019-07-24 stsp > $testroot/stdout 2> $testroot/stderr)
804 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
805 0ebf8283 2019-07-24 stsp echo "histedit succeeded unexpectedly" >&2
806 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
810 0ebf8283 2019-07-24 stsp echo "got: commit $old_commit2 missing from histedit script" \
811 0ebf8283 2019-07-24 stsp > $testroot/stderr.expected
813 0ebf8283 2019-07-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
815 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
816 0ebf8283 2019-07-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
818 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
821 f6cae3ed 2020-09-13 naddy test_histedit_abort() {
822 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_abort`
824 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
826 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
827 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
828 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
829 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
830 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
831 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
833 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
834 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
835 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
837 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
839 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
840 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
844 41f061b2 2021-10-05 stsp # unrelated unversioned file in work tree
845 41f061b2 2021-10-05 stsp touch $testroot/wt/unversioned-file
847 0ebf8283 2019-07-24 stsp echo "edit $old_commit1" > $testroot/histedit-script
848 0ebf8283 2019-07-24 stsp echo "mesg committing changes" >> $testroot/histedit-script
849 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
851 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
852 0ebf8283 2019-07-24 stsp > $testroot/stdout)
854 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
855 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
857 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
858 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
859 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
860 0ebf8283 2019-07-24 stsp echo "Stopping histedit for amending commit $old_commit1" \
861 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
862 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
864 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
865 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
866 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
870 0ebf8283 2019-07-24 stsp echo "edited modified alpha on master" > $testroot/wt/alpha
872 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -a > $testroot/stdout)
874 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
875 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
877 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
878 0ebf8283 2019-07-24 stsp > $testroot/stdout.expected
879 0ebf8283 2019-07-24 stsp echo "R alpha" >> $testroot/stdout.expected
880 0ebf8283 2019-07-24 stsp echo "R beta" >> $testroot/stdout.expected
881 0ebf8283 2019-07-24 stsp echo "R epsilon/new" >> $testroot/stdout.expected
882 0ebf8283 2019-07-24 stsp echo "Histedit of refs/heads/master aborted" \
883 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
885 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
887 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
888 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
889 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
893 0ebf8283 2019-07-24 stsp for f in alpha beta; do
894 0ebf8283 2019-07-24 stsp echo "$f" > $testroot/content.expected
895 0ebf8283 2019-07-24 stsp cat $testroot/wt/$f > $testroot/content
896 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
898 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
899 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
900 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
905 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
906 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
907 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
909 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
910 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
911 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
915 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
917 0ebf8283 2019-07-24 stsp echo "? epsilon/new" > $testroot/stdout.expected
918 41f061b2 2021-10-05 stsp echo "? unversioned-file" >> $testroot/stdout.expected
919 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
921 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
922 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
923 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
927 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
928 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
929 0ebf8283 2019-07-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
930 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
931 0160a755 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
933 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
934 0160a755 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
936 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
939 f6cae3ed 2020-09-13 naddy test_histedit_path_prefix_drop() {
940 a4027091 2019-07-25 stsp local testroot=`test_init histedit_path_prefix_drop`
941 0160a755 2019-07-25 stsp local orig_commit=`git_show_head $testroot/repo`
943 0160a755 2019-07-25 stsp echo "modified zeta" > $testroot/repo/epsilon/zeta
944 0160a755 2019-07-25 stsp git_commit $testroot/repo -m "changing zeta"
945 0160a755 2019-07-25 stsp local old_commit1=`git_show_head $testroot/repo`
947 0160a755 2019-07-25 stsp got checkout -c $orig_commit -p gamma $testroot/repo \
948 0160a755 2019-07-25 stsp $testroot/wt > /dev/null
950 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
951 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
955 0160a755 2019-07-25 stsp echo "drop $old_commit1" > $testroot/histedit-script
957 0160a755 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
958 0160a755 2019-07-25 stsp > $testroot/stdout 2> $testroot/stderr)
961 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
962 0160a755 2019-07-25 stsp echo "histedit succeeded unexpectedly" >&2
963 0160a755 2019-07-25 stsp test_done "$testroot" "1"
967 0160a755 2019-07-25 stsp echo -n "got: cannot edit branch history which contains changes " \
968 0160a755 2019-07-25 stsp > $testroot/stderr.expected
969 0160a755 2019-07-25 stsp echo "outside of this work tree's path prefix" \
970 0160a755 2019-07-25 stsp >> $testroot/stderr.expected
972 0160a755 2019-07-25 stsp cmp -s $testroot/stderr.expected $testroot/stderr
974 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
975 0160a755 2019-07-25 stsp diff -u $testroot/stderr.expected $testroot/stderr
976 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
980 0160a755 2019-07-25 stsp rm -rf $testroot/wt
981 0160a755 2019-07-25 stsp got checkout -c $orig_commit -p epsilon $testroot/repo \
982 0160a755 2019-07-25 stsp $testroot/wt > /dev/null
984 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
985 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
988 0160a755 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
989 0160a755 2019-07-25 stsp > $testroot/stdout)
991 0160a755 2019-07-25 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
992 0160a755 2019-07-25 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
994 0160a755 2019-07-25 stsp echo "$short_old_commit1 -> drop commit: changing zeta" \
995 0160a755 2019-07-25 stsp > $testroot/stdout.expected
996 0160a755 2019-07-25 stsp echo "Switching work tree to refs/heads/master" \
997 0160a755 2019-07-25 stsp >> $testroot/stdout.expected
999 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1001 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1002 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1003 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
1007 0160a755 2019-07-25 stsp echo "zeta" > $testroot/content.expected
1008 0160a755 2019-07-25 stsp cat $testroot/wt/zeta > $testroot/content
1009 0160a755 2019-07-25 stsp cmp -s $testroot/content.expected $testroot/content
1011 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1012 0160a755 2019-07-25 stsp diff -u $testroot/content.expected $testroot/content
1013 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
1018 0160a755 2019-07-25 stsp (cd $testroot/wt && got status > $testroot/stdout)
1020 0160a755 2019-07-25 stsp echo -n > $testroot/stdout.expected
1021 0160a755 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1023 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1024 0160a755 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1025 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
1029 0160a755 2019-07-25 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1030 0160a755 2019-07-25 stsp echo "commit $orig_commit (master)" > $testroot/stdout.expected
1031 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1033 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1034 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1036 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1039 f6cae3ed 2020-09-13 naddy test_histedit_path_prefix_edit() {
1040 b2c50a0a 2019-07-25 stsp local testroot=`test_init histedit_path_prefix_edit`
1041 b2c50a0a 2019-07-25 stsp local orig_commit=`git_show_head $testroot/repo`
1043 b2c50a0a 2019-07-25 stsp echo "modified zeta" > $testroot/repo/epsilon/zeta
1044 b2c50a0a 2019-07-25 stsp git_commit $testroot/repo -m "changing zeta"
1045 b2c50a0a 2019-07-25 stsp local old_commit1=`git_show_head $testroot/repo`
1047 b2c50a0a 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $old_commit1 \
1048 b2c50a0a 2019-07-25 stsp > $testroot/diff.expected
1050 b2c50a0a 2019-07-25 stsp got checkout -c $orig_commit -p gamma $testroot/repo \
1051 b2c50a0a 2019-07-25 stsp $testroot/wt > /dev/null
1053 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1054 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1058 b2c50a0a 2019-07-25 stsp echo "edit $old_commit1" > $testroot/histedit-script
1059 b2c50a0a 2019-07-25 stsp echo "mesg modified zeta" >> $testroot/histedit-script
1061 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1062 b2c50a0a 2019-07-25 stsp > $testroot/stdout 2> $testroot/stderr)
1065 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1066 b2c50a0a 2019-07-25 stsp echo "histedit succeeded unexpectedly" >&2
1067 b2c50a0a 2019-07-25 stsp test_done "$testroot" "1"
1071 b2c50a0a 2019-07-25 stsp echo -n "got: cannot edit branch history which contains changes " \
1072 b2c50a0a 2019-07-25 stsp > $testroot/stderr.expected
1073 b2c50a0a 2019-07-25 stsp echo "outside of this work tree's path prefix" \
1074 b2c50a0a 2019-07-25 stsp >> $testroot/stderr.expected
1076 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1078 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1079 b2c50a0a 2019-07-25 stsp diff -u $testroot/stderr.expected $testroot/stderr
1080 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1084 b2c50a0a 2019-07-25 stsp rm -rf $testroot/wt
1085 b2c50a0a 2019-07-25 stsp got checkout -c $orig_commit -p epsilon $testroot/repo \
1086 b2c50a0a 2019-07-25 stsp $testroot/wt > /dev/null
1088 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1089 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1092 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1093 b2c50a0a 2019-07-25 stsp > $testroot/stdout)
1095 b2c50a0a 2019-07-25 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1097 b2c50a0a 2019-07-25 stsp echo "G zeta" > $testroot/stdout.expected
1098 b2c50a0a 2019-07-25 stsp echo "Stopping histedit for amending commit $old_commit1" \
1099 b2c50a0a 2019-07-25 stsp >> $testroot/stdout.expected
1100 0160a755 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1102 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1103 0160a755 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1104 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1108 b2c50a0a 2019-07-25 stsp echo "modified zeta" > $testroot/content.expected
1109 b2c50a0a 2019-07-25 stsp cat $testroot/wt/zeta > $testroot/content
1110 b2c50a0a 2019-07-25 stsp cmp -s $testroot/content.expected $testroot/content
1112 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1113 b2c50a0a 2019-07-25 stsp diff -u $testroot/content.expected $testroot/content
1114 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1118 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got status > $testroot/stdout)
1120 b2c50a0a 2019-07-25 stsp echo "M zeta"> $testroot/stdout.expected
1121 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1123 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1124 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1125 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1129 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got histedit -c > $testroot/stdout)
1131 b2c50a0a 2019-07-25 stsp local new_commit1=`git_show_head $testroot/repo`
1132 b2c50a0a 2019-07-25 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1134 b2c50a0a 2019-07-25 stsp echo -n "$short_old_commit1 -> $short_new_commit1: " \
1135 b2c50a0a 2019-07-25 stsp > $testroot/stdout.expected
1136 b2c50a0a 2019-07-25 stsp echo "modified zeta" >> $testroot/stdout.expected
1137 b2c50a0a 2019-07-25 stsp echo "Switching work tree to refs/heads/master" \
1138 b2c50a0a 2019-07-25 stsp >> $testroot/stdout.expected
1140 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1142 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1143 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1144 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1148 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1149 b2c50a0a 2019-07-25 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1150 b2c50a0a 2019-07-25 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1151 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1153 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1154 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1155 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1159 b2c50a0a 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit1 \
1160 b2c50a0a 2019-07-25 stsp > $testroot/diff
1161 885e96df 2023-03-06 naddy ed -s $testroot/diff.expected <<-EOF
1162 885e96df 2023-03-06 naddy ,s/$old_commit1/$new_commit1/
1165 b2c50a0a 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
1167 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1168 b2c50a0a 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
1170 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
1173 f6cae3ed 2020-09-13 naddy test_histedit_outside_refs_heads() {
1174 c7d20a3f 2019-07-30 stsp local testroot=`test_init histedit_outside_refs_heads`
1175 c7d20a3f 2019-07-30 stsp local commit1=`git_show_head $testroot/repo`
1177 c7d20a3f 2019-07-30 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1179 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1180 c7d20a3f 2019-07-30 stsp echo "got checkout failed unexpectedly"
1181 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1185 c7d20a3f 2019-07-30 stsp echo "modified alpha" > $testroot/wt/alpha
1187 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got commit -m 'change alpha' \
1188 c7d20a3f 2019-07-30 stsp > $testroot/stdout 2> $testroot/stderr)
1190 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1191 c7d20a3f 2019-07-30 stsp echo "got commit failed unexpectedly" >&2
1192 c7d20a3f 2019-07-30 stsp test_done "$testroot" "1"
1195 c7d20a3f 2019-07-30 stsp local commit2=`git_show_head $testroot/repo`
1197 e31abbf2 2020-03-22 stsp got ref -r $testroot/repo -c master refs/remotes/origin/master
1199 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1200 c7d20a3f 2019-07-30 stsp echo "got ref failed unexpectedly" >&2
1201 c7d20a3f 2019-07-30 stsp test_done "$testroot" "1"
1205 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got update -b origin/master -c $commit1 >/dev/null)
1207 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1208 c7d20a3f 2019-07-30 stsp echo "got update failed unexpectedly"
1209 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1213 c7d20a3f 2019-07-30 stsp echo "edit $commit2" > $testroot/histedit-script
1214 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1215 c7d20a3f 2019-07-30 stsp 2> $testroot/stderr)
1217 c7d20a3f 2019-07-30 stsp echo -n "got: will not edit commit history of a branch outside the " \
1218 c7d20a3f 2019-07-30 stsp > $testroot/stderr.expected
1219 c7d20a3f 2019-07-30 stsp echo '"refs/heads/" reference namespace' \
1220 c7d20a3f 2019-07-30 stsp >> $testroot/stderr.expected
1221 c7d20a3f 2019-07-30 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1223 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1224 c7d20a3f 2019-07-30 stsp diff -u $testroot/stderr.expected $testroot/stderr
1226 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1229 f6cae3ed 2020-09-13 naddy test_histedit_fold_last_commit_swap() {
1230 0def28b1 2019-08-17 stsp local testroot=`test_init histedit_fold_last_commit_swap`
1232 0def28b1 2019-08-17 stsp local orig_commit=`git_show_head $testroot/repo`
1234 0def28b1 2019-08-17 stsp echo "modified alpha on master" > $testroot/repo/alpha
1235 0def28b1 2019-08-17 stsp (cd $testroot/repo && git rm -q beta)
1236 0def28b1 2019-08-17 stsp echo "new file on master" > $testroot/repo/epsilon/new
1237 0def28b1 2019-08-17 stsp (cd $testroot/repo && git add epsilon/new)
1238 0def28b1 2019-08-17 stsp git_commit $testroot/repo -m "committing changes"
1239 0def28b1 2019-08-17 stsp local old_commit1=`git_show_head $testroot/repo`
1241 0def28b1 2019-08-17 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1242 0def28b1 2019-08-17 stsp git_commit $testroot/repo -m "committing to zeta on master"
1243 0def28b1 2019-08-17 stsp local old_commit2=`git_show_head $testroot/repo`
1245 0def28b1 2019-08-17 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1247 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1248 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1252 0def28b1 2019-08-17 stsp # fold commit2 into commit1 (requires swapping commits)
1253 0def28b1 2019-08-17 stsp echo "fold $old_commit2" > $testroot/histedit-script
1254 0def28b1 2019-08-17 stsp echo "pick $old_commit1" >> $testroot/histedit-script
1255 0def28b1 2019-08-17 stsp echo "mesg committing folded changes" >> $testroot/histedit-script
1257 0def28b1 2019-08-17 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1258 0def28b1 2019-08-17 stsp > $testroot/stdout 2> $testroot/stderr)
1261 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1262 0def28b1 2019-08-17 stsp echo "histedit failed unexpectedly" >&2
1263 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1267 0def28b1 2019-08-17 stsp local new_commit=`git_show_head $testroot/repo`
1269 0def28b1 2019-08-17 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1270 0def28b1 2019-08-17 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1271 0def28b1 2019-08-17 stsp local short_new_commit=`trim_obj_id 28 $new_commit`
1273 0def28b1 2019-08-17 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1274 0def28b1 2019-08-17 stsp echo -n "$short_old_commit2 -> fold commit: committing to zeta " \
1275 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1276 0def28b1 2019-08-17 stsp echo "on master" >> $testroot/stdout.expected
1277 0def28b1 2019-08-17 stsp echo "G alpha" >> $testroot/stdout.expected
1278 0def28b1 2019-08-17 stsp echo "D beta" >> $testroot/stdout.expected
1279 0def28b1 2019-08-17 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1280 0def28b1 2019-08-17 stsp echo -n "$short_old_commit1 -> $short_new_commit: " \
1281 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1282 0def28b1 2019-08-17 stsp echo "committing folded changes" >> $testroot/stdout.expected
1283 0def28b1 2019-08-17 stsp echo "Switching work tree to refs/heads/master" \
1284 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1286 0def28b1 2019-08-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1288 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1289 0def28b1 2019-08-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1291 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1294 f6cae3ed 2020-09-13 naddy test_histedit_split_commit() {
1295 de05890f 2020-03-05 stsp local testroot=`test_init histedit_split_commit`
1297 de05890f 2020-03-05 stsp local orig_commit=`git_show_head $testroot/repo`
1299 de05890f 2020-03-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
1300 de05890f 2020-03-05 stsp (cd $testroot/repo && git rm -q beta)
1301 de05890f 2020-03-05 stsp echo "new file on master" > $testroot/repo/epsilon/new
1302 de05890f 2020-03-05 stsp (cd $testroot/repo && git add epsilon/new)
1303 de05890f 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 1"
1304 de05890f 2020-03-05 stsp local old_commit1=`git_show_head $testroot/repo`
1305 de05890f 2020-03-05 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1307 de05890f 2020-03-05 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1308 de05890f 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 2"
1309 de05890f 2020-03-05 stsp local old_commit2=`git_show_head $testroot/repo`
1310 de05890f 2020-03-05 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1312 de05890f 2020-03-05 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1314 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1315 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1319 de05890f 2020-03-05 stsp # split commit1 into commitA and commitB and commitC
1320 de05890f 2020-03-05 stsp echo "e $old_commit1" > $testroot/histedit-script
1321 de05890f 2020-03-05 stsp echo "p $old_commit2" >> $testroot/histedit-script
1323 de05890f 2020-03-05 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1324 de05890f 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1326 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1327 de05890f 2020-03-05 stsp echo "histedit failed unexpectedly:" >&2
1328 de05890f 2020-03-05 stsp cat $testroot/stderr >&2
1329 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1333 de05890f 2020-03-05 stsp echo "G alpha" > $testroot/stdout.expected
1334 de05890f 2020-03-05 stsp echo "D beta" >> $testroot/stdout.expected
1335 de05890f 2020-03-05 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1336 de05890f 2020-03-05 stsp echo "Stopping histedit for amending commit $old_commit1" \
1337 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1339 de05890f 2020-03-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1341 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1342 de05890f 2020-03-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1343 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1347 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitA" alpha >/dev/null)
1349 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1350 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1351 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1355 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitB" beta >/dev/null)
1357 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1358 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1359 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1363 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitC" epsilon/new >/dev/null)
1365 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1366 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1367 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1371 de05890f 2020-03-05 stsp (cd $testroot/wt && got histedit -c \
1372 de05890f 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1374 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1375 de05890f 2020-03-05 stsp echo "histedit failed unexpectedly:" >&2
1376 de05890f 2020-03-05 stsp cat $testroot/stderr >&2
1377 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1380 de05890f 2020-03-05 stsp local new_commit2=`git_show_head $testroot/repo`
1381 de05890f 2020-03-05 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1383 de05890f 2020-03-05 stsp echo "$short_old_commit1 -> no-op change: committing changes 1" \
1384 de05890f 2020-03-05 stsp > $testroot/stdout.expected
1385 de05890f 2020-03-05 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1386 de05890f 2020-03-05 stsp echo "$short_old_commit2 -> $short_new_commit2: committing changes 2" \
1387 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1388 de05890f 2020-03-05 stsp echo "Switching work tree to refs/heads/master" \
1389 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1391 de05890f 2020-03-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1393 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1394 de05890f 2020-03-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1396 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1400 f6cae3ed 2020-09-13 naddy test_histedit_duplicate_commit_in_script() {
1401 5b87815e 2020-03-05 stsp local testroot=`test_init histedit_duplicate_commit_in_script`
1403 5b87815e 2020-03-05 stsp local orig_commit=`git_show_head $testroot/repo`
1405 5b87815e 2020-03-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
1406 5b87815e 2020-03-05 stsp (cd $testroot/repo && git rm -q beta)
1407 5b87815e 2020-03-05 stsp echo "new file on master" > $testroot/repo/epsilon/new
1408 5b87815e 2020-03-05 stsp (cd $testroot/repo && git add epsilon/new)
1409 5b87815e 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 1"
1410 5b87815e 2020-03-05 stsp local old_commit1=`git_show_head $testroot/repo`
1412 5b87815e 2020-03-05 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1413 5b87815e 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 2"
1414 5b87815e 2020-03-05 stsp local old_commit2=`git_show_head $testroot/repo`
1416 5b87815e 2020-03-05 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1418 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1419 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1423 5b87815e 2020-03-05 stsp # This histedit script lists commit1 more than once
1424 5b87815e 2020-03-05 stsp echo "p $old_commit1" > $testroot/histedit-script
1425 5b87815e 2020-03-05 stsp echo "p $old_commit1" >> $testroot/histedit-script
1426 5b87815e 2020-03-05 stsp echo "p $old_commit2" >> $testroot/histedit-script
1428 5b87815e 2020-03-05 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1429 5b87815e 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1431 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1432 5b87815e 2020-03-05 stsp echo "histedit succeeded unexpectedly:" >&2
1433 5b87815e 2020-03-05 stsp cat $testroot/stdout >&2
1434 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1438 5b87815e 2020-03-05 stsp echo -n "got: commit $old_commit1 is listed more than once " \
1439 5b87815e 2020-03-05 stsp > $testroot/stderr.expected
1440 5b87815e 2020-03-05 stsp echo "in histedit script" >> $testroot/stderr.expected
1442 5b87815e 2020-03-05 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1444 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1445 5b87815e 2020-03-05 stsp diff -u $testroot/stderr.expected $testroot/stderr
1447 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1451 ecfff807 2020-09-23 stsp # if a previous commit introduces a new file, and it is folded into a commit
1452 ecfff807 2020-09-23 stsp # that deletes the same file, the file still exists after the histedit
1453 ecfff807 2020-09-23 stsp test_histedit_fold_add_delete() {
1454 4c662b1d 2021-09-01 stsp local testroot=`test_init histedit_fold_add_delete`
1456 ecfff807 2020-09-23 stsp local orig_commit=`git_show_head $testroot/repo`
1458 ecfff807 2020-09-23 stsp echo "added new file epsilon/psi" > $testroot/repo/epsilon/psi
1459 ecfff807 2020-09-23 stsp (cd $testroot/repo && git add epsilon/psi)
1460 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "committing changes"
1461 ecfff807 2020-09-23 stsp local old_commit1=`git_show_head $testroot/repo`
1463 ecfff807 2020-09-23 stsp echo "modified epsilon/psi" > $testroot/repo/epsilon/psi
1464 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "editing psi"
1465 ecfff807 2020-09-23 stsp local old_commit2=`git_show_head $testroot/repo`
1467 ecfff807 2020-09-23 stsp (cd $testroot/repo && git rm -q epsilon/psi)
1468 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "removing psi"
1469 ecfff807 2020-09-23 stsp local old_commit3=`git_show_head $testroot/repo`
1471 ecfff807 2020-09-23 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1473 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1474 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1478 ecfff807 2020-09-23 stsp echo "fold $old_commit1" > $testroot/histedit-script
1479 ecfff807 2020-09-23 stsp echo "fold $old_commit2" >> $testroot/histedit-script
1480 ecfff807 2020-09-23 stsp echo "pick $old_commit3" >> $testroot/histedit-script
1481 ecfff807 2020-09-23 stsp echo "mesg folded changes" >> $testroot/histedit-script
1483 ecfff807 2020-09-23 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1484 ecfff807 2020-09-23 stsp > $testroot/stdout)
1486 ecfff807 2020-09-23 stsp local new_commit1=`git_show_head $testroot/repo`
1488 ecfff807 2020-09-23 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1489 ecfff807 2020-09-23 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1490 ecfff807 2020-09-23 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1491 ecfff807 2020-09-23 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1493 ecfff807 2020-09-23 stsp echo "A epsilon/psi" >> $testroot/stdout.expected
1494 ecfff807 2020-09-23 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1495 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1496 ecfff807 2020-09-23 stsp echo "G epsilon/psi" >> $testroot/stdout.expected
1497 ecfff807 2020-09-23 stsp echo "$short_old_commit2 -> fold commit: editing psi" \
1498 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1499 0a22ca1a 2020-09-23 stsp echo "D epsilon/psi" >> $testroot/stdout.expected
1500 0a22ca1a 2020-09-23 stsp echo "$short_old_commit3 -> no-op change: folded changes" \
1501 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1502 ecfff807 2020-09-23 stsp echo "Switching work tree to refs/heads/master" \
1503 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1505 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1507 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1508 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1509 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1513 ecfff807 2020-09-23 stsp if [ -e $testroot/wt/epsilon/psi ]; then
1514 0a22ca1a 2020-09-23 stsp echo "removed file psi still exists on disk" >&2
1515 0a22ca1a 2020-09-23 stsp test_done "$testroot" "1"
1519 ecfff807 2020-09-23 stsp (cd $testroot/wt && got status > $testroot/stdout)
1521 ecfff807 2020-09-23 stsp echo -n > $testroot/stdout.expected
1522 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1524 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1525 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1526 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1530 ecfff807 2020-09-23 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1531 ecfff807 2020-09-23 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1532 29c68398 2020-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1534 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1535 29c68398 2020-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1536 29c68398 2020-09-24 stsp test_done "$testroot" "$ret"
1540 29c68398 2020-09-24 stsp got tree -r $testroot/repo epsilon > $testroot/stdout
1541 29c68398 2020-09-24 stsp echo "zeta" > $testroot/stdout.expected
1542 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1544 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1545 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1547 15aed053 2023-03-07 naddy test_done "$testroot" "$ret"
1550 15aed053 2023-03-07 naddy test_histedit_fold_delete_add() {
1551 15aed053 2023-03-07 naddy local testroot=`test_init histedit_fold_delete_add`
1553 15aed053 2023-03-07 naddy local orig_commit=`git_show_head $testroot/repo`
1555 15aed053 2023-03-07 naddy (cd $testroot/repo && git rm -q alpha)
1556 15aed053 2023-03-07 naddy git_commit $testroot/repo -m "removing alpha"
1557 15aed053 2023-03-07 naddy local old_commit1=`git_show_head $testroot/repo`
1559 15aed053 2023-03-07 naddy echo "modified alpha" >$testroot/repo/alpha
1560 15aed053 2023-03-07 naddy (cd $testroot/repo && git add alpha)
1561 15aed053 2023-03-07 naddy git_commit $testroot/repo -m "add back modified alpha"
1562 15aed053 2023-03-07 naddy local old_commit2=`git_show_head $testroot/repo`
1564 15aed053 2023-03-07 naddy got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1566 15aed053 2023-03-07 naddy if [ $ret -ne 0 ]; then
1567 15aed053 2023-03-07 naddy test_done "$testroot" "$ret"
1571 15aed053 2023-03-07 naddy echo "fold $old_commit1" > $testroot/histedit-script
1572 15aed053 2023-03-07 naddy echo "pick $old_commit2" >> $testroot/histedit-script
1573 15aed053 2023-03-07 naddy echo "mesg folded changes" >> $testroot/histedit-script
1575 15aed053 2023-03-07 naddy (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1576 15aed053 2023-03-07 naddy > $testroot/stdout)
1578 15aed053 2023-03-07 naddy local new_commit1=`git_show_head $testroot/repo`
1580 15aed053 2023-03-07 naddy local short_old_commit1=`trim_obj_id 28 $old_commit1`
1581 15aed053 2023-03-07 naddy local short_old_commit2=`trim_obj_id 28 $old_commit2`
1582 15aed053 2023-03-07 naddy local short_new_commit1=`trim_obj_id 28 $new_commit1`
1584 15aed053 2023-03-07 naddy echo "D alpha" > $testroot/stdout.expected
1585 15aed053 2023-03-07 naddy echo "$short_old_commit1 -> fold commit: removing alpha" \
1586 15aed053 2023-03-07 naddy >> $testroot/stdout.expected
1587 15aed053 2023-03-07 naddy echo "A alpha" >> $testroot/stdout.expected
1588 15aed053 2023-03-07 naddy echo "$short_old_commit2 -> $short_new_commit1: folded changes" \
1589 15aed053 2023-03-07 naddy >> $testroot/stdout.expected
1590 15aed053 2023-03-07 naddy echo "Switching work tree to refs/heads/master" \
1591 15aed053 2023-03-07 naddy >> $testroot/stdout.expected
1593 9a298e5c 2023-03-10 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1595 9a298e5c 2023-03-10 stsp if [ $ret -ne 0 ]; then
1596 9a298e5c 2023-03-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
1597 9a298e5c 2023-03-10 stsp test_done "$testroot" "$ret"
1601 15aed053 2023-03-07 naddy if [ ! -e $testroot/wt/alpha ]; then
1602 9a298e5c 2023-03-10 stsp echo "file alpha is missing on disk" >&2
1603 9a298e5c 2023-03-10 stsp test_done "$testroot" "1"
1607 5fdcbbb6 2023-03-14 naddy echo "modified alpha" > $testroot/content.expected
1608 5fdcbbb6 2023-03-14 naddy cat $testroot/wt/alpha > $testroot/content
1609 5fdcbbb6 2023-03-14 naddy cmp -s $testroot/content.expected $testroot/content
1611 5fdcbbb6 2023-03-14 naddy if [ $ret -ne 0 ]; then
1612 5fdcbbb6 2023-03-14 naddy diff -u $testroot/content.expected $testroot/content
1613 5fdcbbb6 2023-03-14 naddy test_done "$testroot" "$ret"
1616 9a298e5c 2023-03-10 stsp test_done "$testroot" "0"
1619 239f5c5a 2020-12-13 stsp test_histedit_fold_only() {
1620 239f5c5a 2020-12-13 stsp local testroot=`test_init histedit_fold_only`
1622 239f5c5a 2020-12-13 stsp local orig_commit=`git_show_head $testroot/repo`
1624 239f5c5a 2020-12-13 stsp echo "modified alpha on master" > $testroot/repo/alpha
1625 239f5c5a 2020-12-13 stsp (cd $testroot/repo && git rm -q beta)
1626 239f5c5a 2020-12-13 stsp echo "new file on master" > $testroot/repo/epsilon/new
1627 239f5c5a 2020-12-13 stsp (cd $testroot/repo && git add epsilon/new)
1628 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing changes"
1629 239f5c5a 2020-12-13 stsp local old_commit1=`git_show_head $testroot/repo`
1631 239f5c5a 2020-12-13 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1632 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing to zeta on master"
1633 239f5c5a 2020-12-13 stsp local old_commit2=`git_show_head $testroot/repo`
1635 239f5c5a 2020-12-13 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
1636 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing to delta on master"
1637 239f5c5a 2020-12-13 stsp local old_commit3=`git_show_head $testroot/repo`
1639 239f5c5a 2020-12-13 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1641 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1642 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1646 239f5c5a 2020-12-13 stsp cat > $testroot/editor.sh <<EOF
1648 885e96df 2023-03-06 naddy ed -s "\$1" <<-EOF
1649 885e96df 2023-03-06 naddy ,s/.*/committing folded changes/
1653 239f5c5a 2020-12-13 stsp chmod +x $testroot/editor.sh
1655 239f5c5a 2020-12-13 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1656 239f5c5a 2020-12-13 stsp VISUAL="$testroot/editor.sh" got histedit -f > $testroot/stdout)
1658 239f5c5a 2020-12-13 stsp local new_commit1=`git_show_head $testroot/repo`
1660 239f5c5a 2020-12-13 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1661 239f5c5a 2020-12-13 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1662 239f5c5a 2020-12-13 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1663 239f5c5a 2020-12-13 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1664 239f5c5a 2020-12-13 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1666 239f5c5a 2020-12-13 stsp echo "G alpha" > $testroot/stdout.expected
1667 239f5c5a 2020-12-13 stsp echo "D beta" >> $testroot/stdout.expected
1668 239f5c5a 2020-12-13 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1669 239f5c5a 2020-12-13 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1670 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1671 239f5c5a 2020-12-13 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1672 239f5c5a 2020-12-13 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
1673 239f5c5a 2020-12-13 stsp echo "fold commit: committing to zeta on master" \
1674 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1675 239f5c5a 2020-12-13 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1676 239f5c5a 2020-12-13 stsp echo -n "$short_old_commit3 -> $short_new_commit1: " \
1677 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1678 239f5c5a 2020-12-13 stsp echo "committing folded changes" >> $testroot/stdout.expected
1679 239f5c5a 2020-12-13 stsp echo "Switching work tree to refs/heads/master" \
1680 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1682 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1684 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1685 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1686 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1690 239f5c5a 2020-12-13 stsp echo "modified alpha on master" > $testroot/content.expected
1691 239f5c5a 2020-12-13 stsp cat $testroot/wt/alpha > $testroot/content
1692 239f5c5a 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1694 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1695 239f5c5a 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1696 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1700 239f5c5a 2020-12-13 stsp if [ -e $testroot/wt/beta ]; then
1701 239f5c5a 2020-12-13 stsp echo "removed file beta still exists on disk" >&2
1702 239f5c5a 2020-12-13 stsp test_done "$testroot" "1"
1706 239f5c5a 2020-12-13 stsp echo "new file on master" > $testroot/content.expected
1707 239f5c5a 2020-12-13 stsp cat $testroot/wt/epsilon/new > $testroot/content
1708 239f5c5a 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1710 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1711 239f5c5a 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1712 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1716 239f5c5a 2020-12-13 stsp (cd $testroot/wt && got status > $testroot/stdout)
1718 239f5c5a 2020-12-13 stsp echo -n > $testroot/stdout.expected
1719 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1721 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1722 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1723 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1727 239f5c5a 2020-12-13 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
1728 239f5c5a 2020-12-13 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1729 239f5c5a 2020-12-13 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1730 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1732 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1733 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1735 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1738 a347e6bb 2020-12-13 stsp test_histedit_fold_only_empty_logmsg() {
1739 a347e6bb 2020-12-13 stsp local testroot=`test_init histedit_fold_only_empty_logmsg`
1741 a347e6bb 2020-12-13 stsp local orig_commit=`git_show_head $testroot/repo`
1743 a347e6bb 2020-12-13 stsp echo "modified alpha on master" > $testroot/repo/alpha
1744 a347e6bb 2020-12-13 stsp (cd $testroot/repo && git rm -q beta)
1745 a347e6bb 2020-12-13 stsp echo "new file on master" > $testroot/repo/epsilon/new
1746 a347e6bb 2020-12-13 stsp (cd $testroot/repo && git add epsilon/new)
1747 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing changes"
1748 a347e6bb 2020-12-13 stsp local old_commit1=`git_show_head $testroot/repo`
1750 a347e6bb 2020-12-13 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1751 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing to zeta on master"
1752 a347e6bb 2020-12-13 stsp local old_commit2=`git_show_head $testroot/repo`
1754 a347e6bb 2020-12-13 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
1755 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing to delta on master"
1756 a347e6bb 2020-12-13 stsp local old_commit3=`git_show_head $testroot/repo`
1758 a347e6bb 2020-12-13 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1760 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1761 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1765 a347e6bb 2020-12-13 stsp cat > $testroot/editor.sh <<EOF
1767 885e96df 2023-03-06 naddy ed -s "\$1" <<-EOF
1772 a347e6bb 2020-12-13 stsp chmod +x $testroot/editor.sh
1774 a347e6bb 2020-12-13 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1775 a347e6bb 2020-12-13 stsp VISUAL="$testroot/editor.sh" got histedit -f > $testroot/stdout)
1777 a347e6bb 2020-12-13 stsp local new_commit1=`git_show_head $testroot/repo`
1779 a347e6bb 2020-12-13 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1780 a347e6bb 2020-12-13 stsp local very_short_old_commit1=`trim_obj_id 29 $old_commit1`
1781 a347e6bb 2020-12-13 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1782 a347e6bb 2020-12-13 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1783 a347e6bb 2020-12-13 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1784 a347e6bb 2020-12-13 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1786 a347e6bb 2020-12-13 stsp echo "G alpha" > $testroot/stdout.expected
1787 a347e6bb 2020-12-13 stsp echo "D beta" >> $testroot/stdout.expected
1788 a347e6bb 2020-12-13 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1789 a347e6bb 2020-12-13 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1790 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1791 a347e6bb 2020-12-13 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1792 a347e6bb 2020-12-13 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
1793 a347e6bb 2020-12-13 stsp echo "fold commit: committing to zeta on master" \
1794 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1795 a347e6bb 2020-12-13 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1796 a347e6bb 2020-12-13 stsp echo -n "$short_old_commit3 -> $short_new_commit1: " \
1797 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1798 a347e6bb 2020-12-13 stsp echo "# log message of folded commit $very_short_old_commit1" \
1799 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1800 a347e6bb 2020-12-13 stsp echo "Switching work tree to refs/heads/master" \
1801 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1803 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1805 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1806 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1807 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1811 a347e6bb 2020-12-13 stsp echo "modified alpha on master" > $testroot/content.expected
1812 a347e6bb 2020-12-13 stsp cat $testroot/wt/alpha > $testroot/content
1813 a347e6bb 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1815 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1816 a347e6bb 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1817 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1821 a347e6bb 2020-12-13 stsp if [ -e $testroot/wt/beta ]; then
1822 a347e6bb 2020-12-13 stsp echo "removed file beta still exists on disk" >&2
1823 a347e6bb 2020-12-13 stsp test_done "$testroot" "1"
1827 a347e6bb 2020-12-13 stsp echo "new file on master" > $testroot/content.expected
1828 a347e6bb 2020-12-13 stsp cat $testroot/wt/epsilon/new > $testroot/content
1829 a347e6bb 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1831 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1832 a347e6bb 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1833 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1837 a347e6bb 2020-12-13 stsp (cd $testroot/wt && got status > $testroot/stdout)
1839 a347e6bb 2020-12-13 stsp echo -n > $testroot/stdout.expected
1840 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1842 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1843 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1844 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1848 a347e6bb 2020-12-13 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
1849 a347e6bb 2020-12-13 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1850 b93c7142 2021-10-01 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1851 b93c7142 2021-10-01 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1853 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1854 b93c7142 2021-10-01 stsp diff -u $testroot/stdout.expected $testroot/stdout
1856 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1859 b93c7142 2021-10-01 stsp test_histedit_edit_only() {
1860 b93c7142 2021-10-01 stsp local testroot=`test_init histedit_edit_only`
1862 b93c7142 2021-10-01 stsp local orig_commit=`git_show_head $testroot/repo`
1864 b93c7142 2021-10-01 stsp echo "modified alpha on master" > $testroot/repo/alpha
1865 b93c7142 2021-10-01 stsp (cd $testroot/repo && git rm -q beta)
1866 b93c7142 2021-10-01 stsp echo "new file on master" > $testroot/repo/epsilon/new
1867 b93c7142 2021-10-01 stsp (cd $testroot/repo && git add epsilon/new)
1868 b93c7142 2021-10-01 stsp git_commit $testroot/repo -m "committing changes"
1869 b93c7142 2021-10-01 stsp local old_commit1=`git_show_head $testroot/repo`
1871 b93c7142 2021-10-01 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1872 b93c7142 2021-10-01 stsp git_commit $testroot/repo -m "committing to zeta on master"
1873 b93c7142 2021-10-01 stsp local old_commit2=`git_show_head $testroot/repo`
1875 b93c7142 2021-10-01 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1877 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1878 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1882 b93c7142 2021-10-01 stsp (cd $testroot/wt && got histedit -e > $testroot/stdout)
1884 b93c7142 2021-10-01 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1885 b93c7142 2021-10-01 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1887 b93c7142 2021-10-01 stsp echo "G alpha" > $testroot/stdout.expected
1888 b93c7142 2021-10-01 stsp echo "D beta" >> $testroot/stdout.expected
1889 b93c7142 2021-10-01 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1890 b93c7142 2021-10-01 stsp echo "Stopping histedit for amending commit $old_commit1" \
1891 b93c7142 2021-10-01 stsp >> $testroot/stdout.expected
1892 b93c7142 2021-10-01 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1894 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1895 b93c7142 2021-10-01 stsp diff -u $testroot/stdout.expected $testroot/stdout
1896 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1900 b93c7142 2021-10-01 stsp echo "edited modified alpha on master" > $testroot/wt/alpha
1902 b93c7142 2021-10-01 stsp cat > $testroot/editor.sh <<EOF
1904 885e96df 2023-03-06 naddy ed -s "\$1" <<-EOF
1905 885e96df 2023-03-06 naddy ,s/.*/committing edited changes 1/
1909 b93c7142 2021-10-01 stsp chmod +x $testroot/editor.sh
1911 b93c7142 2021-10-01 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1912 b93c7142 2021-10-01 stsp VISUAL="$testroot/editor.sh" got histedit -c > $testroot/stdout)
1914 b93c7142 2021-10-01 stsp local new_commit1=$(cd $testroot/wt && got info | \
1915 b93c7142 2021-10-01 stsp grep '^work tree base commit: ' | cut -d: -f2 | tr -d ' ')
1916 b93c7142 2021-10-01 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1918 b93c7142 2021-10-01 stsp echo -n "$short_old_commit1 -> $short_new_commit1: " \
1919 b93c7142 2021-10-01 stsp > $testroot/stdout.expected
1920 b93c7142 2021-10-01 stsp echo "committing edited changes 1" >> $testroot/stdout.expected
1921 b93c7142 2021-10-01 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1922 b93c7142 2021-10-01 stsp echo "Stopping histedit for amending commit $old_commit2" \
1923 b93c7142 2021-10-01 stsp >> $testroot/stdout.expected
1924 b93c7142 2021-10-01 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1926 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1927 b93c7142 2021-10-01 stsp diff -u $testroot/stdout.expected $testroot/stdout
1928 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1932 b93c7142 2021-10-01 stsp echo "edited zeta on master" > $testroot/wt/epsilon/zeta
1934 b93c7142 2021-10-01 stsp cat > $testroot/editor.sh <<EOF
1936 885e96df 2023-03-06 naddy ed -s "\$1" <<-EOF
1937 885e96df 2023-03-06 naddy ,s/.*/committing edited changes 2/
1941 b93c7142 2021-10-01 stsp chmod +x $testroot/editor.sh
1943 b93c7142 2021-10-01 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1944 b93c7142 2021-10-01 stsp VISUAL="$testroot/editor.sh" got histedit -c > $testroot/stdout)
1946 b93c7142 2021-10-01 stsp local new_commit2=`git_show_head $testroot/repo`
1947 b93c7142 2021-10-01 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1949 b93c7142 2021-10-01 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
1950 b93c7142 2021-10-01 stsp > $testroot/stdout.expected
1951 b93c7142 2021-10-01 stsp echo "committing edited changes 2" >> $testroot/stdout.expected
1952 b93c7142 2021-10-01 stsp echo "Switching work tree to refs/heads/master" \
1953 b93c7142 2021-10-01 stsp >> $testroot/stdout.expected
1955 b93c7142 2021-10-01 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1957 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1958 b93c7142 2021-10-01 stsp diff -u $testroot/stdout.expected $testroot/stdout
1959 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1963 b93c7142 2021-10-01 stsp echo "edited modified alpha on master" > $testroot/content.expected
1964 b93c7142 2021-10-01 stsp cat $testroot/wt/alpha > $testroot/content
1965 b93c7142 2021-10-01 stsp cmp -s $testroot/content.expected $testroot/content
1967 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1968 b93c7142 2021-10-01 stsp diff -u $testroot/content.expected $testroot/content
1969 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1973 b93c7142 2021-10-01 stsp if [ -e $testroot/wt/beta ]; then
1974 b93c7142 2021-10-01 stsp echo "removed file beta still exists on disk" >&2
1975 b93c7142 2021-10-01 stsp test_done "$testroot" "1"
1979 b93c7142 2021-10-01 stsp echo "new file on master" > $testroot/content.expected
1980 b93c7142 2021-10-01 stsp cat $testroot/wt/epsilon/new > $testroot/content
1981 b93c7142 2021-10-01 stsp cmp -s $testroot/content.expected $testroot/content
1983 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1984 b93c7142 2021-10-01 stsp diff -u $testroot/content.expected $testroot/content
1985 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
1989 b93c7142 2021-10-01 stsp (cd $testroot/wt && got status > $testroot/stdout)
1991 b93c7142 2021-10-01 stsp echo -n > $testroot/stdout.expected
1992 b93c7142 2021-10-01 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1994 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1995 b93c7142 2021-10-01 stsp diff -u $testroot/stdout.expected $testroot/stdout
1996 b93c7142 2021-10-01 stsp test_done "$testroot" "$ret"
2000 b93c7142 2021-10-01 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
2001 b93c7142 2021-10-01 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
2002 b93c7142 2021-10-01 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
2003 a347e6bb 2020-12-13 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
2004 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2006 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2007 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
2009 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
2012 09209b8a 2021-10-08 stsp test_histedit_prepend_line() {
2013 09209b8a 2021-10-08 stsp local testroot=`test_init histedit_prepend_line`
2014 09209b8a 2021-10-08 stsp local orig_commit=`git_show_head $testroot/repo`
2016 09209b8a 2021-10-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2018 5f94a4e0 2022-11-18 op ed -s "$testroot/wt/alpha" <<EOF
2020 09209b8a 2021-10-08 stsp first line
2025 09209b8a 2021-10-08 stsp cp $testroot/wt/alpha $testroot/content.expected
2027 09209b8a 2021-10-08 stsp (cd $testroot/wt/ && got commit -m 'modified alpha on master' \
2028 09209b8a 2021-10-08 stsp alpha > /dev/null)
2030 09209b8a 2021-10-08 stsp if [ "$?" != 0 ]; then
2031 09209b8a 2021-10-08 stsp echo "got commit failed unexpectedly" >&2
2032 09209b8a 2021-10-08 stsp test_done "$testroot" "$ret"
2036 09209b8a 2021-10-08 stsp local top_commit=`git_show_head $testroot/repo`
2037 09209b8a 2021-10-08 stsp echo "pick $top_commit" > "$testroot/histedit-script"
2039 09209b8a 2021-10-08 stsp (cd $testroot/wt/ && got update -c $orig_commit > /dev/null)
2041 09209b8a 2021-10-08 stsp if [ "$?" != 0 ]; then
2042 09209b8a 2021-10-08 stsp echo "got update failed unexpectedly" >&2
2043 09209b8a 2021-10-08 stsp test_done "$testroot" "$ret"
2047 09209b8a 2021-10-08 stsp (cd $testroot/wt && got histedit -F "$testroot/histedit-script" \
2048 09209b8a 2021-10-08 stsp > /dev/null)
2050 09209b8a 2021-10-08 stsp if [ "$?" != 0 ]; then
2051 09209b8a 2021-10-08 stsp echo "got histedit failed unexpectedly" >&2
2052 09209b8a 2021-10-08 stsp test_done "$testroot" "$ret"
2056 09209b8a 2021-10-08 stsp cp $testroot/wt/alpha $testroot/content
2057 09209b8a 2021-10-08 stsp cmp -s $testroot/content.expected $testroot/content
2059 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2060 09209b8a 2021-10-08 stsp diff -u $testroot/content.expected $testroot/content
2061 09209b8a 2021-10-08 stsp test_done "$testroot" "$ret"
2065 09209b8a 2021-10-08 stsp test_done "$testroot" $ret
2068 f1e5aff4 2022-07-12 op test_histedit_mesg_invalid() {
2069 f1e5aff4 2022-07-12 op local testroot=`test_init mesg_invalid`
2071 f1e5aff4 2022-07-12 op local orig_commit=`git_show_head $testroot/repo`
2073 f1e5aff4 2022-07-12 op echo "modified alpha on master" > $testroot/repo/alpha
2074 f1e5aff4 2022-07-12 op (cd $testroot/repo && git rm -q beta)
2075 f1e5aff4 2022-07-12 op echo "new file on master" > $testroot/repo/epsilon/new
2076 f1e5aff4 2022-07-12 op (cd $testroot/repo && git add epsilon/new)
2077 f1e5aff4 2022-07-12 op git_commit $testroot/repo -m 'committing changes'
2078 f1e5aff4 2022-07-12 op local old_commit1=`git_show_head $testroot/repo`
2080 f1e5aff4 2022-07-12 op echo "modified zeta on master" > $testroot/repo/epsilon/zeta
2081 f1e5aff4 2022-07-12 op git_commit $testroot/repo -m 'committing to zeto on master'
2082 f1e5aff4 2022-07-12 op local old_commit2=`git_show_head $testroot/repo`
2084 f1e5aff4 2022-07-12 op got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2086 f1e5aff4 2022-07-12 op if [ $ret -ne 0 ]; then
2087 f1e5aff4 2022-07-12 op test_done "$testroot" $ret
2091 f1e5aff4 2022-07-12 op # try with a leading mesg
2093 f1e5aff4 2022-07-12 op echo "mesg something something" > $testroot/histedit-script
2094 f1e5aff4 2022-07-12 op echo "pick $old_commit1" >> $testroot/histedit-script
2095 f1e5aff4 2022-07-12 op echo "pick $old_commit2" >> $testroot/histedit-script
2097 f1e5aff4 2022-07-12 op (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2098 f1e5aff4 2022-07-12 op > $testroot/stdout 2> $testroot/stderr)
2100 f1e5aff4 2022-07-12 op if [ $ret -eq 0 ]; then
2101 f1e5aff4 2022-07-12 op echo "histedit succeeded unexpectedly" >&2
2102 f1e5aff4 2022-07-12 op test_done "$testroot" 1
2106 f1e5aff4 2022-07-12 op echo "got: bad histedit command" > $testroot/stderr.expected
2107 f1e5aff4 2022-07-12 op cmp -s $testroot/stderr.expected $testroot/stderr
2109 f1e5aff4 2022-07-12 op if [ $ret -ne 0 ]; then
2110 f1e5aff4 2022-07-12 op diff -u $testroot/stderr.expected $testroot/stderr
2111 f1e5aff4 2022-07-12 op test_done "$testroot" $ret
2115 f1e5aff4 2022-07-12 op # try again with mesg -> mesg
2117 f1e5aff4 2022-07-12 op echo "pick $old_commit1" > $testroot/histedit-script
2118 f1e5aff4 2022-07-12 op echo "mesg something something" >> $testroot/histedit-script
2119 f1e5aff4 2022-07-12 op echo "mesg something something else" >> $testroot/histedit-script
2120 f1e5aff4 2022-07-12 op echo "pick $old_commit2" >> $testroot/histedit-script
2122 f1e5aff4 2022-07-12 op (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2123 f1e5aff4 2022-07-12 op > $testroot/stdout 2> $testroot/stderr)
2125 f1e5aff4 2022-07-12 op if [ $ret -eq 0 ]; then
2126 f1e5aff4 2022-07-12 op echo "histedit succeeded unexpectedly" >&2
2127 f1e5aff4 2022-07-12 op test_done "$testroot" 1
2131 f1e5aff4 2022-07-12 op echo "got: bad histedit command" > $testroot/stderr.expected
2132 f1e5aff4 2022-07-12 op cmp -s $testroot/stderr.expected $testroot/stderr
2134 f1e5aff4 2022-07-12 op if [ $ret -ne 0 ]; then
2135 f1e5aff4 2022-07-12 op diff -u $testroot/stderr.expected $testroot/stderr
2136 f1e5aff4 2022-07-12 op test_done "$testroot" $ret
2140 f1e5aff4 2022-07-12 op # try again with drop -> mesg
2142 f1e5aff4 2022-07-12 op echo "drop $old_commit1" > $testroot/histedit-script
2143 f1e5aff4 2022-07-12 op echo "mesg something something" >> $testroot/histedit-script
2144 f1e5aff4 2022-07-12 op echo "pick $old_commit2" >> $testroot/histedit-script
2146 f1e5aff4 2022-07-12 op (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2147 f1e5aff4 2022-07-12 op > $testroot/stdout 2> $testroot/stderr)
2149 f1e5aff4 2022-07-12 op if [ $ret -eq 0 ]; then
2150 f1e5aff4 2022-07-12 op echo "histedit succeeded unexpectedly" >&2
2151 f1e5aff4 2022-07-12 op test_done "$testroot" 1
2155 f1e5aff4 2022-07-12 op echo "got: bad histedit command" > $testroot/stderr.expected
2156 f1e5aff4 2022-07-12 op cmp -s $testroot/stderr.expected $testroot/stderr
2158 f1e5aff4 2022-07-12 op if [ $ret -ne 0 ]; then
2159 f1e5aff4 2022-07-12 op diff -u $testroot/stderr.expected $testroot/stderr
2160 f1e5aff4 2022-07-12 op test_done "$testroot" $ret
2164 f1e5aff4 2022-07-12 op # try again with fold -> mesg
2166 f1e5aff4 2022-07-12 op echo "fold $old_commit1" > $testroot/histedit-script
2167 f1e5aff4 2022-07-12 op echo "mesg something something" >> $testroot/histedit-script
2168 f1e5aff4 2022-07-12 op echo "pick $old_commit2" >> $testroot/histedit-script
2170 f1e5aff4 2022-07-12 op (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2171 f1e5aff4 2022-07-12 op > $testroot/stdout 2> $testroot/stderr)
2173 f1e5aff4 2022-07-12 op if [ $ret -eq 0 ]; then
2174 f1e5aff4 2022-07-12 op echo "histedit succeeded unexpectedly" >&2
2175 f1e5aff4 2022-07-12 op test_done "$testroot" 1
2179 f1e5aff4 2022-07-12 op echo "got: bad histedit command" > $testroot/stderr.expected
2180 f1e5aff4 2022-07-12 op cmp -s $testroot/stderr.expected $testroot/stderr
2182 f1e5aff4 2022-07-12 op if [ $ret -ne 0 ]; then
2183 f1e5aff4 2022-07-12 op diff -u $testroot/stderr.expected $testroot/stderr
2185 f1e5aff4 2022-07-12 op test_done "$testroot" $ret
2188 598eac43 2022-07-22 stsp test_histedit_resets_committer() {
2189 598eac43 2022-07-22 stsp local testroot=`test_init histedit_resets_committer`
2190 598eac43 2022-07-22 stsp local orig_commit=`git_show_head $testroot/repo`
2191 598eac43 2022-07-22 stsp local committer="Flan Luck <flan_luck@openbsd.org>"
2193 598eac43 2022-07-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2195 598eac43 2022-07-22 stsp echo "modified alpha" > $testroot/wt/alpha
2197 598eac43 2022-07-22 stsp (cd $testroot/wt/ && got commit -m 'modified alpha on master' \
2198 598eac43 2022-07-22 stsp alpha > /dev/null)
2200 598eac43 2022-07-22 stsp if [ "$?" != 0 ]; then
2201 598eac43 2022-07-22 stsp echo "got commit failed unexpectedly" >&2
2202 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
2206 598eac43 2022-07-22 stsp local top_commit=`git_show_head $testroot/repo`
2207 598eac43 2022-07-22 stsp echo "pick $top_commit" > "$testroot/histedit-script"
2209 598eac43 2022-07-22 stsp (cd $testroot/wt/ && got update -c $orig_commit > /dev/null)
2211 598eac43 2022-07-22 stsp if [ "$?" != 0 ]; then
2212 598eac43 2022-07-22 stsp echo "got update failed unexpectedly" >&2
2213 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
2217 598eac43 2022-07-22 stsp (cd $testroot/wt && env GOT_AUTHOR="$committer" \
2218 598eac43 2022-07-22 stsp got histedit -F "$testroot/histedit-script" > /dev/null)
2220 598eac43 2022-07-22 stsp if [ "$?" != 0 ]; then
2221 598eac43 2022-07-22 stsp echo "got histedit failed unexpectedly" >&2
2222 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
2225 598eac43 2022-07-22 stsp local edited_commit=`git_show_head $testroot/repo`
2227 598eac43 2022-07-22 stsp # Original commit only had one author
2228 598eac43 2022-07-22 stsp (cd $testroot/repo && got log -l1 -c $top_commit | \
2229 598eac43 2022-07-22 stsp egrep '^(from|via):' > $testroot/stdout)
2230 598eac43 2022-07-22 stsp echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
2231 598eac43 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2233 598eac43 2022-07-22 stsp if [ $ret -ne 0 ]; then
2234 598eac43 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
2235 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
2239 598eac43 2022-07-22 stsp # Edited commit should have new committer name added
2240 598eac43 2022-07-22 stsp (cd $testroot/repo && got log -l1 -c $edited_commit | \
2241 598eac43 2022-07-22 stsp egrep '^(from|via):' > $testroot/stdout)
2242 598eac43 2022-07-22 stsp echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
2243 598eac43 2022-07-22 stsp echo "via: $committer" >> $testroot/stdout.expected
2245 598eac43 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2247 598eac43 2022-07-22 stsp if [ $ret -ne 0 ]; then
2248 598eac43 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
2250 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
2253 b2b3fce1 2022-10-29 op test_histedit_umask() {
2254 b2b3fce1 2022-10-29 op local testroot=`test_init histedit_umask`
2255 b2b3fce1 2022-10-29 op local orig_commit=`git_show_head "$testroot/repo"`
2257 b2b3fce1 2022-10-29 op got checkout "$testroot/repo" "$testroot/wt" >/dev/null
2259 b2b3fce1 2022-10-29 op echo "modified alpha" > $testroot/wt/alpha
2260 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got commit -m 'edit #1') >/dev/null
2261 b2b3fce1 2022-10-29 op local commit1=`git_show_head "$testroot/repo"`
2263 b2b3fce1 2022-10-29 op echo "modified again" > $testroot/wt/alpha
2264 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got commit -m 'edit #2') >/dev/null
2265 b2b3fce1 2022-10-29 op local commit2=`git_show_head "$testroot/repo"`
2267 b2b3fce1 2022-10-29 op echo "modified again!" > $testroot/wt/alpha
2268 b2b3fce1 2022-10-29 op echo "modify beta too!" > $testroot/wt/beta
2269 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got commit -m 'edit #3') >/dev/null
2270 b2b3fce1 2022-10-29 op local commit3=`git_show_head "$testroot/repo"`
2272 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got update -c "$orig_commit") >/dev/null
2274 b2b3fce1 2022-10-29 op if [ $ret -ne 0 ]; then
2275 b2b3fce1 2022-10-29 op echo "update to $orig_commit failed!" >&2
2276 b2b3fce1 2022-10-29 op test_done "$testroot" 1
2280 b2b3fce1 2022-10-29 op echo fold $commit1 >$testroot/histedit-script
2281 b2b3fce1 2022-10-29 op echo fold $commit2 >>$testroot/histedit-script
2282 b2b3fce1 2022-10-29 op echo pick $commit3 >>$testroot/histedit-script
2283 b2b3fce1 2022-10-29 op echo mesg folding changes >>$testroot/histedit-script
2285 b2b3fce1 2022-10-29 op # using a subshell to avoid clobbering global umask
2286 b2b3fce1 2022-10-29 op (umask 077 && cd "$testroot/wt" && \
2287 b2b3fce1 2022-10-29 op got histedit -F "$testroot/histedit-script") >/dev/null
2290 b2b3fce1 2022-10-29 op if [ $ret -ne 0 ]; then
2291 b2b3fce1 2022-10-29 op echo "histedit operation failed" >&2
2292 b2b3fce1 2022-10-29 op test_done "$testroot" $ret
2296 b2b3fce1 2022-10-29 op for f in alpha beta; do
2297 b2b3fce1 2022-10-29 op ls -l "$testroot/wt/$f" | grep -q ^-rw-------
2298 b2b3fce1 2022-10-29 op if [ $? -ne 0 ]; then
2299 b2b3fce1 2022-10-29 op echo "$f is not 0600 after histedi" >&2
2300 b2b3fce1 2022-10-29 op ls -l "$testroot/wt/$f" >&2
2301 b2b3fce1 2022-10-29 op test_done "$testroot" 1
2306 b2b3fce1 2022-10-29 op test_done "$testroot" 0
2309 c48f94a4 2023-01-29 stsp test_histedit_mesg_filemode_change() {
2310 c48f94a4 2023-01-29 stsp local testroot=`test_init histedit_mode_change`
2312 c48f94a4 2023-01-29 stsp local orig_commit=`git_show_head $testroot/repo`
2313 c48f94a4 2023-01-29 stsp local orig_author_time=`git_show_author_time $testroot/repo`
2315 c48f94a4 2023-01-29 stsp chmod +x $testroot/repo/alpha
2316 c48f94a4 2023-01-29 stsp git_commit $testroot/repo -m "set x bit on alpha"
2317 c48f94a4 2023-01-29 stsp local old_commit1=`git_show_head $testroot/repo`
2318 c48f94a4 2023-01-29 stsp local old_author_time1=`git_show_author_time $testroot/repo`
2320 c48f94a4 2023-01-29 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2322 c48f94a4 2023-01-29 stsp if [ $ret -ne 0 ]; then
2323 c48f94a4 2023-01-29 stsp test_done "$testroot" "$ret"
2327 c48f94a4 2023-01-29 stsp if [ -x $testroot/wt/alpha ]; then
2328 c48f94a4 2023-01-29 stsp echo "file alpha has unexpected executable bit" >&2
2329 c48f94a4 2023-01-29 stsp test_done "$testroot" "1"
2333 c48f94a4 2023-01-29 stsp cat > $testroot/editor.sh <<EOF
2335 885e96df 2023-03-06 naddy ed -s "\$1" <<-EOF
2336 885e96df 2023-03-06 naddy ,s/ x bit / executable bit /
2341 c48f94a4 2023-01-29 stsp chmod +x $testroot/editor.sh
2343 71a61c8c 2023-01-29 stsp (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
2344 c48f94a4 2023-01-29 stsp got histedit -m > $testroot/stdout)
2346 c48f94a4 2023-01-29 stsp local new_commit1=`git_show_head $testroot/repo`
2347 c48f94a4 2023-01-29 stsp local new_author_time1=`git_show_author_time $testroot/repo`
2349 c48f94a4 2023-01-29 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
2350 c48f94a4 2023-01-29 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
2352 c48f94a4 2023-01-29 stsp echo "G alpha" > $testroot/stdout.expected
2353 c48f94a4 2023-01-29 stsp echo "$short_old_commit1 -> $short_new_commit1: set executable bit on alpha" \
2354 c48f94a4 2023-01-29 stsp >> $testroot/stdout.expected
2355 c48f94a4 2023-01-29 stsp echo "Switching work tree to refs/heads/master" \
2356 c48f94a4 2023-01-29 stsp >> $testroot/stdout.expected
2358 c48f94a4 2023-01-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2360 c48f94a4 2023-01-29 stsp if [ $ret -ne 0 ]; then
2361 c48f94a4 2023-01-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
2362 c48f94a4 2023-01-29 stsp test_done "$testroot" "$ret"
2366 c48f94a4 2023-01-29 stsp echo "alpha" > $testroot/content.expected
2367 9f31ca1f 2023-01-29 stsp cmp -s $testroot/content.expected $testroot/wt/alpha
2369 c48f94a4 2023-01-29 stsp if [ $ret -ne 0 ]; then
2370 9f31ca1f 2023-01-29 stsp diff -u $testroot/content.expected $testroot/wt/alpha
2371 c48f94a4 2023-01-29 stsp test_done "$testroot" "$ret"
2375 c48f94a4 2023-01-29 stsp if [ ! -x $testroot/wt/alpha ]; then
2376 c48f94a4 2023-01-29 stsp echo "file alpha lost its executable bit" >&2
2377 c48f94a4 2023-01-29 stsp test_done "$testroot" "1"
2381 c48f94a4 2023-01-29 stsp (cd $testroot/wt && got status > $testroot/stdout)
2383 c48f94a4 2023-01-29 stsp echo -n > $testroot/stdout.expected
2384 c48f94a4 2023-01-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2386 c48f94a4 2023-01-29 stsp if [ $ret -ne 0 ]; then
2387 c48f94a4 2023-01-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
2388 c48f94a4 2023-01-29 stsp test_done "$testroot" "$ret"
2392 c48f94a4 2023-01-29 stsp (cd $testroot/wt && got log -l1 | grep ' set executable bit on alpha' \
2393 c48f94a4 2023-01-29 stsp > $testroot/stdout)
2395 c48f94a4 2023-01-29 stsp echo ' set executable bit on alpha' > $testroot/stdout.expected
2396 c48f94a4 2023-01-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2398 c48f94a4 2023-01-29 stsp if [ $ret -ne 0 ]; then
2399 c48f94a4 2023-01-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
2400 c48f94a4 2023-01-29 stsp test_done "$testroot" "$ret"
2404 c48f94a4 2023-01-29 stsp test_done "$testroot" "$ret"
2407 f1c9fe20 2023-01-30 mark test_histedit_drop_only() {
2408 f1c9fe20 2023-01-30 mark local testroot=`test_init histedit_drop_only`
2410 f1c9fe20 2023-01-30 mark local orig_commit=`git_show_head $testroot/repo`
2411 f1c9fe20 2023-01-30 mark local drop="-> drop commit:"
2412 f1c9fe20 2023-01-30 mark local dropmsg="commit changes to drop"
2414 f1c9fe20 2023-01-30 mark echo "modified alpha on master" > $testroot/repo/alpha
2415 f1c9fe20 2023-01-30 mark (cd $testroot/repo && git rm -q beta)
2416 f1c9fe20 2023-01-30 mark echo "new file on master" > $testroot/repo/epsilon/new
2417 f1c9fe20 2023-01-30 mark (cd $testroot/repo && git add epsilon/new)
2419 f1c9fe20 2023-01-30 mark git_commit $testroot/repo -m "$dropmsg 1"
2420 f1c9fe20 2023-01-30 mark local drop_commit1=`git_show_head $testroot/repo`
2422 f1c9fe20 2023-01-30 mark echo "modified zeta on master" > $testroot/repo/epsilon/zeta
2424 f1c9fe20 2023-01-30 mark git_commit $testroot/repo -m "$dropmsg 2"
2425 f1c9fe20 2023-01-30 mark local drop_commit2=`git_show_head $testroot/repo`
2427 f1c9fe20 2023-01-30 mark echo "modified delta on master" > $testroot/repo/gamma/delta
2429 f1c9fe20 2023-01-30 mark git_commit $testroot/repo -m "$dropmsg 3"
2430 f1c9fe20 2023-01-30 mark local drop_commit3=`git_show_head $testroot/repo`
2432 f1c9fe20 2023-01-30 mark got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2434 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2435 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2439 f1c9fe20 2023-01-30 mark (cd $testroot/wt && got histedit -d > $testroot/stdout)
2440 f1c9fe20 2023-01-30 mark local new_commit1=`git_show_head $testroot/repo`
2442 f1c9fe20 2023-01-30 mark local short_commit1=`trim_obj_id 28 $drop_commit1`
2443 f1c9fe20 2023-01-30 mark local short_commit2=`trim_obj_id 28 $drop_commit2`
2444 f1c9fe20 2023-01-30 mark local short_commit3=`trim_obj_id 28 $drop_commit3`
2446 f1c9fe20 2023-01-30 mark echo "$short_commit1 $drop $dropmsg 1" > $testroot/stdout.expected
2447 f1c9fe20 2023-01-30 mark echo "$short_commit2 $drop $dropmsg 2" >> $testroot/stdout.expected
2448 f1c9fe20 2023-01-30 mark echo "$short_commit3 $drop $dropmsg 3" >> $testroot/stdout.expected
2449 f1c9fe20 2023-01-30 mark echo "Switching work tree to refs/heads/master" \
2450 f1c9fe20 2023-01-30 mark >> $testroot/stdout.expected
2452 f1c9fe20 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
2454 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2455 f1c9fe20 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
2456 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2460 f1c9fe20 2023-01-30 mark echo "alpha" > $testroot/content.expected
2461 f1c9fe20 2023-01-30 mark cat $testroot/wt/alpha > $testroot/content
2462 f1c9fe20 2023-01-30 mark cmp -s $testroot/content.expected $testroot/content
2464 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2465 f1c9fe20 2023-01-30 mark diff -u $testroot/content.expected $testroot/content
2466 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2470 f1c9fe20 2023-01-30 mark echo "zeta" > $testroot/content.expected
2471 f1c9fe20 2023-01-30 mark cat $testroot/wt/epsilon/zeta > $testroot/content
2472 f1c9fe20 2023-01-30 mark cmp -s $testroot/content.expected $testroot/content
2474 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2475 f1c9fe20 2023-01-30 mark diff -u $testroot/content.expected $testroot/content
2476 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2480 f1c9fe20 2023-01-30 mark echo "delta" > $testroot/content.expected
2481 f1c9fe20 2023-01-30 mark cat $testroot/wt/gamma/delta > $testroot/content
2482 f1c9fe20 2023-01-30 mark cmp -s $testroot/content.expected $testroot/content
2484 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2485 f1c9fe20 2023-01-30 mark diff -u $testroot/content.expected $testroot/content
2486 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2490 f1c9fe20 2023-01-30 mark if [ ! -e $testroot/wt/beta ]; then
2491 f1c9fe20 2023-01-30 mark echo "removed file beta should be restored" >&2
2492 f1c9fe20 2023-01-30 mark test_done "$testroot" "1"
2496 f1c9fe20 2023-01-30 mark if [ -e $testroot/wt/new ]; then
2497 f1c9fe20 2023-01-30 mark echo "new file should no longer exist" >&2
2498 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2502 f1c9fe20 2023-01-30 mark (cd $testroot/wt && got status > $testroot/stdout)
2504 f1c9fe20 2023-01-30 mark echo -n > $testroot/stdout.expected
2505 f1c9fe20 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
2507 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2508 f1c9fe20 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
2509 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2513 f1c9fe20 2023-01-30 mark (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
2514 f1c9fe20 2023-01-30 mark echo "commit $orig_commit (master)" > $testroot/stdout.expected
2515 f1c9fe20 2023-01-30 mark cmp -s $testroot/stdout.expected $testroot/stdout
2517 f1c9fe20 2023-01-30 mark if [ $ret -ne 0 ]; then
2518 f1c9fe20 2023-01-30 mark diff -u $testroot/stdout.expected $testroot/stdout
2520 f1c9fe20 2023-01-30 mark test_done "$testroot" "$ret"
2523 7fb414ae 2020-08-08 stsp test_parseargs "$@"
2524 0ebf8283 2019-07-24 stsp run_test test_histedit_no_op
2525 0ebf8283 2019-07-24 stsp run_test test_histedit_swap
2526 0ebf8283 2019-07-24 stsp run_test test_histedit_drop
2527 0ebf8283 2019-07-24 stsp run_test test_histedit_fold
2528 0ebf8283 2019-07-24 stsp run_test test_histedit_edit
2529 0ebf8283 2019-07-24 stsp run_test test_histedit_fold_last_commit
2530 0ebf8283 2019-07-24 stsp run_test test_histedit_missing_commit
2531 0ebf8283 2019-07-24 stsp run_test test_histedit_abort
2532 a4027091 2019-07-25 stsp run_test test_histedit_path_prefix_drop
2533 b2c50a0a 2019-07-25 stsp run_test test_histedit_path_prefix_edit
2534 c7d20a3f 2019-07-30 stsp run_test test_histedit_outside_refs_heads
2535 0def28b1 2019-08-17 stsp run_test test_histedit_fold_last_commit_swap
2536 de05890f 2020-03-05 stsp run_test test_histedit_split_commit
2537 5b87815e 2020-03-05 stsp run_test test_histedit_duplicate_commit_in_script
2538 ecfff807 2020-09-23 stsp run_test test_histedit_fold_add_delete
2539 15aed053 2023-03-07 naddy run_test test_histedit_fold_delete_add
2540 239f5c5a 2020-12-13 stsp run_test test_histedit_fold_only
2541 a347e6bb 2020-12-13 stsp run_test test_histedit_fold_only_empty_logmsg
2542 b93c7142 2021-10-01 stsp run_test test_histedit_edit_only
2543 09209b8a 2021-10-08 stsp run_test test_histedit_prepend_line
2544 f1e5aff4 2022-07-12 op run_test test_histedit_mesg_invalid
2545 598eac43 2022-07-22 stsp run_test test_histedit_resets_committer
2546 b2b3fce1 2022-10-29 op run_test test_histedit_umask
2547 c48f94a4 2023-01-29 stsp run_test test_histedit_mesg_filemode_change
2548 f1c9fe20 2023-01-30 mark run_test test_histedit_drop_only
