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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 ac3cdf31 2023-03-06 thomas ed -s $testroot/diff.expected <<-EOF
135 ac3cdf31 2023-03-06 thomas ,s/$old_commit2/$new_commit2/
138 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
140 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 1c72bab5 2023-03-03 thomas d_orig1=`date -u -r $old_author_time1 +"%G-%m-%d"`
160 1c72bab5 2023-03-03 thomas d_orig2=`date -u -r $old_author_time2 +"%a %b %e %X %Y UTC"`
161 1c72bab5 2023-03-03 thomas d_new2=`date -u -r $new_author_time2 +"%G-%m-%d"`
162 1c72bab5 2023-03-03 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 ac3cdf31 2023-03-06 thomas ed -s $testroot/diff.expected <<-EOF
347 ac3cdf31 2023-03-06 thomas ,s/$old_commit2/$new_commit1/
350 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
352 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 ac3cdf31 2023-03-06 thomas ed -s $testroot/diff.expected <<-EOF
455 ac3cdf31 2023-03-06 thomas ,s/$old_commit1/$orig_commit/
456 ac3cdf31 2023-03-06 thomas ,s/$old_commit2/$new_commit2/
459 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
461 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
840 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
844 d52bac28 2021-10-08 thomas # unrelated unversioned file in work tree
845 d52bac28 2021-10-08 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 8641a332 2023-04-14 thomas if [ -e $testroot/wt/epsilon/new ]; then
906 8641a332 2023-04-14 thomas echo "removed file new still exists on disk" >&2
907 8641a332 2023-04-14 thomas test_done "$testroot" "1"
911 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
913 8641a332 2023-04-14 thomas echo "? unversioned-file" > $testroot/stdout.expected
914 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
916 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
917 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
918 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
922 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
923 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
924 0ebf8283 2019-07-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
925 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
926 0160a755 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
928 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
929 0160a755 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
931 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
934 f6cae3ed 2020-09-13 naddy test_histedit_path_prefix_drop() {
935 a4027091 2019-07-25 stsp local testroot=`test_init histedit_path_prefix_drop`
936 0160a755 2019-07-25 stsp local orig_commit=`git_show_head $testroot/repo`
938 0160a755 2019-07-25 stsp echo "modified zeta" > $testroot/repo/epsilon/zeta
939 0160a755 2019-07-25 stsp git_commit $testroot/repo -m "changing zeta"
940 0160a755 2019-07-25 stsp local old_commit1=`git_show_head $testroot/repo`
942 0160a755 2019-07-25 stsp got checkout -c $orig_commit -p gamma $testroot/repo \
943 0160a755 2019-07-25 stsp $testroot/wt > /dev/null
945 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
946 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
950 0160a755 2019-07-25 stsp echo "drop $old_commit1" > $testroot/histedit-script
952 0160a755 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
953 0160a755 2019-07-25 stsp > $testroot/stdout 2> $testroot/stderr)
956 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
957 0160a755 2019-07-25 stsp echo "histedit succeeded unexpectedly" >&2
958 0160a755 2019-07-25 stsp test_done "$testroot" "1"
962 0160a755 2019-07-25 stsp echo -n "got: cannot edit branch history which contains changes " \
963 0160a755 2019-07-25 stsp > $testroot/stderr.expected
964 0160a755 2019-07-25 stsp echo "outside of this work tree's path prefix" \
965 0160a755 2019-07-25 stsp >> $testroot/stderr.expected
967 0160a755 2019-07-25 stsp cmp -s $testroot/stderr.expected $testroot/stderr
969 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
970 0160a755 2019-07-25 stsp diff -u $testroot/stderr.expected $testroot/stderr
971 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
975 0160a755 2019-07-25 stsp rm -rf $testroot/wt
976 0160a755 2019-07-25 stsp got checkout -c $orig_commit -p epsilon $testroot/repo \
977 0160a755 2019-07-25 stsp $testroot/wt > /dev/null
979 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
980 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
983 0160a755 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
984 0160a755 2019-07-25 stsp > $testroot/stdout)
986 0160a755 2019-07-25 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
987 0160a755 2019-07-25 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
989 0160a755 2019-07-25 stsp echo "$short_old_commit1 -> drop commit: changing zeta" \
990 0160a755 2019-07-25 stsp > $testroot/stdout.expected
991 0160a755 2019-07-25 stsp echo "Switching work tree to refs/heads/master" \
992 0160a755 2019-07-25 stsp >> $testroot/stdout.expected
994 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
996 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
997 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
998 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
1002 0160a755 2019-07-25 stsp echo "zeta" > $testroot/content.expected
1003 0160a755 2019-07-25 stsp cat $testroot/wt/zeta > $testroot/content
1004 0160a755 2019-07-25 stsp cmp -s $testroot/content.expected $testroot/content
1006 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1007 0160a755 2019-07-25 stsp diff -u $testroot/content.expected $testroot/content
1008 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
1013 0160a755 2019-07-25 stsp (cd $testroot/wt && got status > $testroot/stdout)
1015 0160a755 2019-07-25 stsp echo -n > $testroot/stdout.expected
1016 0160a755 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1018 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1019 0160a755 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1020 0160a755 2019-07-25 stsp test_done "$testroot" "$ret"
1024 0160a755 2019-07-25 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1025 0160a755 2019-07-25 stsp echo "commit $orig_commit (master)" > $testroot/stdout.expected
1026 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1028 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1029 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1031 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1034 f6cae3ed 2020-09-13 naddy test_histedit_path_prefix_edit() {
1035 b2c50a0a 2019-07-25 stsp local testroot=`test_init histedit_path_prefix_edit`
1036 b2c50a0a 2019-07-25 stsp local orig_commit=`git_show_head $testroot/repo`
1038 b2c50a0a 2019-07-25 stsp echo "modified zeta" > $testroot/repo/epsilon/zeta
1039 b2c50a0a 2019-07-25 stsp git_commit $testroot/repo -m "changing zeta"
1040 b2c50a0a 2019-07-25 stsp local old_commit1=`git_show_head $testroot/repo`
1042 b2c50a0a 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $old_commit1 \
1043 b2c50a0a 2019-07-25 stsp > $testroot/diff.expected
1045 b2c50a0a 2019-07-25 stsp got checkout -c $orig_commit -p gamma $testroot/repo \
1046 b2c50a0a 2019-07-25 stsp $testroot/wt > /dev/null
1048 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1049 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1053 b2c50a0a 2019-07-25 stsp echo "edit $old_commit1" > $testroot/histedit-script
1054 b2c50a0a 2019-07-25 stsp echo "mesg modified zeta" >> $testroot/histedit-script
1056 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1057 b2c50a0a 2019-07-25 stsp > $testroot/stdout 2> $testroot/stderr)
1060 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1061 b2c50a0a 2019-07-25 stsp echo "histedit succeeded unexpectedly" >&2
1062 b2c50a0a 2019-07-25 stsp test_done "$testroot" "1"
1066 b2c50a0a 2019-07-25 stsp echo -n "got: cannot edit branch history which contains changes " \
1067 b2c50a0a 2019-07-25 stsp > $testroot/stderr.expected
1068 b2c50a0a 2019-07-25 stsp echo "outside of this work tree's path prefix" \
1069 b2c50a0a 2019-07-25 stsp >> $testroot/stderr.expected
1071 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1073 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1074 b2c50a0a 2019-07-25 stsp diff -u $testroot/stderr.expected $testroot/stderr
1075 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1079 b2c50a0a 2019-07-25 stsp rm -rf $testroot/wt
1080 b2c50a0a 2019-07-25 stsp got checkout -c $orig_commit -p epsilon $testroot/repo \
1081 b2c50a0a 2019-07-25 stsp $testroot/wt > /dev/null
1083 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1084 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1087 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1088 b2c50a0a 2019-07-25 stsp > $testroot/stdout)
1090 b2c50a0a 2019-07-25 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1092 b2c50a0a 2019-07-25 stsp echo "G zeta" > $testroot/stdout.expected
1093 b2c50a0a 2019-07-25 stsp echo "Stopping histedit for amending commit $old_commit1" \
1094 b2c50a0a 2019-07-25 stsp >> $testroot/stdout.expected
1095 0160a755 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1097 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1098 0160a755 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1099 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1103 b2c50a0a 2019-07-25 stsp echo "modified zeta" > $testroot/content.expected
1104 b2c50a0a 2019-07-25 stsp cat $testroot/wt/zeta > $testroot/content
1105 b2c50a0a 2019-07-25 stsp cmp -s $testroot/content.expected $testroot/content
1107 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1108 b2c50a0a 2019-07-25 stsp diff -u $testroot/content.expected $testroot/content
1109 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1113 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got status > $testroot/stdout)
1115 b2c50a0a 2019-07-25 stsp echo "M zeta"> $testroot/stdout.expected
1116 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1118 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1119 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1120 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1124 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got histedit -c > $testroot/stdout)
1126 b2c50a0a 2019-07-25 stsp local new_commit1=`git_show_head $testroot/repo`
1127 b2c50a0a 2019-07-25 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1129 b2c50a0a 2019-07-25 stsp echo -n "$short_old_commit1 -> $short_new_commit1: " \
1130 b2c50a0a 2019-07-25 stsp > $testroot/stdout.expected
1131 b2c50a0a 2019-07-25 stsp echo "modified zeta" >> $testroot/stdout.expected
1132 b2c50a0a 2019-07-25 stsp echo "Switching work tree to refs/heads/master" \
1133 b2c50a0a 2019-07-25 stsp >> $testroot/stdout.expected
1135 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1137 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1138 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1139 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1143 b2c50a0a 2019-07-25 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1144 b2c50a0a 2019-07-25 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1145 b2c50a0a 2019-07-25 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1146 b2c50a0a 2019-07-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1148 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1149 b2c50a0a 2019-07-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
1150 b2c50a0a 2019-07-25 stsp test_done "$testroot" "$ret"
1154 b2c50a0a 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit1 \
1155 b2c50a0a 2019-07-25 stsp > $testroot/diff
1156 ac3cdf31 2023-03-06 thomas ed -s $testroot/diff.expected <<-EOF
1157 ac3cdf31 2023-03-06 thomas ,s/$old_commit1/$new_commit1/
1160 b2c50a0a 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
1162 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1163 b2c50a0a 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
1165 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
1168 f6cae3ed 2020-09-13 naddy test_histedit_outside_refs_heads() {
1169 c7d20a3f 2019-07-30 stsp local testroot=`test_init histedit_outside_refs_heads`
1170 c7d20a3f 2019-07-30 stsp local commit1=`git_show_head $testroot/repo`
1172 c7d20a3f 2019-07-30 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1174 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1175 c7d20a3f 2019-07-30 stsp echo "got checkout failed unexpectedly"
1176 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1180 c7d20a3f 2019-07-30 stsp echo "modified alpha" > $testroot/wt/alpha
1182 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got commit -m 'change alpha' \
1183 c7d20a3f 2019-07-30 stsp > $testroot/stdout 2> $testroot/stderr)
1185 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1186 c7d20a3f 2019-07-30 stsp echo "got commit failed unexpectedly" >&2
1187 c7d20a3f 2019-07-30 stsp test_done "$testroot" "1"
1190 c7d20a3f 2019-07-30 stsp local commit2=`git_show_head $testroot/repo`
1192 e31abbf2 2020-03-22 stsp got ref -r $testroot/repo -c master refs/remotes/origin/master
1194 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1195 c7d20a3f 2019-07-30 stsp echo "got ref failed unexpectedly" >&2
1196 c7d20a3f 2019-07-30 stsp test_done "$testroot" "1"
1200 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got update -b origin/master -c $commit1 >/dev/null)
1202 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1203 c7d20a3f 2019-07-30 stsp echo "got update failed unexpectedly"
1204 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1208 c7d20a3f 2019-07-30 stsp echo "edit $commit2" > $testroot/histedit-script
1209 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1210 c7d20a3f 2019-07-30 stsp 2> $testroot/stderr)
1212 c7d20a3f 2019-07-30 stsp echo -n "got: will not edit commit history of a branch outside the " \
1213 c7d20a3f 2019-07-30 stsp > $testroot/stderr.expected
1214 c7d20a3f 2019-07-30 stsp echo '"refs/heads/" reference namespace' \
1215 c7d20a3f 2019-07-30 stsp >> $testroot/stderr.expected
1216 c7d20a3f 2019-07-30 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1218 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1219 c7d20a3f 2019-07-30 stsp diff -u $testroot/stderr.expected $testroot/stderr
1221 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1224 f6cae3ed 2020-09-13 naddy test_histedit_fold_last_commit_swap() {
1225 0def28b1 2019-08-17 stsp local testroot=`test_init histedit_fold_last_commit_swap`
1227 0def28b1 2019-08-17 stsp local orig_commit=`git_show_head $testroot/repo`
1229 0def28b1 2019-08-17 stsp echo "modified alpha on master" > $testroot/repo/alpha
1230 0def28b1 2019-08-17 stsp (cd $testroot/repo && git rm -q beta)
1231 0def28b1 2019-08-17 stsp echo "new file on master" > $testroot/repo/epsilon/new
1232 0def28b1 2019-08-17 stsp (cd $testroot/repo && git add epsilon/new)
1233 0def28b1 2019-08-17 stsp git_commit $testroot/repo -m "committing changes"
1234 0def28b1 2019-08-17 stsp local old_commit1=`git_show_head $testroot/repo`
1236 0def28b1 2019-08-17 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1237 0def28b1 2019-08-17 stsp git_commit $testroot/repo -m "committing to zeta on master"
1238 0def28b1 2019-08-17 stsp local old_commit2=`git_show_head $testroot/repo`
1240 0def28b1 2019-08-17 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1242 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1243 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1247 0def28b1 2019-08-17 stsp # fold commit2 into commit1 (requires swapping commits)
1248 0def28b1 2019-08-17 stsp echo "fold $old_commit2" > $testroot/histedit-script
1249 0def28b1 2019-08-17 stsp echo "pick $old_commit1" >> $testroot/histedit-script
1250 0def28b1 2019-08-17 stsp echo "mesg committing folded changes" >> $testroot/histedit-script
1252 0def28b1 2019-08-17 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1253 0def28b1 2019-08-17 stsp > $testroot/stdout 2> $testroot/stderr)
1256 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1257 0def28b1 2019-08-17 stsp echo "histedit failed unexpectedly" >&2
1258 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1262 0def28b1 2019-08-17 stsp local new_commit=`git_show_head $testroot/repo`
1264 0def28b1 2019-08-17 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1265 0def28b1 2019-08-17 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1266 0def28b1 2019-08-17 stsp local short_new_commit=`trim_obj_id 28 $new_commit`
1268 0def28b1 2019-08-17 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1269 0def28b1 2019-08-17 stsp echo -n "$short_old_commit2 -> fold commit: committing to zeta " \
1270 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1271 0def28b1 2019-08-17 stsp echo "on master" >> $testroot/stdout.expected
1272 0def28b1 2019-08-17 stsp echo "G alpha" >> $testroot/stdout.expected
1273 0def28b1 2019-08-17 stsp echo "D beta" >> $testroot/stdout.expected
1274 0def28b1 2019-08-17 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1275 0def28b1 2019-08-17 stsp echo -n "$short_old_commit1 -> $short_new_commit: " \
1276 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1277 0def28b1 2019-08-17 stsp echo "committing folded changes" >> $testroot/stdout.expected
1278 0def28b1 2019-08-17 stsp echo "Switching work tree to refs/heads/master" \
1279 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1281 0def28b1 2019-08-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1283 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1284 0def28b1 2019-08-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1286 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1289 f6cae3ed 2020-09-13 naddy test_histedit_split_commit() {
1290 de05890f 2020-03-05 stsp local testroot=`test_init histedit_split_commit`
1292 de05890f 2020-03-05 stsp local orig_commit=`git_show_head $testroot/repo`
1294 de05890f 2020-03-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
1295 de05890f 2020-03-05 stsp (cd $testroot/repo && git rm -q beta)
1296 de05890f 2020-03-05 stsp echo "new file on master" > $testroot/repo/epsilon/new
1297 de05890f 2020-03-05 stsp (cd $testroot/repo && git add epsilon/new)
1298 de05890f 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 1"
1299 de05890f 2020-03-05 stsp local old_commit1=`git_show_head $testroot/repo`
1300 de05890f 2020-03-05 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1302 de05890f 2020-03-05 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1303 de05890f 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 2"
1304 de05890f 2020-03-05 stsp local old_commit2=`git_show_head $testroot/repo`
1305 de05890f 2020-03-05 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1307 de05890f 2020-03-05 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1309 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1310 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1314 de05890f 2020-03-05 stsp # split commit1 into commitA and commitB and commitC
1315 de05890f 2020-03-05 stsp echo "e $old_commit1" > $testroot/histedit-script
1316 de05890f 2020-03-05 stsp echo "p $old_commit2" >> $testroot/histedit-script
1318 de05890f 2020-03-05 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1319 de05890f 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1321 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1322 de05890f 2020-03-05 stsp echo "histedit failed unexpectedly:" >&2
1323 de05890f 2020-03-05 stsp cat $testroot/stderr >&2
1324 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1328 de05890f 2020-03-05 stsp echo "G alpha" > $testroot/stdout.expected
1329 de05890f 2020-03-05 stsp echo "D beta" >> $testroot/stdout.expected
1330 de05890f 2020-03-05 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1331 de05890f 2020-03-05 stsp echo "Stopping histedit for amending commit $old_commit1" \
1332 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1334 de05890f 2020-03-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1336 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1337 de05890f 2020-03-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1338 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1342 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitA" alpha >/dev/null)
1344 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1345 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1346 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1350 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitB" beta >/dev/null)
1352 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1353 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1354 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1358 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitC" epsilon/new >/dev/null)
1360 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1361 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1362 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1366 de05890f 2020-03-05 stsp (cd $testroot/wt && got histedit -c \
1367 de05890f 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1369 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1370 de05890f 2020-03-05 stsp echo "histedit failed unexpectedly:" >&2
1371 de05890f 2020-03-05 stsp cat $testroot/stderr >&2
1372 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1375 de05890f 2020-03-05 stsp local new_commit2=`git_show_head $testroot/repo`
1376 de05890f 2020-03-05 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1378 de05890f 2020-03-05 stsp echo "$short_old_commit1 -> no-op change: committing changes 1" \
1379 de05890f 2020-03-05 stsp > $testroot/stdout.expected
1380 de05890f 2020-03-05 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1381 de05890f 2020-03-05 stsp echo "$short_old_commit2 -> $short_new_commit2: committing changes 2" \
1382 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1383 de05890f 2020-03-05 stsp echo "Switching work tree to refs/heads/master" \
1384 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1386 de05890f 2020-03-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1388 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1389 de05890f 2020-03-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1391 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1395 f6cae3ed 2020-09-13 naddy test_histedit_duplicate_commit_in_script() {
1396 5b87815e 2020-03-05 stsp local testroot=`test_init histedit_duplicate_commit_in_script`
1398 5b87815e 2020-03-05 stsp local orig_commit=`git_show_head $testroot/repo`
1400 5b87815e 2020-03-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
1401 5b87815e 2020-03-05 stsp (cd $testroot/repo && git rm -q beta)
1402 5b87815e 2020-03-05 stsp echo "new file on master" > $testroot/repo/epsilon/new
1403 5b87815e 2020-03-05 stsp (cd $testroot/repo && git add epsilon/new)
1404 5b87815e 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 1"
1405 5b87815e 2020-03-05 stsp local old_commit1=`git_show_head $testroot/repo`
1407 5b87815e 2020-03-05 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1408 5b87815e 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 2"
1409 5b87815e 2020-03-05 stsp local old_commit2=`git_show_head $testroot/repo`
1411 5b87815e 2020-03-05 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1413 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1414 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1418 5b87815e 2020-03-05 stsp # This histedit script lists commit1 more than once
1419 5b87815e 2020-03-05 stsp echo "p $old_commit1" > $testroot/histedit-script
1420 5b87815e 2020-03-05 stsp echo "p $old_commit1" >> $testroot/histedit-script
1421 5b87815e 2020-03-05 stsp echo "p $old_commit2" >> $testroot/histedit-script
1423 5b87815e 2020-03-05 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1424 5b87815e 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1426 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1427 5b87815e 2020-03-05 stsp echo "histedit succeeded unexpectedly:" >&2
1428 5b87815e 2020-03-05 stsp cat $testroot/stdout >&2
1429 0b477035 2023-06-22 thomas test_done "$testroot" 1
1433 5b87815e 2020-03-05 stsp echo -n "got: commit $old_commit1 is listed more than once " \
1434 5b87815e 2020-03-05 stsp > $testroot/stderr.expected
1435 5b87815e 2020-03-05 stsp echo "in histedit script" >> $testroot/stderr.expected
1437 5b87815e 2020-03-05 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1439 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1440 5b87815e 2020-03-05 stsp diff -u $testroot/stderr.expected $testroot/stderr
1442 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1446 ecfff807 2020-09-23 stsp # if a previous commit introduces a new file, and it is folded into a commit
1447 ecfff807 2020-09-23 stsp # that deletes the same file, the file still exists after the histedit
1448 ecfff807 2020-09-23 stsp test_histedit_fold_add_delete() {
1449 4c662b1d 2021-09-01 stsp local testroot=`test_init histedit_fold_add_delete`
1451 ecfff807 2020-09-23 stsp local orig_commit=`git_show_head $testroot/repo`
1453 ecfff807 2020-09-23 stsp echo "added new file epsilon/psi" > $testroot/repo/epsilon/psi
1454 ecfff807 2020-09-23 stsp (cd $testroot/repo && git add epsilon/psi)
1455 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "committing changes"
1456 ecfff807 2020-09-23 stsp local old_commit1=`git_show_head $testroot/repo`
1458 ecfff807 2020-09-23 stsp echo "modified epsilon/psi" > $testroot/repo/epsilon/psi
1459 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "editing psi"
1460 ecfff807 2020-09-23 stsp local old_commit2=`git_show_head $testroot/repo`
1462 ecfff807 2020-09-23 stsp (cd $testroot/repo && git rm -q epsilon/psi)
1463 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "removing psi"
1464 ecfff807 2020-09-23 stsp local old_commit3=`git_show_head $testroot/repo`
1466 ecfff807 2020-09-23 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1468 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1469 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1473 ecfff807 2020-09-23 stsp echo "fold $old_commit1" > $testroot/histedit-script
1474 ecfff807 2020-09-23 stsp echo "fold $old_commit2" >> $testroot/histedit-script
1475 ecfff807 2020-09-23 stsp echo "pick $old_commit3" >> $testroot/histedit-script
1476 ecfff807 2020-09-23 stsp echo "mesg folded changes" >> $testroot/histedit-script
1478 ecfff807 2020-09-23 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1479 ecfff807 2020-09-23 stsp > $testroot/stdout)
1481 ecfff807 2020-09-23 stsp local new_commit1=`git_show_head $testroot/repo`
1483 ecfff807 2020-09-23 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1484 ecfff807 2020-09-23 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1485 ecfff807 2020-09-23 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1486 ecfff807 2020-09-23 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1488 ecfff807 2020-09-23 stsp echo "A epsilon/psi" >> $testroot/stdout.expected
1489 ecfff807 2020-09-23 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1490 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1491 ecfff807 2020-09-23 stsp echo "G epsilon/psi" >> $testroot/stdout.expected
1492 ecfff807 2020-09-23 stsp echo "$short_old_commit2 -> fold commit: editing psi" \
1493 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1494 0a22ca1a 2020-09-23 stsp echo "D epsilon/psi" >> $testroot/stdout.expected
1495 0a22ca1a 2020-09-23 stsp echo "$short_old_commit3 -> no-op change: folded changes" \
1496 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1497 ecfff807 2020-09-23 stsp echo "Switching work tree to refs/heads/master" \
1498 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1500 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1502 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1503 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1504 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1508 ecfff807 2020-09-23 stsp if [ -e $testroot/wt/epsilon/psi ]; then
1509 0a22ca1a 2020-09-23 stsp echo "removed file psi still exists on disk" >&2
1510 0a22ca1a 2020-09-23 stsp test_done "$testroot" "1"
1514 ecfff807 2020-09-23 stsp (cd $testroot/wt && got status > $testroot/stdout)
1516 ecfff807 2020-09-23 stsp echo -n > $testroot/stdout.expected
1517 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1519 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1520 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1521 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1525 ecfff807 2020-09-23 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1526 ecfff807 2020-09-23 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1527 29c68398 2020-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1529 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1530 29c68398 2020-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1531 29c68398 2020-09-24 stsp test_done "$testroot" "$ret"
1535 29c68398 2020-09-24 stsp got tree -r $testroot/repo epsilon > $testroot/stdout
1536 29c68398 2020-09-24 stsp echo "zeta" > $testroot/stdout.expected
1537 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1539 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1540 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1542 99fe3033 2023-03-08 thomas test_done "$testroot" "$ret"
1545 4c3671a9 2023-07-26 thomas # if a previous commit edits a file, and it is folded into a commit
1546 4c3671a9 2023-07-26 thomas # that deletes the same file, the file will be deleted by histedit
1547 4c3671a9 2023-07-26 thomas test_histedit_fold_edit_delete() {
1548 4c3671a9 2023-07-26 thomas local testroot=`test_init histedit_fold_edit_delete`
1550 4c3671a9 2023-07-26 thomas local orig_commit=`git_show_head $testroot/repo`
1552 4c3671a9 2023-07-26 thomas echo "modify alpha" > $testroot/repo/alpha
1553 4c3671a9 2023-07-26 thomas (cd $testroot/repo && git add alpha)
1554 4c3671a9 2023-07-26 thomas git_commit $testroot/repo -m "modified alpha"
1555 4c3671a9 2023-07-26 thomas local old_commit1=`git_show_head $testroot/repo`
1557 4c3671a9 2023-07-26 thomas git_rm $testroot/repo alpha
1558 4c3671a9 2023-07-26 thomas git_commit $testroot/repo -m "deleted alpha"
1559 4c3671a9 2023-07-26 thomas local old_commit2=`git_show_head $testroot/repo`
1561 4c3671a9 2023-07-26 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1563 4c3671a9 2023-07-26 thomas if [ $ret -ne 0 ]; then
1564 4c3671a9 2023-07-26 thomas test_done "$testroot" "$ret"
1565 4c3671a9 2023-07-26 thomas return 1
1568 4c3671a9 2023-07-26 thomas echo "fold $old_commit1" > $testroot/histedit-script
1569 4c3671a9 2023-07-26 thomas echo "pick $old_commit2" >> $testroot/histedit-script
1570 4c3671a9 2023-07-26 thomas echo "mesg folded changes" >> $testroot/histedit-script
1572 4c3671a9 2023-07-26 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1573 4c3671a9 2023-07-26 thomas > $testroot/stdout)
1575 4c3671a9 2023-07-26 thomas local new_commit1=`git_show_head $testroot/repo`
1577 4c3671a9 2023-07-26 thomas local short_old_commit1=`trim_obj_id 28 $old_commit1`
1578 4c3671a9 2023-07-26 thomas local short_old_commit2=`trim_obj_id 28 $old_commit2`
1579 4c3671a9 2023-07-26 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1581 4c3671a9 2023-07-26 thomas echo "G alpha" >> $testroot/stdout.expected
1582 4c3671a9 2023-07-26 thomas echo "$short_old_commit1 -> fold commit: modified alpha" \
1583 4c3671a9 2023-07-26 thomas >> $testroot/stdout.expected
1584 4c3671a9 2023-07-26 thomas echo "D alpha" >> $testroot/stdout.expected
1585 4c3671a9 2023-07-26 thomas echo "$short_old_commit2 -> $short_new_commit1: folded changes" \
1586 4c3671a9 2023-07-26 thomas >> $testroot/stdout.expected
1587 4c3671a9 2023-07-26 thomas echo "Switching work tree to refs/heads/master" \
1588 4c3671a9 2023-07-26 thomas >> $testroot/stdout.expected
1590 4c3671a9 2023-07-26 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1592 4c3671a9 2023-07-26 thomas if [ $ret -ne 0 ]; then
1593 4c3671a9 2023-07-26 thomas diff -u $testroot/stdout.expected $testroot/stdout
1594 4c3671a9 2023-07-26 thomas test_done "$testroot" "$ret"
1595 4c3671a9 2023-07-26 thomas return 1
1598 4c3671a9 2023-07-26 thomas if [ -e $testroot/wt/alpha ]; then
1599 4c3671a9 2023-07-26 thomas echo "removed file alpha still exists on disk" >&2
1600 4c3671a9 2023-07-26 thomas test_done "$testroot" "1"
1601 4c3671a9 2023-07-26 thomas return 1
1604 4c3671a9 2023-07-26 thomas (cd $testroot/wt && got status > $testroot/stdout)
1606 4c3671a9 2023-07-26 thomas echo -n > $testroot/stdout.expected
1607 4c3671a9 2023-07-26 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1609 4c3671a9 2023-07-26 thomas if [ $ret -ne 0 ]; then
1610 4c3671a9 2023-07-26 thomas diff -u $testroot/stdout.expected $testroot/stdout
1611 4c3671a9 2023-07-26 thomas test_done "$testroot" "$ret"
1612 4c3671a9 2023-07-26 thomas return 1
1615 4c3671a9 2023-07-26 thomas (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
1616 4c3671a9 2023-07-26 thomas echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1617 4c3671a9 2023-07-26 thomas echo "commit $orig_commit" >> $testroot/stdout.expected
1618 4c3671a9 2023-07-26 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1620 4c3671a9 2023-07-26 thomas if [ $ret -ne 0 ]; then
1621 4c3671a9 2023-07-26 thomas diff -u $testroot/stdout.expected $testroot/stdout
1624 4c3671a9 2023-07-26 thomas test_done "$testroot" "$ret"
1627 99fe3033 2023-03-08 thomas test_histedit_fold_delete_add() {
1628 99fe3033 2023-03-08 thomas local testroot=`test_init histedit_fold_delete_add`
1630 99fe3033 2023-03-08 thomas local orig_commit=`git_show_head $testroot/repo`
1632 99fe3033 2023-03-08 thomas (cd $testroot/repo && git rm -q alpha)
1633 99fe3033 2023-03-08 thomas git_commit $testroot/repo -m "removing alpha"
1634 99fe3033 2023-03-08 thomas local old_commit1=`git_show_head $testroot/repo`
1636 99fe3033 2023-03-08 thomas echo "modified alpha" >$testroot/repo/alpha
1637 99fe3033 2023-03-08 thomas (cd $testroot/repo && git add alpha)
1638 99fe3033 2023-03-08 thomas git_commit $testroot/repo -m "add back modified alpha"
1639 99fe3033 2023-03-08 thomas local old_commit2=`git_show_head $testroot/repo`
1641 99fe3033 2023-03-08 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1643 99fe3033 2023-03-08 thomas if [ $ret -ne 0 ]; then
1644 99fe3033 2023-03-08 thomas test_done "$testroot" "$ret"
1645 99fe3033 2023-03-08 thomas return 1
1648 99fe3033 2023-03-08 thomas echo "fold $old_commit1" > $testroot/histedit-script
1649 99fe3033 2023-03-08 thomas echo "pick $old_commit2" >> $testroot/histedit-script
1650 99fe3033 2023-03-08 thomas echo "mesg folded changes" >> $testroot/histedit-script
1652 99fe3033 2023-03-08 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1653 99fe3033 2023-03-08 thomas > $testroot/stdout)
1655 99fe3033 2023-03-08 thomas local new_commit1=`git_show_head $testroot/repo`
1657 99fe3033 2023-03-08 thomas local short_old_commit1=`trim_obj_id 28 $old_commit1`
1658 99fe3033 2023-03-08 thomas local short_old_commit2=`trim_obj_id 28 $old_commit2`
1659 99fe3033 2023-03-08 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1661 99fe3033 2023-03-08 thomas echo "D alpha" > $testroot/stdout.expected
1662 99fe3033 2023-03-08 thomas echo "$short_old_commit1 -> fold commit: removing alpha" \
1663 99fe3033 2023-03-08 thomas >> $testroot/stdout.expected
1664 99fe3033 2023-03-08 thomas echo "A alpha" >> $testroot/stdout.expected
1665 99fe3033 2023-03-08 thomas echo "$short_old_commit2 -> $short_new_commit1: folded changes" \
1666 99fe3033 2023-03-08 thomas >> $testroot/stdout.expected
1667 99fe3033 2023-03-08 thomas echo "Switching work tree to refs/heads/master" \
1668 99fe3033 2023-03-08 thomas >> $testroot/stdout.expected
1670 0529f8df 2023-03-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1672 0529f8df 2023-03-10 thomas if [ $ret -ne 0 ]; then
1673 0529f8df 2023-03-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1674 0529f8df 2023-03-10 thomas test_done "$testroot" "$ret"
1675 0529f8df 2023-03-10 thomas return 1
1678 99fe3033 2023-03-08 thomas if [ ! -e $testroot/wt/alpha ]; then
1679 0529f8df 2023-03-10 thomas echo "file alpha is missing on disk" >&2
1680 0529f8df 2023-03-10 thomas test_done "$testroot" "1"
1681 0e5a098a 2023-03-14 thomas return 1
1684 0e5a098a 2023-03-14 thomas echo "modified alpha" > $testroot/content.expected
1685 0e5a098a 2023-03-14 thomas cat $testroot/wt/alpha > $testroot/content
1686 0e5a098a 2023-03-14 thomas cmp -s $testroot/content.expected $testroot/content
1688 0e5a098a 2023-03-14 thomas if [ $ret -ne 0 ]; then
1689 0e5a098a 2023-03-14 thomas diff -u $testroot/content.expected $testroot/content
1690 0e5a098a 2023-03-14 thomas test_done "$testroot" "$ret"
1691 0529f8df 2023-03-10 thomas return 1
1693 0529f8df 2023-03-10 thomas test_done "$testroot" "0"
1696 239f5c5a 2020-12-13 stsp test_histedit_fold_only() {
1697 239f5c5a 2020-12-13 stsp local testroot=`test_init histedit_fold_only`
1699 239f5c5a 2020-12-13 stsp local orig_commit=`git_show_head $testroot/repo`
1701 239f5c5a 2020-12-13 stsp echo "modified alpha on master" > $testroot/repo/alpha
1702 239f5c5a 2020-12-13 stsp (cd $testroot/repo && git rm -q beta)
1703 239f5c5a 2020-12-13 stsp echo "new file on master" > $testroot/repo/epsilon/new
1704 239f5c5a 2020-12-13 stsp (cd $testroot/repo && git add epsilon/new)
1705 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing changes"
1706 239f5c5a 2020-12-13 stsp local old_commit1=`git_show_head $testroot/repo`
1708 239f5c5a 2020-12-13 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1709 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing to zeta on master"
1710 239f5c5a 2020-12-13 stsp local old_commit2=`git_show_head $testroot/repo`
1712 239f5c5a 2020-12-13 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
1713 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing to delta on master"
1714 239f5c5a 2020-12-13 stsp local old_commit3=`git_show_head $testroot/repo`
1716 239f5c5a 2020-12-13 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1718 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1719 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1723 239f5c5a 2020-12-13 stsp cat > $testroot/editor.sh <<EOF
1725 ac3cdf31 2023-03-06 thomas ed -s "\$1" <<-EOF
1726 ac3cdf31 2023-03-06 thomas ,s/.*/committing folded changes/
1730 239f5c5a 2020-12-13 stsp chmod +x $testroot/editor.sh
1732 239f5c5a 2020-12-13 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1733 239f5c5a 2020-12-13 stsp VISUAL="$testroot/editor.sh" got histedit -f > $testroot/stdout)
1735 239f5c5a 2020-12-13 stsp local new_commit1=`git_show_head $testroot/repo`
1737 239f5c5a 2020-12-13 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1738 239f5c5a 2020-12-13 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1739 239f5c5a 2020-12-13 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1740 239f5c5a 2020-12-13 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1741 239f5c5a 2020-12-13 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1743 239f5c5a 2020-12-13 stsp echo "G alpha" > $testroot/stdout.expected
1744 239f5c5a 2020-12-13 stsp echo "D beta" >> $testroot/stdout.expected
1745 239f5c5a 2020-12-13 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1746 239f5c5a 2020-12-13 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1747 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1748 239f5c5a 2020-12-13 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1749 239f5c5a 2020-12-13 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
1750 239f5c5a 2020-12-13 stsp echo "fold commit: committing to zeta on master" \
1751 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1752 239f5c5a 2020-12-13 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1753 239f5c5a 2020-12-13 stsp echo -n "$short_old_commit3 -> $short_new_commit1: " \
1754 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1755 239f5c5a 2020-12-13 stsp echo "committing folded changes" >> $testroot/stdout.expected
1756 239f5c5a 2020-12-13 stsp echo "Switching work tree to refs/heads/master" \
1757 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1759 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1761 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1762 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1763 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1767 239f5c5a 2020-12-13 stsp echo "modified alpha on master" > $testroot/content.expected
1768 239f5c5a 2020-12-13 stsp cat $testroot/wt/alpha > $testroot/content
1769 239f5c5a 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1771 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1772 239f5c5a 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1773 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1777 239f5c5a 2020-12-13 stsp if [ -e $testroot/wt/beta ]; then
1778 239f5c5a 2020-12-13 stsp echo "removed file beta still exists on disk" >&2
1779 239f5c5a 2020-12-13 stsp test_done "$testroot" "1"
1783 239f5c5a 2020-12-13 stsp echo "new file on master" > $testroot/content.expected
1784 239f5c5a 2020-12-13 stsp cat $testroot/wt/epsilon/new > $testroot/content
1785 239f5c5a 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1787 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1788 239f5c5a 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1789 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1793 239f5c5a 2020-12-13 stsp (cd $testroot/wt && got status > $testroot/stdout)
1795 239f5c5a 2020-12-13 stsp echo -n > $testroot/stdout.expected
1796 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1798 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1799 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1800 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1804 239f5c5a 2020-12-13 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
1805 239f5c5a 2020-12-13 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1806 239f5c5a 2020-12-13 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1807 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1809 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1810 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1812 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1815 a347e6bb 2020-12-13 stsp test_histedit_fold_only_empty_logmsg() {
1816 a347e6bb 2020-12-13 stsp local testroot=`test_init histedit_fold_only_empty_logmsg`
1818 a347e6bb 2020-12-13 stsp local orig_commit=`git_show_head $testroot/repo`
1820 a347e6bb 2020-12-13 stsp echo "modified alpha on master" > $testroot/repo/alpha
1821 a347e6bb 2020-12-13 stsp (cd $testroot/repo && git rm -q beta)
1822 a347e6bb 2020-12-13 stsp echo "new file on master" > $testroot/repo/epsilon/new
1823 a347e6bb 2020-12-13 stsp (cd $testroot/repo && git add epsilon/new)
1824 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing changes"
1825 a347e6bb 2020-12-13 stsp local old_commit1=`git_show_head $testroot/repo`
1827 a347e6bb 2020-12-13 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1828 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing to zeta on master"
1829 a347e6bb 2020-12-13 stsp local old_commit2=`git_show_head $testroot/repo`
1831 a347e6bb 2020-12-13 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
1832 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing to delta on master"
1833 a347e6bb 2020-12-13 stsp local old_commit3=`git_show_head $testroot/repo`
1835 a347e6bb 2020-12-13 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1837 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1838 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1842 a347e6bb 2020-12-13 stsp cat > $testroot/editor.sh <<EOF
1844 ac3cdf31 2023-03-06 thomas ed -s "\$1" <<-EOF
1849 a347e6bb 2020-12-13 stsp chmod +x $testroot/editor.sh
1851 a347e6bb 2020-12-13 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1852 a347e6bb 2020-12-13 stsp VISUAL="$testroot/editor.sh" got histedit -f > $testroot/stdout)
1854 a347e6bb 2020-12-13 stsp local new_commit1=`git_show_head $testroot/repo`
1856 a347e6bb 2020-12-13 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1857 a347e6bb 2020-12-13 stsp local very_short_old_commit1=`trim_obj_id 29 $old_commit1`
1858 a347e6bb 2020-12-13 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1859 a347e6bb 2020-12-13 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1860 a347e6bb 2020-12-13 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1861 a347e6bb 2020-12-13 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1863 a347e6bb 2020-12-13 stsp echo "G alpha" > $testroot/stdout.expected
1864 a347e6bb 2020-12-13 stsp echo "D beta" >> $testroot/stdout.expected
1865 a347e6bb 2020-12-13 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1866 a347e6bb 2020-12-13 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1867 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1868 a347e6bb 2020-12-13 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1869 a347e6bb 2020-12-13 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
1870 a347e6bb 2020-12-13 stsp echo "fold commit: committing to zeta on master" \
1871 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1872 a347e6bb 2020-12-13 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1873 a347e6bb 2020-12-13 stsp echo -n "$short_old_commit3 -> $short_new_commit1: " \
1874 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1875 a347e6bb 2020-12-13 stsp echo "# log message of folded commit $very_short_old_commit1" \
1876 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1877 a347e6bb 2020-12-13 stsp echo "Switching work tree to refs/heads/master" \
1878 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1880 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1882 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1883 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1884 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1888 a347e6bb 2020-12-13 stsp echo "modified alpha on master" > $testroot/content.expected
1889 a347e6bb 2020-12-13 stsp cat $testroot/wt/alpha > $testroot/content
1890 a347e6bb 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1892 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1893 a347e6bb 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1894 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1898 a347e6bb 2020-12-13 stsp if [ -e $testroot/wt/beta ]; then
1899 a347e6bb 2020-12-13 stsp echo "removed file beta still exists on disk" >&2
1900 a347e6bb 2020-12-13 stsp test_done "$testroot" "1"
1904 a347e6bb 2020-12-13 stsp echo "new file on master" > $testroot/content.expected
1905 a347e6bb 2020-12-13 stsp cat $testroot/wt/epsilon/new > $testroot/content
1906 a347e6bb 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1908 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1909 a347e6bb 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1910 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1914 a347e6bb 2020-12-13 stsp (cd $testroot/wt && got status > $testroot/stdout)
1916 a347e6bb 2020-12-13 stsp echo -n > $testroot/stdout.expected
1917 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1919 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1920 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1921 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1925 a347e6bb 2020-12-13 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
1926 a347e6bb 2020-12-13 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1927 c50a7455 2021-10-04 thomas echo "commit $orig_commit" >> $testroot/stdout.expected
1928 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1930 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1931 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1933 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1936 c50a7455 2021-10-04 thomas test_histedit_edit_only() {
1937 c50a7455 2021-10-04 thomas local testroot=`test_init histedit_edit_only`
1939 c50a7455 2021-10-04 thomas local orig_commit=`git_show_head $testroot/repo`
1941 c50a7455 2021-10-04 thomas echo "modified alpha on master" > $testroot/repo/alpha
1942 c50a7455 2021-10-04 thomas (cd $testroot/repo && git rm -q beta)
1943 c50a7455 2021-10-04 thomas echo "new file on master" > $testroot/repo/epsilon/new
1944 c50a7455 2021-10-04 thomas (cd $testroot/repo && git add epsilon/new)
1945 c50a7455 2021-10-04 thomas git_commit $testroot/repo -m "committing changes"
1946 c50a7455 2021-10-04 thomas local old_commit1=`git_show_head $testroot/repo`
1948 c50a7455 2021-10-04 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1949 c50a7455 2021-10-04 thomas git_commit $testroot/repo -m "committing to zeta on master"
1950 c50a7455 2021-10-04 thomas local old_commit2=`git_show_head $testroot/repo`
1952 c50a7455 2021-10-04 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1954 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1955 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1956 c50a7455 2021-10-04 thomas return 1
1959 c50a7455 2021-10-04 thomas (cd $testroot/wt && got histedit -e > $testroot/stdout)
1961 c50a7455 2021-10-04 thomas local short_old_commit1=`trim_obj_id 28 $old_commit1`
1962 c50a7455 2021-10-04 thomas local short_old_commit2=`trim_obj_id 28 $old_commit2`
1964 c50a7455 2021-10-04 thomas echo "G alpha" > $testroot/stdout.expected
1965 c50a7455 2021-10-04 thomas echo "D beta" >> $testroot/stdout.expected
1966 c50a7455 2021-10-04 thomas echo "A epsilon/new" >> $testroot/stdout.expected
1967 c50a7455 2021-10-04 thomas echo "Stopping histedit for amending commit $old_commit1" \
1968 c50a7455 2021-10-04 thomas >> $testroot/stdout.expected
1969 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1971 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1972 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1973 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1974 c50a7455 2021-10-04 thomas return 1
1977 c50a7455 2021-10-04 thomas echo "edited modified alpha on master" > $testroot/wt/alpha
1979 c50a7455 2021-10-04 thomas cat > $testroot/editor.sh <<EOF
1980 c50a7455 2021-10-04 thomas #!/bin/sh
1981 ac3cdf31 2023-03-06 thomas ed -s "\$1" <<-EOF
1982 ac3cdf31 2023-03-06 thomas ,s/.*/committing edited changes 1/
1986 c50a7455 2021-10-04 thomas chmod +x $testroot/editor.sh
1988 c50a7455 2021-10-04 thomas (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1989 c50a7455 2021-10-04 thomas VISUAL="$testroot/editor.sh" got histedit -c > $testroot/stdout)
1991 c50a7455 2021-10-04 thomas local new_commit1=$(cd $testroot/wt && got info | \
1992 c50a7455 2021-10-04 thomas grep '^work tree base commit: ' | cut -d: -f2 | tr -d ' ')
1993 c50a7455 2021-10-04 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1995 c50a7455 2021-10-04 thomas echo -n "$short_old_commit1 -> $short_new_commit1: " \
1996 c50a7455 2021-10-04 thomas > $testroot/stdout.expected
1997 c50a7455 2021-10-04 thomas echo "committing edited changes 1" >> $testroot/stdout.expected
1998 c50a7455 2021-10-04 thomas echo "G epsilon/zeta" >> $testroot/stdout.expected
1999 c50a7455 2021-10-04 thomas echo "Stopping histedit for amending commit $old_commit2" \
2000 c50a7455 2021-10-04 thomas >> $testroot/stdout.expected
2001 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2003 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2004 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
2005 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
2006 c50a7455 2021-10-04 thomas return 1
2009 c50a7455 2021-10-04 thomas echo "edited zeta on master" > $testroot/wt/epsilon/zeta
2011 c50a7455 2021-10-04 thomas cat > $testroot/editor.sh <<EOF
2012 c50a7455 2021-10-04 thomas #!/bin/sh
2013 ac3cdf31 2023-03-06 thomas ed -s "\$1" <<-EOF
2014 ac3cdf31 2023-03-06 thomas ,s/.*/committing edited changes 2/
2018 c50a7455 2021-10-04 thomas chmod +x $testroot/editor.sh
2020 c50a7455 2021-10-04 thomas (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
2021 c50a7455 2021-10-04 thomas VISUAL="$testroot/editor.sh" got histedit -c > $testroot/stdout)
2023 c50a7455 2021-10-04 thomas local new_commit2=`git_show_head $testroot/repo`
2024 c50a7455 2021-10-04 thomas local short_new_commit2=`trim_obj_id 28 $new_commit2`
2026 c50a7455 2021-10-04 thomas echo -n "$short_old_commit2 -> $short_new_commit2: " \
2027 c50a7455 2021-10-04 thomas > $testroot/stdout.expected
2028 c50a7455 2021-10-04 thomas echo "committing edited changes 2" >> $testroot/stdout.expected
2029 c50a7455 2021-10-04 thomas echo "Switching work tree to refs/heads/master" \
2030 c50a7455 2021-10-04 thomas >> $testroot/stdout.expected
2032 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2034 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2035 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
2036 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
2037 c50a7455 2021-10-04 thomas return 1
2040 c50a7455 2021-10-04 thomas echo "edited modified alpha on master" > $testroot/content.expected
2041 c50a7455 2021-10-04 thomas cat $testroot/wt/alpha > $testroot/content
2042 c50a7455 2021-10-04 thomas cmp -s $testroot/content.expected $testroot/content
2044 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2045 c50a7455 2021-10-04 thomas diff -u $testroot/content.expected $testroot/content
2046 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
2047 c50a7455 2021-10-04 thomas return 1
2050 c50a7455 2021-10-04 thomas if [ -e $testroot/wt/beta ]; then
2051 c50a7455 2021-10-04 thomas echo "removed file beta still exists on disk" >&2
2052 c50a7455 2021-10-04 thomas test_done "$testroot" "1"
2053 c50a7455 2021-10-04 thomas return 1
2056 c50a7455 2021-10-04 thomas echo "new file on master" > $testroot/content.expected
2057 c50a7455 2021-10-04 thomas cat $testroot/wt/epsilon/new > $testroot/content
2058 c50a7455 2021-10-04 thomas cmp -s $testroot/content.expected $testroot/content
2060 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2061 c50a7455 2021-10-04 thomas diff -u $testroot/content.expected $testroot/content
2062 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
2063 c50a7455 2021-10-04 thomas return 1
2066 c50a7455 2021-10-04 thomas (cd $testroot/wt && got status > $testroot/stdout)
2068 c50a7455 2021-10-04 thomas echo -n > $testroot/stdout.expected
2069 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2071 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2072 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
2073 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
2074 c50a7455 2021-10-04 thomas return 1
2077 c50a7455 2021-10-04 thomas (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
2078 c50a7455 2021-10-04 thomas echo "commit $new_commit2 (master)" > $testroot/stdout.expected
2079 c50a7455 2021-10-04 thomas echo "commit $new_commit1" >> $testroot/stdout.expected
2080 a347e6bb 2020-12-13 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
2081 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2083 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2084 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
2086 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
2089 66eecf0d 2021-10-08 thomas test_histedit_prepend_line() {
2090 66eecf0d 2021-10-08 thomas local testroot=`test_init histedit_prepend_line`
2091 66eecf0d 2021-10-08 thomas local orig_commit=`git_show_head $testroot/repo`
2093 66eecf0d 2021-10-08 thomas got checkout $testroot/repo $testroot/wt > /dev/null
2095 7a9950a8 2022-11-18 thomas ed -s "$testroot/wt/alpha" <<EOF
2097 66eecf0d 2021-10-08 thomas first line
2102 66eecf0d 2021-10-08 thomas cp $testroot/wt/alpha $testroot/content.expected
2104 66eecf0d 2021-10-08 thomas (cd $testroot/wt/ && got commit -m 'modified alpha on master' \
2105 66eecf0d 2021-10-08 thomas alpha > /dev/null)
2107 66eecf0d 2021-10-08 thomas if [ "$?" != 0 ]; then
2108 66eecf0d 2021-10-08 thomas echo "got commit failed unexpectedly" >&2
2109 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
2110 66eecf0d 2021-10-08 thomas return 1
2113 66eecf0d 2021-10-08 thomas local top_commit=`git_show_head $testroot/repo`
2114 66eecf0d 2021-10-08 thomas echo "pick $top_commit" > "$testroot/histedit-script"
2116 66eecf0d 2021-10-08 thomas (cd $testroot/wt/ && got update -c $orig_commit > /dev/null)
2118 66eecf0d 2021-10-08 thomas if [ "$?" != 0 ]; then
2119 66eecf0d 2021-10-08 thomas echo "got update failed unexpectedly" >&2
2120 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
2121 66eecf0d 2021-10-08 thomas return 1
2124 66eecf0d 2021-10-08 thomas (cd $testroot/wt && got histedit -F "$testroot/histedit-script" \
2125 66eecf0d 2021-10-08 thomas > /dev/null)
2127 66eecf0d 2021-10-08 thomas if [ "$?" != 0 ]; then
2128 66eecf0d 2021-10-08 thomas echo "got histedit failed unexpectedly" >&2
2129 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
2130 66eecf0d 2021-10-08 thomas return 1
2133 66eecf0d 2021-10-08 thomas cp $testroot/wt/alpha $testroot/content
2134 66eecf0d 2021-10-08 thomas cmp -s $testroot/content.expected $testroot/content
2136 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2137 66eecf0d 2021-10-08 thomas diff -u $testroot/content.expected $testroot/content
2138 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
2139 66eecf0d 2021-10-08 thomas return 1
2142 66eecf0d 2021-10-08 thomas test_done "$testroot" $ret
2145 8ea72c47 2022-07-12 thomas test_histedit_mesg_invalid() {
2146 8ea72c47 2022-07-12 thomas local testroot=`test_init mesg_invalid`
2148 8ea72c47 2022-07-12 thomas local orig_commit=`git_show_head $testroot/repo`
2150 8ea72c47 2022-07-12 thomas echo "modified alpha on master" > $testroot/repo/alpha
2151 8ea72c47 2022-07-12 thomas (cd $testroot/repo && git rm -q beta)
2152 8ea72c47 2022-07-12 thomas echo "new file on master" > $testroot/repo/epsilon/new
2153 8ea72c47 2022-07-12 thomas (cd $testroot/repo && git add epsilon/new)
2154 8ea72c47 2022-07-12 thomas git_commit $testroot/repo -m 'committing changes'
2155 8ea72c47 2022-07-12 thomas local old_commit1=`git_show_head $testroot/repo`
2157 8ea72c47 2022-07-12 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
2158 8ea72c47 2022-07-12 thomas git_commit $testroot/repo -m 'committing to zeto on master'
2159 8ea72c47 2022-07-12 thomas local old_commit2=`git_show_head $testroot/repo`
2161 8ea72c47 2022-07-12 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2163 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2164 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2165 4ec2ae63 2022-07-20 thomas return 1
2168 8ea72c47 2022-07-12 thomas # try with a leading mesg
2170 8ea72c47 2022-07-12 thomas echo "mesg something something" > $testroot/histedit-script
2171 8ea72c47 2022-07-12 thomas echo "pick $old_commit1" >> $testroot/histedit-script
2172 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2174 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2175 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2177 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2178 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2179 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2180 8ea72c47 2022-07-12 thomas return 1
2183 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2184 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2186 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2187 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2188 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2189 8ea72c47 2022-07-12 thomas return 1
2192 8ea72c47 2022-07-12 thomas # try again with mesg -> mesg
2194 8ea72c47 2022-07-12 thomas echo "pick $old_commit1" > $testroot/histedit-script
2195 8ea72c47 2022-07-12 thomas echo "mesg something something" >> $testroot/histedit-script
2196 8ea72c47 2022-07-12 thomas echo "mesg something something else" >> $testroot/histedit-script
2197 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2199 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2200 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2202 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2203 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2204 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2205 8ea72c47 2022-07-12 thomas return 1
2208 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2209 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2211 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2212 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2213 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2214 8ea72c47 2022-07-12 thomas return 1
2217 8ea72c47 2022-07-12 thomas # try again with drop -> mesg
2219 8ea72c47 2022-07-12 thomas echo "drop $old_commit1" > $testroot/histedit-script
2220 8ea72c47 2022-07-12 thomas echo "mesg something something" >> $testroot/histedit-script
2221 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2223 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2224 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2226 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2227 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2228 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2229 8ea72c47 2022-07-12 thomas return 1
2232 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2233 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2235 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2236 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2237 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2238 8ea72c47 2022-07-12 thomas return 1
2241 8ea72c47 2022-07-12 thomas # try again with fold -> mesg
2243 8ea72c47 2022-07-12 thomas echo "fold $old_commit1" > $testroot/histedit-script
2244 8ea72c47 2022-07-12 thomas echo "mesg something something" >> $testroot/histedit-script
2245 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2247 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2248 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2250 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2251 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2252 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2253 8ea72c47 2022-07-12 thomas return 1
2256 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2257 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2259 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2260 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2262 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2265 150d7275 2022-07-22 thomas test_histedit_resets_committer() {
2266 150d7275 2022-07-22 thomas local testroot=`test_init histedit_resets_committer`
2267 150d7275 2022-07-22 thomas local orig_commit=`git_show_head $testroot/repo`
2268 150d7275 2022-07-22 thomas local committer="Flan Luck <flan_luck@openbsd.org>"
2270 150d7275 2022-07-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
2272 150d7275 2022-07-22 thomas echo "modified alpha" > $testroot/wt/alpha
2274 150d7275 2022-07-22 thomas (cd $testroot/wt/ && got commit -m 'modified alpha on master' \
2275 150d7275 2022-07-22 thomas alpha > /dev/null)
2277 150d7275 2022-07-22 thomas if [ "$?" != 0 ]; then
2278 150d7275 2022-07-22 thomas echo "got commit failed unexpectedly" >&2
2279 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2280 150d7275 2022-07-22 thomas return 1
2283 150d7275 2022-07-22 thomas local top_commit=`git_show_head $testroot/repo`
2284 150d7275 2022-07-22 thomas echo "pick $top_commit" > "$testroot/histedit-script"
2286 150d7275 2022-07-22 thomas (cd $testroot/wt/ && got update -c $orig_commit > /dev/null)
2288 150d7275 2022-07-22 thomas if [ "$?" != 0 ]; then
2289 150d7275 2022-07-22 thomas echo "got update failed unexpectedly" >&2
2290 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2291 150d7275 2022-07-22 thomas return 1
2294 150d7275 2022-07-22 thomas (cd $testroot/wt && env GOT_AUTHOR="$committer" \
2295 150d7275 2022-07-22 thomas got histedit -F "$testroot/histedit-script" > /dev/null)
2297 150d7275 2022-07-22 thomas if [ "$?" != 0 ]; then
2298 150d7275 2022-07-22 thomas echo "got histedit failed unexpectedly" >&2
2299 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2300 150d7275 2022-07-22 thomas return 1
2302 150d7275 2022-07-22 thomas local edited_commit=`git_show_head $testroot/repo`
2304 150d7275 2022-07-22 thomas # Original commit only had one author
2305 150d7275 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $top_commit | \
2306 150d7275 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
2307 150d7275 2022-07-22 thomas echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
2308 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2310 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
2311 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
2312 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2313 150d7275 2022-07-22 thomas return 1
2316 150d7275 2022-07-22 thomas # Edited commit should have new committer name added
2317 150d7275 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $edited_commit | \
2318 150d7275 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
2319 150d7275 2022-07-22 thomas echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
2320 150d7275 2022-07-22 thomas echo "via: $committer" >> $testroot/stdout.expected
2322 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2324 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
2325 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
2327 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2330 a2c162eb 2022-10-30 thomas test_histedit_umask() {
2331 a2c162eb 2022-10-30 thomas local testroot=`test_init histedit_umask`
2332 a2c162eb 2022-10-30 thomas local orig_commit=`git_show_head "$testroot/repo"`
2334 a2c162eb 2022-10-30 thomas got checkout "$testroot/repo" "$testroot/wt" >/dev/null
2336 a2c162eb 2022-10-30 thomas echo "modified alpha" > $testroot/wt/alpha
2337 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'edit #1') >/dev/null
2338 a2c162eb 2022-10-30 thomas local commit1=`git_show_head "$testroot/repo"`
2340 a2c162eb 2022-10-30 thomas echo "modified again" > $testroot/wt/alpha
2341 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'edit #2') >/dev/null
2342 a2c162eb 2022-10-30 thomas local commit2=`git_show_head "$testroot/repo"`
2344 a2c162eb 2022-10-30 thomas echo "modified again!" > $testroot/wt/alpha
2345 a2c162eb 2022-10-30 thomas echo "modify beta too!" > $testroot/wt/beta
2346 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'edit #3') >/dev/null
2347 a2c162eb 2022-10-30 thomas local commit3=`git_show_head "$testroot/repo"`
2349 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got update -c "$orig_commit") >/dev/null
2351 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
2352 a2c162eb 2022-10-30 thomas echo "update to $orig_commit failed!" >&2
2353 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
2354 a2c162eb 2022-10-30 thomas return 1
2357 a2c162eb 2022-10-30 thomas echo fold $commit1 >$testroot/histedit-script
2358 a2c162eb 2022-10-30 thomas echo fold $commit2 >>$testroot/histedit-script
2359 a2c162eb 2022-10-30 thomas echo pick $commit3 >>$testroot/histedit-script
2360 a2c162eb 2022-10-30 thomas echo mesg folding changes >>$testroot/histedit-script
2362 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
2363 a2c162eb 2022-10-30 thomas (umask 077 && cd "$testroot/wt" && \
2364 a2c162eb 2022-10-30 thomas got histedit -F "$testroot/histedit-script") >/dev/null
2367 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
2368 a2c162eb 2022-10-30 thomas echo "histedit operation failed" >&2
2369 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
2370 a2c162eb 2022-10-30 thomas return 1
2373 a2c162eb 2022-10-30 thomas for f in alpha beta; do
2374 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/$f" | grep -q ^-rw-------
2375 a2c162eb 2022-10-30 thomas if [ $? -ne 0 ]; then
2376 a2c162eb 2022-10-30 thomas echo "$f is not 0600 after histedi" >&2
2377 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/$f" >&2
2378 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
2379 a2c162eb 2022-10-30 thomas return 1
2383 a2c162eb 2022-10-30 thomas test_done "$testroot" 0
2386 630fc61f 2023-01-29 thomas test_histedit_mesg_filemode_change() {
2387 630fc61f 2023-01-29 thomas local testroot=`test_init histedit_mode_change`
2389 630fc61f 2023-01-29 thomas local orig_commit=`git_show_head $testroot/repo`
2390 630fc61f 2023-01-29 thomas local orig_author_time=`git_show_author_time $testroot/repo`
2392 630fc61f 2023-01-29 thomas chmod +x $testroot/repo/alpha
2393 630fc61f 2023-01-29 thomas git_commit $testroot/repo -m "set x bit on alpha"
2394 630fc61f 2023-01-29 thomas local old_commit1=`git_show_head $testroot/repo`
2395 630fc61f 2023-01-29 thomas local old_author_time1=`git_show_author_time $testroot/repo`
2397 630fc61f 2023-01-29 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2399 630fc61f 2023-01-29 thomas if [ $ret -ne 0 ]; then
2400 630fc61f 2023-01-29 thomas test_done "$testroot" "$ret"
2401 630fc61f 2023-01-29 thomas return 1
2404 630fc61f 2023-01-29 thomas if [ -x $testroot/wt/alpha ]; then
2405 630fc61f 2023-01-29 thomas echo "file alpha has unexpected executable bit" >&2
2406 630fc61f 2023-01-29 thomas test_done "$testroot" "1"
2407 630fc61f 2023-01-29 thomas return 1
2410 630fc61f 2023-01-29 thomas cat > $testroot/editor.sh <<EOF
2411 630fc61f 2023-01-29 thomas #!/bin/sh
2412 ac3cdf31 2023-03-06 thomas ed -s "\$1" <<-EOF
2413 ac3cdf31 2023-03-06 thomas ,s/ x bit / executable bit /
2418 630fc61f 2023-01-29 thomas chmod +x $testroot/editor.sh
2420 afe4b808 2023-01-29 thomas (cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
2421 630fc61f 2023-01-29 thomas got histedit -m > $testroot/stdout)
2423 630fc61f 2023-01-29 thomas local new_commit1=`git_show_head $testroot/repo`
2424 630fc61f 2023-01-29 thomas local new_author_time1=`git_show_author_time $testroot/repo`
2426 630fc61f 2023-01-29 thomas local short_old_commit1=`trim_obj_id 28 $old_commit1`
2427 630fc61f 2023-01-29 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
2429 630fc61f 2023-01-29 thomas echo "G alpha" > $testroot/stdout.expected
2430 630fc61f 2023-01-29 thomas echo "$short_old_commit1 -> $short_new_commit1: set executable bit on alpha" \
2431 630fc61f 2023-01-29 thomas >> $testroot/stdout.expected
2432 630fc61f 2023-01-29 thomas echo "Switching work tree to refs/heads/master" \
2433 630fc61f 2023-01-29 thomas >> $testroot/stdout.expected
2435 630fc61f 2023-01-29 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2437 630fc61f 2023-01-29 thomas if [ $ret -ne 0 ]; then
2438 630fc61f 2023-01-29 thomas diff -u $testroot/stdout.expected $testroot/stdout
2439 630fc61f 2023-01-29 thomas test_done "$testroot" "$ret"
2440 630fc61f 2023-01-29 thomas return 1
2443 630fc61f 2023-01-29 thomas echo "alpha" > $testroot/content.expected
2444 b5b4dc30 2023-01-29 thomas cmp -s $testroot/content.expected $testroot/wt/alpha
2446 630fc61f 2023-01-29 thomas if [ $ret -ne 0 ]; then
2447 b5b4dc30 2023-01-29 thomas diff -u $testroot/content.expected $testroot/wt/alpha
2448 630fc61f 2023-01-29 thomas test_done "$testroot" "$ret"
2449 630fc61f 2023-01-29 thomas return 1
2452 630fc61f 2023-01-29 thomas if [ ! -x $testroot/wt/alpha ]; then
2453 630fc61f 2023-01-29 thomas echo "file alpha lost its executable bit" >&2
2454 630fc61f 2023-01-29 thomas test_done "$testroot" "1"
2455 630fc61f 2023-01-29 thomas return 1
2458 630fc61f 2023-01-29 thomas (cd $testroot/wt && got status > $testroot/stdout)
2460 630fc61f 2023-01-29 thomas echo -n > $testroot/stdout.expected
2461 630fc61f 2023-01-29 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2463 630fc61f 2023-01-29 thomas if [ $ret -ne 0 ]; then
2464 630fc61f 2023-01-29 thomas diff -u $testroot/stdout.expected $testroot/stdout
2465 630fc61f 2023-01-29 thomas test_done "$testroot" "$ret"
2466 630fc61f 2023-01-29 thomas return 1
2469 630fc61f 2023-01-29 thomas (cd $testroot/wt && got log -l1 | grep ' set executable bit on alpha' \
2470 630fc61f 2023-01-29 thomas > $testroot/stdout)
2472 630fc61f 2023-01-29 thomas echo ' set executable bit on alpha' > $testroot/stdout.expected
2473 630fc61f 2023-01-29 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2475 630fc61f 2023-01-29 thomas if [ $ret -ne 0 ]; then
2476 630fc61f 2023-01-29 thomas diff -u $testroot/stdout.expected $testroot/stdout
2477 630fc61f 2023-01-29 thomas test_done "$testroot" "$ret"
2478 630fc61f 2023-01-29 thomas return 1
2481 630fc61f 2023-01-29 thomas test_done "$testroot" "$ret"
2484 070c80a5 2023-01-31 thomas test_histedit_drop_only() {
2485 070c80a5 2023-01-31 thomas local testroot=`test_init histedit_drop_only`
2487 070c80a5 2023-01-31 thomas local orig_commit=`git_show_head $testroot/repo`
2488 070c80a5 2023-01-31 thomas local drop="-> drop commit:"
2489 070c80a5 2023-01-31 thomas local dropmsg="commit changes to drop"
2491 070c80a5 2023-01-31 thomas echo "modified alpha on master" > $testroot/repo/alpha
2492 070c80a5 2023-01-31 thomas (cd $testroot/repo && git rm -q beta)
2493 070c80a5 2023-01-31 thomas echo "new file on master" > $testroot/repo/epsilon/new
2494 070c80a5 2023-01-31 thomas (cd $testroot/repo && git add epsilon/new)
2496 070c80a5 2023-01-31 thomas git_commit $testroot/repo -m "$dropmsg 1"
2497 070c80a5 2023-01-31 thomas local drop_commit1=`git_show_head $testroot/repo`
2499 070c80a5 2023-01-31 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
2501 070c80a5 2023-01-31 thomas git_commit $testroot/repo -m "$dropmsg 2"
2502 070c80a5 2023-01-31 thomas local drop_commit2=`git_show_head $testroot/repo`
2504 070c80a5 2023-01-31 thomas echo "modified delta on master" > $testroot/repo/gamma/delta
2506 070c80a5 2023-01-31 thomas git_commit $testroot/repo -m "$dropmsg 3"
2507 070c80a5 2023-01-31 thomas local drop_commit3=`git_show_head $testroot/repo`
2509 070c80a5 2023-01-31 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2511 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2512 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2513 070c80a5 2023-01-31 thomas return 1
2516 070c80a5 2023-01-31 thomas (cd $testroot/wt && got histedit -d > $testroot/stdout)
2517 070c80a5 2023-01-31 thomas local new_commit1=`git_show_head $testroot/repo`
2519 070c80a5 2023-01-31 thomas local short_commit1=`trim_obj_id 28 $drop_commit1`
2520 070c80a5 2023-01-31 thomas local short_commit2=`trim_obj_id 28 $drop_commit2`
2521 070c80a5 2023-01-31 thomas local short_commit3=`trim_obj_id 28 $drop_commit3`
2523 070c80a5 2023-01-31 thomas echo "$short_commit1 $drop $dropmsg 1" > $testroot/stdout.expected
2524 070c80a5 2023-01-31 thomas echo "$short_commit2 $drop $dropmsg 2" >> $testroot/stdout.expected
2525 070c80a5 2023-01-31 thomas echo "$short_commit3 $drop $dropmsg 3" >> $testroot/stdout.expected
2526 070c80a5 2023-01-31 thomas echo "Switching work tree to refs/heads/master" \
2527 070c80a5 2023-01-31 thomas >> $testroot/stdout.expected
2529 070c80a5 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2531 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2532 070c80a5 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
2533 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2534 070c80a5 2023-01-31 thomas return 1
2537 070c80a5 2023-01-31 thomas echo "alpha" > $testroot/content.expected
2538 070c80a5 2023-01-31 thomas cat $testroot/wt/alpha > $testroot/content
2539 070c80a5 2023-01-31 thomas cmp -s $testroot/content.expected $testroot/content
2541 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2542 070c80a5 2023-01-31 thomas diff -u $testroot/content.expected $testroot/content
2543 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2544 070c80a5 2023-01-31 thomas return 1
2547 070c80a5 2023-01-31 thomas echo "zeta" > $testroot/content.expected
2548 070c80a5 2023-01-31 thomas cat $testroot/wt/epsilon/zeta > $testroot/content
2549 070c80a5 2023-01-31 thomas cmp -s $testroot/content.expected $testroot/content
2551 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2552 070c80a5 2023-01-31 thomas diff -u $testroot/content.expected $testroot/content
2553 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2554 070c80a5 2023-01-31 thomas return 1
2557 070c80a5 2023-01-31 thomas echo "delta" > $testroot/content.expected
2558 070c80a5 2023-01-31 thomas cat $testroot/wt/gamma/delta > $testroot/content
2559 070c80a5 2023-01-31 thomas cmp -s $testroot/content.expected $testroot/content
2561 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2562 070c80a5 2023-01-31 thomas diff -u $testroot/content.expected $testroot/content
2563 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2564 070c80a5 2023-01-31 thomas return 1
2567 070c80a5 2023-01-31 thomas if [ ! -e $testroot/wt/beta ]; then
2568 070c80a5 2023-01-31 thomas echo "removed file beta should be restored" >&2
2569 070c80a5 2023-01-31 thomas test_done "$testroot" "1"
2570 070c80a5 2023-01-31 thomas return 1
2573 070c80a5 2023-01-31 thomas if [ -e $testroot/wt/new ]; then
2574 070c80a5 2023-01-31 thomas echo "new file should no longer exist" >&2
2575 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2576 070c80a5 2023-01-31 thomas return 1
2579 070c80a5 2023-01-31 thomas (cd $testroot/wt && got status > $testroot/stdout)
2581 070c80a5 2023-01-31 thomas echo -n > $testroot/stdout.expected
2582 070c80a5 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2584 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2585 070c80a5 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
2586 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2587 070c80a5 2023-01-31 thomas return 1
2590 070c80a5 2023-01-31 thomas (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
2591 070c80a5 2023-01-31 thomas echo "commit $orig_commit (master)" > $testroot/stdout.expected
2592 070c80a5 2023-01-31 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2594 070c80a5 2023-01-31 thomas if [ $ret -ne 0 ]; then
2595 070c80a5 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
2597 070c80a5 2023-01-31 thomas test_done "$testroot" "$ret"
2600 7fb414ae 2020-08-08 stsp test_parseargs "$@"
2601 0ebf8283 2019-07-24 stsp run_test test_histedit_no_op
2602 0ebf8283 2019-07-24 stsp run_test test_histedit_swap
2603 0ebf8283 2019-07-24 stsp run_test test_histedit_drop
2604 0ebf8283 2019-07-24 stsp run_test test_histedit_fold
2605 0ebf8283 2019-07-24 stsp run_test test_histedit_edit
2606 0ebf8283 2019-07-24 stsp run_test test_histedit_fold_last_commit
2607 0ebf8283 2019-07-24 stsp run_test test_histedit_missing_commit
2608 0ebf8283 2019-07-24 stsp run_test test_histedit_abort
2609 a4027091 2019-07-25 stsp run_test test_histedit_path_prefix_drop
2610 b2c50a0a 2019-07-25 stsp run_test test_histedit_path_prefix_edit
2611 c7d20a3f 2019-07-30 stsp run_test test_histedit_outside_refs_heads
2612 0def28b1 2019-08-17 stsp run_test test_histedit_fold_last_commit_swap
2613 de05890f 2020-03-05 stsp run_test test_histedit_split_commit
2614 5b87815e 2020-03-05 stsp run_test test_histedit_duplicate_commit_in_script
2615 ecfff807 2020-09-23 stsp run_test test_histedit_fold_add_delete
2616 4c3671a9 2023-07-26 thomas run_test test_histedit_fold_edit_delete
2617 99fe3033 2023-03-08 thomas run_test test_histedit_fold_delete_add
2618 239f5c5a 2020-12-13 stsp run_test test_histedit_fold_only
2619 a347e6bb 2020-12-13 stsp run_test test_histedit_fold_only_empty_logmsg
2620 c50a7455 2021-10-04 thomas run_test test_histedit_edit_only
2621 66eecf0d 2021-10-08 thomas run_test test_histedit_prepend_line
2622 8ea72c47 2022-07-12 thomas run_test test_histedit_mesg_invalid
2623 150d7275 2022-07-22 thomas run_test test_histedit_resets_committer
2624 a2c162eb 2022-10-30 thomas run_test test_histedit_umask
2625 630fc61f 2023-01-29 thomas run_test test_histedit_mesg_filemode_change
2626 070c80a5 2023-01-31 thomas run_test test_histedit_drop_only
