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 fa37079f 2021-10-09 thomas sed -i '' -e "s/$old_commit2/$new_commit2/" $testroot/diff.expected
135 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
137 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
138 86ac67ee 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
139 a615e0e7 2020-12-16 stsp test_done "$testroot" "$ret"
143 a615e0e7 2020-12-16 stsp (cd $testroot/wt && got update > $testroot/stdout)
145 a615e0e7 2020-12-16 stsp echo 'Already up-to-date' > $testroot/stdout.expected
146 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
148 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
149 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
150 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
154 e600f124 2021-03-21 stsp # We should have a backup of old commits
155 e600f124 2021-03-21 stsp (cd $testroot/repo && got histedit -l > $testroot/stdout)
156 180f111d 2021-09-21 thomas.ad d_orig1=`date -u -d "@$old_author_time1" +"%G-%m-%d"`
158 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
159 fa37079f 2021-10-09 thomas export LC_TIME=C
160 fa37079f 2021-10-09 thomas d_orig2=`date -u -d "@$old_author_time2" +"%a %b %e %X %Y UTC"`
161 fa37079f 2021-10-09 thomas export LC_TIME="$prev_LC_TIME"
162 180f111d 2021-09-21 thomas.ad d_new2=`date -u -d "@$new_author_time2" +"%G-%m-%d"`
163 180f111d 2021-09-21 thomas.ad d_orig=`date -u -d "@$orig_author_time" +"%G-%m-%d"`
164 e600f124 2021-03-21 stsp cat > $testroot/stdout.expected <<EOF
165 e600f124 2021-03-21 stsp -----------------------------------------------
166 e600f124 2021-03-21 stsp commit $old_commit2 (formerly master)
167 e600f124 2021-03-21 stsp from: $GOT_AUTHOR
168 e600f124 2021-03-21 stsp date: $d_orig2
170 e600f124 2021-03-21 stsp committing to zeta on master
172 e600f124 2021-03-21 stsp has become commit $new_commit2 (master)
173 e600f124 2021-03-21 stsp $d_new2 $GOT_AUTHOR_11 committing to zeta on master
176 ad324bf5 2021-09-21 stsp local is_forked=true d_fork fork_commit fork_commit_msg
178 ad324bf5 2021-09-21 stsp if [ "$old_commit1" = "$new_commit1" ]; then
179 ad324bf5 2021-09-21 stsp if [ "$old_commit2" = "$new_commit2" ]; then
180 ad324bf5 2021-09-21 stsp is_forked=false
182 ad324bf5 2021-09-21 stsp d_fork=$d_orig1
183 ad324bf5 2021-09-21 stsp fork_commit=$new_commit1
184 ad324bf5 2021-09-21 stsp fork_commit_msg="committing changes"
187 ad324bf5 2021-09-21 stsp d_fork=$d_orig
188 ad324bf5 2021-09-21 stsp fork_commit=$orig_commit
189 ad324bf5 2021-09-21 stsp fork_commit_msg="adding the test tree"
192 ad324bf5 2021-09-21 stsp $is_forked && cat >> $testroot/stdout.expected <<EOF
193 ad324bf5 2021-09-21 stsp history forked at $fork_commit
194 ad324bf5 2021-09-21 stsp $d_fork $GOT_AUTHOR_11 $fork_commit_msg
197 a615e0e7 2020-12-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
199 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
200 a615e0e7 2020-12-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
201 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
205 643b85bc 2021-07-16 stsp (cd $testroot/repo && got histedit -X master \
206 643b85bc 2021-07-16 stsp > $testroot/stdout 2> $testroot/stderr)
207 643b85bc 2021-07-16 stsp echo -n "Deleted refs/got/backup/histedit/master/$new_commit2: " \
208 643b85bc 2021-07-16 stsp > $testroot/stdout.expected
209 643b85bc 2021-07-16 stsp echo "$old_commit2" >> $testroot/stdout.expected
210 643b85bc 2021-07-16 stsp echo -n > $testroot/stderr.expected
211 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
213 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
214 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
215 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
218 643b85bc 2021-07-16 stsp cmp -s $testroot/stderr.expected $testroot/stderr
220 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
221 643b85bc 2021-07-16 stsp diff -u $testroot/stderr.expected $testroot/stderr
222 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
226 643b85bc 2021-07-16 stsp (cd $testroot/repo && got histedit -l > $testroot/stdout)
227 643b85bc 2021-07-16 stsp echo -n > $testroot/stdout.expected
228 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
230 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
231 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
233 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
236 f6cae3ed 2020-09-13 naddy test_histedit_swap() {
237 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_swap`
239 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
241 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
242 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
243 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
244 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
245 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
246 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
248 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
249 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
250 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
252 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $old_commit2 \
253 86ac67ee 2019-07-25 stsp > $testroot/diff.expected
255 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
257 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
258 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
262 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" > $testroot/histedit-script
263 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" >> $testroot/histedit-script
265 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
266 0ebf8283 2019-07-24 stsp > $testroot/stdout)
268 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_parent_commit $testroot/repo`
269 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_head $testroot/repo`
271 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
272 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
273 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
274 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
276 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" > $testroot/stdout.expected
277 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
278 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
279 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
280 0ebf8283 2019-07-24 stsp echo "G alpha" >> $testroot/stdout.expected
281 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
282 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
283 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> $short_new_commit1: committing changes" \
284 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
285 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
286 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
288 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
290 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
291 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
292 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
296 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/content.expected
297 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
298 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
300 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
301 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
302 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
306 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
307 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
308 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
312 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
313 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
314 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
316 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
317 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
318 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
322 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
324 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
325 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
327 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
328 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
329 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
333 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
334 0ebf8283 2019-07-24 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
335 0ebf8283 2019-07-24 stsp echo "commit $new_commit2" >> $testroot/stdout.expected
336 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
337 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
339 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
340 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
341 86ac67ee 2019-07-25 stsp test_done "$testroot" "$ret"
345 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit1 \
346 86ac67ee 2019-07-25 stsp > $testroot/diff
347 fa37079f 2021-10-09 thomas sed -i '' -e "s/$old_commit2/$new_commit1/" $testroot/diff.expected
348 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
350 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
351 86ac67ee 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
353 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
356 f6cae3ed 2020-09-13 naddy test_histedit_drop() {
357 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_drop`
358 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
360 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
361 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
362 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
363 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
364 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
365 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
367 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
368 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
369 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
371 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $old_commit1 $old_commit2 \
372 86ac67ee 2019-07-25 stsp > $testroot/diff.expected
374 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
376 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
377 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
381 0ebf8283 2019-07-24 stsp echo "drop $old_commit1" > $testroot/histedit-script
382 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
384 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
385 0ebf8283 2019-07-24 stsp > $testroot/stdout)
387 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
389 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
390 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
391 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
393 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> drop commit: committing changes" \
394 0ebf8283 2019-07-24 stsp > $testroot/stdout.expected
395 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
396 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
397 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
398 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
399 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
400 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
402 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
404 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
405 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
406 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
410 0ebf8283 2019-07-24 stsp for f in alpha beta; do
411 0ebf8283 2019-07-24 stsp echo "$f" > $testroot/content.expected
412 0ebf8283 2019-07-24 stsp cat $testroot/wt/$f > $testroot/content
413 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
415 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
416 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
417 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
422 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/new ]; then
423 0ebf8283 2019-07-24 stsp echo "file new exists on disk but should not" >&2
424 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
428 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
430 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
431 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
433 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
434 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
435 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
439 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
440 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
441 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
442 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
444 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
445 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
446 86ac67ee 2019-07-25 stsp test_done "$testroot" "$ret"
450 86ac67ee 2019-07-25 stsp got diff -r $testroot/repo $orig_commit $new_commit2 \
451 86ac67ee 2019-07-25 stsp > $testroot/diff
452 fa37079f 2021-10-09 thomas sed -i '' -e "s/$old_commit1/$orig_commit/" $testroot/diff.expected
453 fa37079f 2021-10-09 thomas sed -i '' -e "s/$old_commit2/$new_commit2/" $testroot/diff.expected
454 86ac67ee 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
456 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
457 86ac67ee 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
459 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
462 f6cae3ed 2020-09-13 naddy test_histedit_fold() {
463 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_fold`
465 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
467 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
468 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
469 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
470 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
471 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
472 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
474 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
475 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
476 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
478 3f9de99f 2019-07-24 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
479 3f9de99f 2019-07-24 stsp git_commit $testroot/repo -m "committing to delta on master"
480 3f9de99f 2019-07-24 stsp local old_commit3=`git_show_head $testroot/repo`
482 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
484 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
485 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
489 0ebf8283 2019-07-24 stsp echo "fold $old_commit1" > $testroot/histedit-script
490 3f9de99f 2019-07-24 stsp echo "drop $old_commit2" >> $testroot/histedit-script
491 3f9de99f 2019-07-24 stsp echo "pick $old_commit3" >> $testroot/histedit-script
492 0ebf8283 2019-07-24 stsp echo "mesg committing folded changes" >> $testroot/histedit-script
494 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
495 0ebf8283 2019-07-24 stsp > $testroot/stdout)
497 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
498 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
500 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
501 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
502 3f9de99f 2019-07-24 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
503 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
504 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
506 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
507 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
508 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
509 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
510 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
511 3f9de99f 2019-07-24 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
512 3f9de99f 2019-07-24 stsp echo "drop commit: committing to zeta on master" \
513 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
514 3f9de99f 2019-07-24 stsp echo "G gamma/delta" >> $testroot/stdout.expected
515 3f9de99f 2019-07-24 stsp echo -n "$short_old_commit3 -> $short_new_commit2: " \
516 3f9de99f 2019-07-24 stsp >> $testroot/stdout.expected
517 0ebf8283 2019-07-24 stsp echo "committing folded changes" >> $testroot/stdout.expected
518 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
519 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
521 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
523 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
524 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
525 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
529 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/content.expected
530 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
531 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
533 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
534 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
535 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
539 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
540 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
541 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
545 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
546 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
547 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
549 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
550 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
551 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
555 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
557 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
558 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
560 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
561 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
562 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
566 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
567 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
568 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
569 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
571 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
572 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
574 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
577 f6cae3ed 2020-09-13 naddy test_histedit_edit() {
578 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_edit`
580 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
582 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
583 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
584 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
585 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
586 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
587 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
589 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
590 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
591 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
593 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
595 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
596 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
600 0ebf8283 2019-07-24 stsp echo "edit $old_commit1" > $testroot/histedit-script
601 0ebf8283 2019-07-24 stsp echo "mesg committing changes" >> $testroot/histedit-script
602 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
604 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
605 0ebf8283 2019-07-24 stsp > $testroot/stdout)
607 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
608 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
610 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
611 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
612 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
613 0ebf8283 2019-07-24 stsp echo "Stopping histedit for amending commit $old_commit1" \
614 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
615 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
617 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
618 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
619 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
623 0ebf8283 2019-07-24 stsp echo "edited modified alpha on master" > $testroot/wt/alpha
625 f032f1f7 2019-08-04 stsp # test interaction of 'got stage' and histedit -c
626 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got stage alpha > /dev/null)
627 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got histedit -c > $testroot/stdout \
628 f032f1f7 2019-08-04 stsp 2> $testroot/stderr)
630 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
631 f032f1f7 2019-08-04 stsp echo "histedit succeeded unexpectedly" >&2
632 f032f1f7 2019-08-04 stsp test_done "$testroot" "1"
635 f032f1f7 2019-08-04 stsp echo -n "got: work tree contains files with staged changes; " \
636 f032f1f7 2019-08-04 stsp > $testroot/stderr.expected
637 f032f1f7 2019-08-04 stsp echo "these changes must be committed or unstaged first" \
638 f032f1f7 2019-08-04 stsp >> $testroot/stderr.expected
639 f032f1f7 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
641 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
642 f032f1f7 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
643 f032f1f7 2019-08-04 stsp test_done "$testroot" "$ret"
647 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got unstage alpha > /dev/null)
648 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -c > $testroot/stdout)
650 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
651 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
653 0ebf8283 2019-07-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
654 0ebf8283 2019-07-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
656 0ebf8283 2019-07-24 stsp echo "$short_old_commit1 -> $short_new_commit1: committing changes" \
657 0ebf8283 2019-07-24 stsp > $testroot/stdout.expected
658 0ebf8283 2019-07-24 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
659 0ebf8283 2019-07-24 stsp echo -n "$short_old_commit2 -> $short_new_commit2: " \
660 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
661 0ebf8283 2019-07-24 stsp echo "committing to zeta on master" >> $testroot/stdout.expected
662 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
663 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
665 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
667 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
668 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
669 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
673 0ebf8283 2019-07-24 stsp echo "edited modified alpha on master" > $testroot/content.expected
674 0ebf8283 2019-07-24 stsp cat $testroot/wt/alpha > $testroot/content
675 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
677 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
678 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
679 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
683 0ebf8283 2019-07-24 stsp if [ -e $testroot/wt/beta ]; then
684 0ebf8283 2019-07-24 stsp echo "removed file beta still exists on disk" >&2
685 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
689 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
690 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
691 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
693 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
694 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
695 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
699 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
701 0ebf8283 2019-07-24 stsp echo -n > $testroot/stdout.expected
702 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
704 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
705 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
706 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
710 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
711 0ebf8283 2019-07-24 stsp echo "commit $new_commit2 (master)" > $testroot/stdout.expected
712 0ebf8283 2019-07-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
713 0ebf8283 2019-07-24 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
714 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
716 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
717 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
719 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
722 f6cae3ed 2020-09-13 naddy test_histedit_fold_last_commit() {
723 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_fold_last_commit`
725 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
727 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
728 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
729 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
730 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
731 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
732 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
734 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
735 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
736 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
738 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
740 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
741 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
745 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" > $testroot/histedit-script
746 0ebf8283 2019-07-24 stsp echo "fold $old_commit2" >> $testroot/histedit-script
748 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
749 0ebf8283 2019-07-24 stsp > $testroot/stdout 2> $testroot/stderr)
752 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
753 0ebf8283 2019-07-24 stsp echo "histedit succeeded unexpectedly" >&2
754 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
758 0ebf8283 2019-07-24 stsp echo "got: last commit in histedit script cannot be folded" \
759 0ebf8283 2019-07-24 stsp > $testroot/stderr.expected
761 0ebf8283 2019-07-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
763 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
764 0ebf8283 2019-07-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
766 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
769 f6cae3ed 2020-09-13 naddy test_histedit_missing_commit() {
770 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_missing_commit`
772 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
774 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
775 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
776 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
777 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
778 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
779 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
781 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
782 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
783 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
785 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
787 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
788 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
792 0ebf8283 2019-07-24 stsp echo "pick $old_commit1" > $testroot/histedit-script
793 0ebf8283 2019-07-24 stsp echo "mesg committing changes" >> $testroot/histedit-script
795 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
796 0ebf8283 2019-07-24 stsp > $testroot/stdout 2> $testroot/stderr)
799 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
800 0ebf8283 2019-07-24 stsp echo "histedit succeeded unexpectedly" >&2
801 0ebf8283 2019-07-24 stsp test_done "$testroot" "1"
805 0ebf8283 2019-07-24 stsp echo "got: commit $old_commit2 missing from histedit script" \
806 0ebf8283 2019-07-24 stsp > $testroot/stderr.expected
808 0ebf8283 2019-07-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
810 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
811 0ebf8283 2019-07-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
813 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
816 f6cae3ed 2020-09-13 naddy test_histedit_abort() {
817 0ebf8283 2019-07-24 stsp local testroot=`test_init histedit_abort`
819 0ebf8283 2019-07-24 stsp local orig_commit=`git_show_head $testroot/repo`
821 0ebf8283 2019-07-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
822 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git rm -q beta)
823 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/repo/epsilon/new
824 0ebf8283 2019-07-24 stsp (cd $testroot/repo && git add epsilon/new)
825 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing changes"
826 0ebf8283 2019-07-24 stsp local old_commit1=`git_show_head $testroot/repo`
828 0ebf8283 2019-07-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
829 0ebf8283 2019-07-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
830 0ebf8283 2019-07-24 stsp local old_commit2=`git_show_head $testroot/repo`
832 0ebf8283 2019-07-24 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
834 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
835 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
839 d52bac28 2021-10-08 thomas # unrelated unversioned file in work tree
840 d52bac28 2021-10-08 thomas touch $testroot/wt/unversioned-file
842 0ebf8283 2019-07-24 stsp echo "edit $old_commit1" > $testroot/histedit-script
843 0ebf8283 2019-07-24 stsp echo "mesg committing changes" >> $testroot/histedit-script
844 0ebf8283 2019-07-24 stsp echo "pick $old_commit2" >> $testroot/histedit-script
846 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
847 0ebf8283 2019-07-24 stsp > $testroot/stdout)
849 0ebf8283 2019-07-24 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
850 0ebf8283 2019-07-24 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
852 0ebf8283 2019-07-24 stsp echo "G alpha" > $testroot/stdout.expected
853 0ebf8283 2019-07-24 stsp echo "D beta" >> $testroot/stdout.expected
854 0ebf8283 2019-07-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
855 0ebf8283 2019-07-24 stsp echo "Stopping histedit for amending commit $old_commit1" \
856 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
857 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
859 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
860 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
861 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
865 0ebf8283 2019-07-24 stsp echo "edited modified alpha on master" > $testroot/wt/alpha
867 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got histedit -a > $testroot/stdout)
869 0ebf8283 2019-07-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
870 0ebf8283 2019-07-24 stsp local new_commit2=`git_show_head $testroot/repo`
872 0ebf8283 2019-07-24 stsp echo "Switching work tree to refs/heads/master" \
873 0ebf8283 2019-07-24 stsp > $testroot/stdout.expected
874 0ebf8283 2019-07-24 stsp echo "R alpha" >> $testroot/stdout.expected
875 0ebf8283 2019-07-24 stsp echo "R beta" >> $testroot/stdout.expected
876 0ebf8283 2019-07-24 stsp echo "R epsilon/new" >> $testroot/stdout.expected
877 0ebf8283 2019-07-24 stsp echo "Histedit of refs/heads/master aborted" \
878 0ebf8283 2019-07-24 stsp >> $testroot/stdout.expected
880 0ebf8283 2019-07-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
882 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
883 0ebf8283 2019-07-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
884 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
888 0ebf8283 2019-07-24 stsp for f in alpha beta; do
889 0ebf8283 2019-07-24 stsp echo "$f" > $testroot/content.expected
890 0ebf8283 2019-07-24 stsp cat $testroot/wt/$f > $testroot/content
891 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
893 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
894 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
895 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
900 0ebf8283 2019-07-24 stsp echo "new file on master" > $testroot/content.expected
901 0ebf8283 2019-07-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
902 0ebf8283 2019-07-24 stsp cmp -s $testroot/content.expected $testroot/content
904 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
905 0ebf8283 2019-07-24 stsp diff -u $testroot/content.expected $testroot/content
906 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
910 0ebf8283 2019-07-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
912 0ebf8283 2019-07-24 stsp echo "? epsilon/new" > $testroot/stdout.expected
913 d52bac28 2021-10-08 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 fa37079f 2021-10-09 thomas sed -i '' -e "s/$old_commit1/$new_commit1/" $testroot/diff.expected
1157 b2c50a0a 2019-07-25 stsp cmp -s $testroot/diff.expected $testroot/diff
1159 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1160 b2c50a0a 2019-07-25 stsp diff -u $testroot/diff.expected $testroot/diff
1162 0ebf8283 2019-07-24 stsp test_done "$testroot" "$ret"
1165 f6cae3ed 2020-09-13 naddy test_histedit_outside_refs_heads() {
1166 c7d20a3f 2019-07-30 stsp local testroot=`test_init histedit_outside_refs_heads`
1167 c7d20a3f 2019-07-30 stsp local commit1=`git_show_head $testroot/repo`
1169 c7d20a3f 2019-07-30 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1171 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1172 c7d20a3f 2019-07-30 stsp echo "got checkout failed unexpectedly"
1173 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1177 c7d20a3f 2019-07-30 stsp echo "modified alpha" > $testroot/wt/alpha
1179 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got commit -m 'change alpha' \
1180 c7d20a3f 2019-07-30 stsp > $testroot/stdout 2> $testroot/stderr)
1182 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1183 c7d20a3f 2019-07-30 stsp echo "got commit failed unexpectedly" >&2
1184 c7d20a3f 2019-07-30 stsp test_done "$testroot" "1"
1187 c7d20a3f 2019-07-30 stsp local commit2=`git_show_head $testroot/repo`
1189 e31abbf2 2020-03-22 stsp got ref -r $testroot/repo -c master refs/remotes/origin/master
1191 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1192 c7d20a3f 2019-07-30 stsp echo "got ref failed unexpectedly" >&2
1193 c7d20a3f 2019-07-30 stsp test_done "$testroot" "1"
1197 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got update -b origin/master -c $commit1 >/dev/null)
1199 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1200 c7d20a3f 2019-07-30 stsp echo "got update failed unexpectedly"
1201 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1205 c7d20a3f 2019-07-30 stsp echo "edit $commit2" > $testroot/histedit-script
1206 c7d20a3f 2019-07-30 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1207 c7d20a3f 2019-07-30 stsp 2> $testroot/stderr)
1209 c7d20a3f 2019-07-30 stsp echo -n "got: will not edit commit history of a branch outside the " \
1210 c7d20a3f 2019-07-30 stsp > $testroot/stderr.expected
1211 c7d20a3f 2019-07-30 stsp echo '"refs/heads/" reference namespace' \
1212 c7d20a3f 2019-07-30 stsp >> $testroot/stderr.expected
1213 c7d20a3f 2019-07-30 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1215 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1216 c7d20a3f 2019-07-30 stsp diff -u $testroot/stderr.expected $testroot/stderr
1218 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1221 f6cae3ed 2020-09-13 naddy test_histedit_fold_last_commit_swap() {
1222 0def28b1 2019-08-17 stsp local testroot=`test_init histedit_fold_last_commit_swap`
1224 0def28b1 2019-08-17 stsp local orig_commit=`git_show_head $testroot/repo`
1226 0def28b1 2019-08-17 stsp echo "modified alpha on master" > $testroot/repo/alpha
1227 0def28b1 2019-08-17 stsp (cd $testroot/repo && git rm -q beta)
1228 0def28b1 2019-08-17 stsp echo "new file on master" > $testroot/repo/epsilon/new
1229 0def28b1 2019-08-17 stsp (cd $testroot/repo && git add epsilon/new)
1230 0def28b1 2019-08-17 stsp git_commit $testroot/repo -m "committing changes"
1231 0def28b1 2019-08-17 stsp local old_commit1=`git_show_head $testroot/repo`
1233 0def28b1 2019-08-17 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1234 0def28b1 2019-08-17 stsp git_commit $testroot/repo -m "committing to zeta on master"
1235 0def28b1 2019-08-17 stsp local old_commit2=`git_show_head $testroot/repo`
1237 0def28b1 2019-08-17 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1239 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1240 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1244 0def28b1 2019-08-17 stsp # fold commit2 into commit1 (requires swapping commits)
1245 0def28b1 2019-08-17 stsp echo "fold $old_commit2" > $testroot/histedit-script
1246 0def28b1 2019-08-17 stsp echo "pick $old_commit1" >> $testroot/histedit-script
1247 0def28b1 2019-08-17 stsp echo "mesg committing folded changes" >> $testroot/histedit-script
1249 0def28b1 2019-08-17 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1250 0def28b1 2019-08-17 stsp > $testroot/stdout 2> $testroot/stderr)
1253 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1254 0def28b1 2019-08-17 stsp echo "histedit failed unexpectedly" >&2
1255 0def28b1 2019-08-17 stsp test_done "$testroot" "$ret"
1259 0def28b1 2019-08-17 stsp local new_commit=`git_show_head $testroot/repo`
1261 0def28b1 2019-08-17 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1262 0def28b1 2019-08-17 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1263 0def28b1 2019-08-17 stsp local short_new_commit=`trim_obj_id 28 $new_commit`
1265 0def28b1 2019-08-17 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1266 0def28b1 2019-08-17 stsp echo -n "$short_old_commit2 -> fold commit: committing to zeta " \
1267 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1268 0def28b1 2019-08-17 stsp echo "on master" >> $testroot/stdout.expected
1269 0def28b1 2019-08-17 stsp echo "G alpha" >> $testroot/stdout.expected
1270 0def28b1 2019-08-17 stsp echo "D beta" >> $testroot/stdout.expected
1271 0def28b1 2019-08-17 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1272 0def28b1 2019-08-17 stsp echo -n "$short_old_commit1 -> $short_new_commit: " \
1273 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1274 0def28b1 2019-08-17 stsp echo "committing folded changes" >> $testroot/stdout.expected
1275 0def28b1 2019-08-17 stsp echo "Switching work tree to refs/heads/master" \
1276 0def28b1 2019-08-17 stsp >> $testroot/stdout.expected
1278 0def28b1 2019-08-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1280 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1281 0def28b1 2019-08-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1283 c7d20a3f 2019-07-30 stsp test_done "$testroot" "$ret"
1286 f6cae3ed 2020-09-13 naddy test_histedit_split_commit() {
1287 de05890f 2020-03-05 stsp local testroot=`test_init histedit_split_commit`
1289 de05890f 2020-03-05 stsp local orig_commit=`git_show_head $testroot/repo`
1291 de05890f 2020-03-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
1292 de05890f 2020-03-05 stsp (cd $testroot/repo && git rm -q beta)
1293 de05890f 2020-03-05 stsp echo "new file on master" > $testroot/repo/epsilon/new
1294 de05890f 2020-03-05 stsp (cd $testroot/repo && git add epsilon/new)
1295 de05890f 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 1"
1296 de05890f 2020-03-05 stsp local old_commit1=`git_show_head $testroot/repo`
1297 de05890f 2020-03-05 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1299 de05890f 2020-03-05 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1300 de05890f 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 2"
1301 de05890f 2020-03-05 stsp local old_commit2=`git_show_head $testroot/repo`
1302 de05890f 2020-03-05 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1304 de05890f 2020-03-05 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1306 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1307 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1311 de05890f 2020-03-05 stsp # split commit1 into commitA and commitB and commitC
1312 de05890f 2020-03-05 stsp echo "e $old_commit1" > $testroot/histedit-script
1313 de05890f 2020-03-05 stsp echo "p $old_commit2" >> $testroot/histedit-script
1315 de05890f 2020-03-05 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1316 de05890f 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1318 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1319 de05890f 2020-03-05 stsp echo "histedit failed unexpectedly:" >&2
1320 de05890f 2020-03-05 stsp cat $testroot/stderr >&2
1321 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1325 de05890f 2020-03-05 stsp echo "G alpha" > $testroot/stdout.expected
1326 de05890f 2020-03-05 stsp echo "D beta" >> $testroot/stdout.expected
1327 de05890f 2020-03-05 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1328 de05890f 2020-03-05 stsp echo "Stopping histedit for amending commit $old_commit1" \
1329 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1331 de05890f 2020-03-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1333 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1334 de05890f 2020-03-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1335 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1339 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitA" alpha >/dev/null)
1341 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1342 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1343 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1347 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitB" beta >/dev/null)
1349 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1350 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1351 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1355 de05890f 2020-03-05 stsp (cd $testroot/wt && got ci -m "commitC" epsilon/new >/dev/null)
1357 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1358 de05890f 2020-03-05 stsp echo "commit failed unexpectedly" >&2
1359 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1363 de05890f 2020-03-05 stsp (cd $testroot/wt && got histedit -c \
1364 de05890f 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1366 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1367 de05890f 2020-03-05 stsp echo "histedit failed unexpectedly:" >&2
1368 de05890f 2020-03-05 stsp cat $testroot/stderr >&2
1369 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1372 de05890f 2020-03-05 stsp local new_commit2=`git_show_head $testroot/repo`
1373 de05890f 2020-03-05 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1375 de05890f 2020-03-05 stsp echo "$short_old_commit1 -> no-op change: committing changes 1" \
1376 de05890f 2020-03-05 stsp > $testroot/stdout.expected
1377 de05890f 2020-03-05 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1378 de05890f 2020-03-05 stsp echo "$short_old_commit2 -> $short_new_commit2: committing changes 2" \
1379 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1380 de05890f 2020-03-05 stsp echo "Switching work tree to refs/heads/master" \
1381 de05890f 2020-03-05 stsp >> $testroot/stdout.expected
1383 de05890f 2020-03-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1385 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1386 de05890f 2020-03-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1388 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1392 f6cae3ed 2020-09-13 naddy test_histedit_duplicate_commit_in_script() {
1393 5b87815e 2020-03-05 stsp local testroot=`test_init histedit_duplicate_commit_in_script`
1395 5b87815e 2020-03-05 stsp local orig_commit=`git_show_head $testroot/repo`
1397 5b87815e 2020-03-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
1398 5b87815e 2020-03-05 stsp (cd $testroot/repo && git rm -q beta)
1399 5b87815e 2020-03-05 stsp echo "new file on master" > $testroot/repo/epsilon/new
1400 5b87815e 2020-03-05 stsp (cd $testroot/repo && git add epsilon/new)
1401 5b87815e 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 1"
1402 5b87815e 2020-03-05 stsp local old_commit1=`git_show_head $testroot/repo`
1404 5b87815e 2020-03-05 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1405 5b87815e 2020-03-05 stsp git_commit $testroot/repo -m "committing changes 2"
1406 5b87815e 2020-03-05 stsp local old_commit2=`git_show_head $testroot/repo`
1408 5b87815e 2020-03-05 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1410 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1411 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1415 5b87815e 2020-03-05 stsp # This histedit script lists commit1 more than once
1416 5b87815e 2020-03-05 stsp echo "p $old_commit1" > $testroot/histedit-script
1417 5b87815e 2020-03-05 stsp echo "p $old_commit1" >> $testroot/histedit-script
1418 5b87815e 2020-03-05 stsp echo "p $old_commit2" >> $testroot/histedit-script
1420 5b87815e 2020-03-05 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1421 5b87815e 2020-03-05 stsp > $testroot/stdout 2> $testroot/stderr)
1423 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1424 5b87815e 2020-03-05 stsp echo "histedit succeeded unexpectedly:" >&2
1425 5b87815e 2020-03-05 stsp cat $testroot/stdout >&2
1426 5b87815e 2020-03-05 stsp test_done "$testroot" "$ret"
1430 5b87815e 2020-03-05 stsp echo -n "got: commit $old_commit1 is listed more than once " \
1431 5b87815e 2020-03-05 stsp > $testroot/stderr.expected
1432 5b87815e 2020-03-05 stsp echo "in histedit script" >> $testroot/stderr.expected
1434 5b87815e 2020-03-05 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1436 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1437 5b87815e 2020-03-05 stsp diff -u $testroot/stderr.expected $testroot/stderr
1439 de05890f 2020-03-05 stsp test_done "$testroot" "$ret"
1443 ecfff807 2020-09-23 stsp # if a previous commit introduces a new file, and it is folded into a commit
1444 ecfff807 2020-09-23 stsp # that deletes the same file, the file still exists after the histedit
1445 ecfff807 2020-09-23 stsp test_histedit_fold_add_delete() {
1446 4c662b1d 2021-09-01 stsp local testroot=`test_init histedit_fold_add_delete`
1448 ecfff807 2020-09-23 stsp local orig_commit=`git_show_head $testroot/repo`
1450 ecfff807 2020-09-23 stsp echo "added new file epsilon/psi" > $testroot/repo/epsilon/psi
1451 ecfff807 2020-09-23 stsp (cd $testroot/repo && git add epsilon/psi)
1452 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "committing changes"
1453 ecfff807 2020-09-23 stsp local old_commit1=`git_show_head $testroot/repo`
1455 ecfff807 2020-09-23 stsp echo "modified epsilon/psi" > $testroot/repo/epsilon/psi
1456 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "editing psi"
1457 ecfff807 2020-09-23 stsp local old_commit2=`git_show_head $testroot/repo`
1459 ecfff807 2020-09-23 stsp (cd $testroot/repo && git rm -q epsilon/psi)
1460 ecfff807 2020-09-23 stsp git_commit $testroot/repo -m "removing psi"
1461 ecfff807 2020-09-23 stsp local old_commit3=`git_show_head $testroot/repo`
1463 ecfff807 2020-09-23 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1465 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1466 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1470 ecfff807 2020-09-23 stsp echo "fold $old_commit1" > $testroot/histedit-script
1471 ecfff807 2020-09-23 stsp echo "fold $old_commit2" >> $testroot/histedit-script
1472 ecfff807 2020-09-23 stsp echo "pick $old_commit3" >> $testroot/histedit-script
1473 ecfff807 2020-09-23 stsp echo "mesg folded changes" >> $testroot/histedit-script
1475 ecfff807 2020-09-23 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1476 ecfff807 2020-09-23 stsp > $testroot/stdout)
1478 ecfff807 2020-09-23 stsp local new_commit1=`git_show_head $testroot/repo`
1480 ecfff807 2020-09-23 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1481 ecfff807 2020-09-23 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1482 ecfff807 2020-09-23 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1483 ecfff807 2020-09-23 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1485 ecfff807 2020-09-23 stsp echo "A epsilon/psi" >> $testroot/stdout.expected
1486 ecfff807 2020-09-23 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1487 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1488 ecfff807 2020-09-23 stsp echo "G epsilon/psi" >> $testroot/stdout.expected
1489 ecfff807 2020-09-23 stsp echo "$short_old_commit2 -> fold commit: editing psi" \
1490 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1491 0a22ca1a 2020-09-23 stsp echo "D epsilon/psi" >> $testroot/stdout.expected
1492 0a22ca1a 2020-09-23 stsp echo "$short_old_commit3 -> no-op change: folded changes" \
1493 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1494 ecfff807 2020-09-23 stsp echo "Switching work tree to refs/heads/master" \
1495 ecfff807 2020-09-23 stsp >> $testroot/stdout.expected
1497 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1499 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1500 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1501 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1505 ecfff807 2020-09-23 stsp if [ -e $testroot/wt/epsilon/psi ]; then
1506 0a22ca1a 2020-09-23 stsp echo "removed file psi still exists on disk" >&2
1507 0a22ca1a 2020-09-23 stsp test_done "$testroot" "1"
1511 ecfff807 2020-09-23 stsp (cd $testroot/wt && got status > $testroot/stdout)
1513 ecfff807 2020-09-23 stsp echo -n > $testroot/stdout.expected
1514 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1516 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1517 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1518 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1522 ecfff807 2020-09-23 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1523 ecfff807 2020-09-23 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1524 29c68398 2020-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1526 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1527 29c68398 2020-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1528 29c68398 2020-09-24 stsp test_done "$testroot" "$ret"
1532 29c68398 2020-09-24 stsp got tree -r $testroot/repo epsilon > $testroot/stdout
1533 29c68398 2020-09-24 stsp echo "zeta" > $testroot/stdout.expected
1534 ecfff807 2020-09-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1536 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1537 ecfff807 2020-09-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1539 ecfff807 2020-09-23 stsp test_done "$testroot" "$ret"
1542 239f5c5a 2020-12-13 stsp test_histedit_fold_only() {
1543 239f5c5a 2020-12-13 stsp local testroot=`test_init histedit_fold_only`
1545 239f5c5a 2020-12-13 stsp local orig_commit=`git_show_head $testroot/repo`
1547 239f5c5a 2020-12-13 stsp echo "modified alpha on master" > $testroot/repo/alpha
1548 239f5c5a 2020-12-13 stsp (cd $testroot/repo && git rm -q beta)
1549 239f5c5a 2020-12-13 stsp echo "new file on master" > $testroot/repo/epsilon/new
1550 239f5c5a 2020-12-13 stsp (cd $testroot/repo && git add epsilon/new)
1551 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing changes"
1552 239f5c5a 2020-12-13 stsp local old_commit1=`git_show_head $testroot/repo`
1554 239f5c5a 2020-12-13 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1555 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing to zeta on master"
1556 239f5c5a 2020-12-13 stsp local old_commit2=`git_show_head $testroot/repo`
1558 239f5c5a 2020-12-13 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
1559 239f5c5a 2020-12-13 stsp git_commit $testroot/repo -m "committing to delta on master"
1560 239f5c5a 2020-12-13 stsp local old_commit3=`git_show_head $testroot/repo`
1562 239f5c5a 2020-12-13 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1564 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1565 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1569 239f5c5a 2020-12-13 stsp cat > $testroot/editor.sh <<EOF
1571 c206b220 2021-10-09 thomas SOPTS='-i ""'
1572 c206b220 2021-10-09 thomas [ "\$OSTYPE" = "linux-gnu" ] && SOPTS="-i"
1573 c206b220 2021-10-09 thomas sed "\$SOPTS" -e 's/.*/committing folded changes/' "\$1"
1575 239f5c5a 2020-12-13 stsp chmod +x $testroot/editor.sh
1577 239f5c5a 2020-12-13 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1578 239f5c5a 2020-12-13 stsp VISUAL="$testroot/editor.sh" got histedit -f > $testroot/stdout)
1580 239f5c5a 2020-12-13 stsp local new_commit1=`git_show_head $testroot/repo`
1582 239f5c5a 2020-12-13 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1583 239f5c5a 2020-12-13 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1584 239f5c5a 2020-12-13 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1585 239f5c5a 2020-12-13 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1586 239f5c5a 2020-12-13 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1588 239f5c5a 2020-12-13 stsp echo "G alpha" > $testroot/stdout.expected
1589 239f5c5a 2020-12-13 stsp echo "D beta" >> $testroot/stdout.expected
1590 239f5c5a 2020-12-13 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1591 239f5c5a 2020-12-13 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1592 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1593 239f5c5a 2020-12-13 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1594 239f5c5a 2020-12-13 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
1595 239f5c5a 2020-12-13 stsp echo "fold commit: committing to zeta on master" \
1596 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1597 239f5c5a 2020-12-13 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1598 239f5c5a 2020-12-13 stsp echo -n "$short_old_commit3 -> $short_new_commit1: " \
1599 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1600 239f5c5a 2020-12-13 stsp echo "committing folded changes" >> $testroot/stdout.expected
1601 239f5c5a 2020-12-13 stsp echo "Switching work tree to refs/heads/master" \
1602 239f5c5a 2020-12-13 stsp >> $testroot/stdout.expected
1604 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1606 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1607 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1608 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1612 239f5c5a 2020-12-13 stsp echo "modified alpha on master" > $testroot/content.expected
1613 239f5c5a 2020-12-13 stsp cat $testroot/wt/alpha > $testroot/content
1614 239f5c5a 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1616 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1617 239f5c5a 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1618 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1622 239f5c5a 2020-12-13 stsp if [ -e $testroot/wt/beta ]; then
1623 239f5c5a 2020-12-13 stsp echo "removed file beta still exists on disk" >&2
1624 239f5c5a 2020-12-13 stsp test_done "$testroot" "1"
1628 239f5c5a 2020-12-13 stsp echo "new file on master" > $testroot/content.expected
1629 239f5c5a 2020-12-13 stsp cat $testroot/wt/epsilon/new > $testroot/content
1630 239f5c5a 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1632 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1633 239f5c5a 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1634 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1638 239f5c5a 2020-12-13 stsp (cd $testroot/wt && got status > $testroot/stdout)
1640 239f5c5a 2020-12-13 stsp echo -n > $testroot/stdout.expected
1641 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1643 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1644 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1645 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1649 239f5c5a 2020-12-13 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
1650 239f5c5a 2020-12-13 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1651 239f5c5a 2020-12-13 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1652 239f5c5a 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1654 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1655 239f5c5a 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1657 239f5c5a 2020-12-13 stsp test_done "$testroot" "$ret"
1660 a347e6bb 2020-12-13 stsp test_histedit_fold_only_empty_logmsg() {
1661 a347e6bb 2020-12-13 stsp local testroot=`test_init histedit_fold_only_empty_logmsg`
1663 a347e6bb 2020-12-13 stsp local orig_commit=`git_show_head $testroot/repo`
1665 a347e6bb 2020-12-13 stsp echo "modified alpha on master" > $testroot/repo/alpha
1666 a347e6bb 2020-12-13 stsp (cd $testroot/repo && git rm -q beta)
1667 a347e6bb 2020-12-13 stsp echo "new file on master" > $testroot/repo/epsilon/new
1668 a347e6bb 2020-12-13 stsp (cd $testroot/repo && git add epsilon/new)
1669 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing changes"
1670 a347e6bb 2020-12-13 stsp local old_commit1=`git_show_head $testroot/repo`
1672 a347e6bb 2020-12-13 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1673 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing to zeta on master"
1674 a347e6bb 2020-12-13 stsp local old_commit2=`git_show_head $testroot/repo`
1676 a347e6bb 2020-12-13 stsp echo "modified delta on master" > $testroot/repo/gamma/delta
1677 a347e6bb 2020-12-13 stsp git_commit $testroot/repo -m "committing to delta on master"
1678 a347e6bb 2020-12-13 stsp local old_commit3=`git_show_head $testroot/repo`
1680 a347e6bb 2020-12-13 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1682 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1683 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1687 a347e6bb 2020-12-13 stsp cat > $testroot/editor.sh <<EOF
1689 c206b220 2021-10-09 thomas SOPTS='-i ""'
1690 c206b220 2021-10-09 thomas [ "\$OSTYPE" = "linux-gnu" ] && SOPTS="-i"
1691 c206b220 2021-10-09 thomas sed "\$SOPTS" -e 'd' "\$1"
1693 a347e6bb 2020-12-13 stsp chmod +x $testroot/editor.sh
1695 a347e6bb 2020-12-13 stsp (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1696 a347e6bb 2020-12-13 stsp VISUAL="$testroot/editor.sh" got histedit -f > $testroot/stdout)
1698 a347e6bb 2020-12-13 stsp local new_commit1=`git_show_head $testroot/repo`
1700 a347e6bb 2020-12-13 stsp local short_old_commit1=`trim_obj_id 28 $old_commit1`
1701 a347e6bb 2020-12-13 stsp local very_short_old_commit1=`trim_obj_id 29 $old_commit1`
1702 a347e6bb 2020-12-13 stsp local short_old_commit2=`trim_obj_id 28 $old_commit2`
1703 a347e6bb 2020-12-13 stsp local short_old_commit3=`trim_obj_id 28 $old_commit3`
1704 a347e6bb 2020-12-13 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1705 a347e6bb 2020-12-13 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1707 a347e6bb 2020-12-13 stsp echo "G alpha" > $testroot/stdout.expected
1708 a347e6bb 2020-12-13 stsp echo "D beta" >> $testroot/stdout.expected
1709 a347e6bb 2020-12-13 stsp echo "A epsilon/new" >> $testroot/stdout.expected
1710 a347e6bb 2020-12-13 stsp echo "$short_old_commit1 -> fold commit: committing changes" \
1711 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1712 a347e6bb 2020-12-13 stsp echo "G epsilon/zeta" >> $testroot/stdout.expected
1713 a347e6bb 2020-12-13 stsp echo -n "$short_old_commit2 -> " >> $testroot/stdout.expected
1714 a347e6bb 2020-12-13 stsp echo "fold commit: committing to zeta on master" \
1715 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1716 a347e6bb 2020-12-13 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1717 a347e6bb 2020-12-13 stsp echo -n "$short_old_commit3 -> $short_new_commit1: " \
1718 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1719 a347e6bb 2020-12-13 stsp echo "# log message of folded commit $very_short_old_commit1" \
1720 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1721 a347e6bb 2020-12-13 stsp echo "Switching work tree to refs/heads/master" \
1722 a347e6bb 2020-12-13 stsp >> $testroot/stdout.expected
1724 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1726 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1727 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1728 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1732 a347e6bb 2020-12-13 stsp echo "modified alpha on master" > $testroot/content.expected
1733 a347e6bb 2020-12-13 stsp cat $testroot/wt/alpha > $testroot/content
1734 a347e6bb 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1736 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1737 a347e6bb 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1738 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1742 a347e6bb 2020-12-13 stsp if [ -e $testroot/wt/beta ]; then
1743 a347e6bb 2020-12-13 stsp echo "removed file beta still exists on disk" >&2
1744 a347e6bb 2020-12-13 stsp test_done "$testroot" "1"
1748 a347e6bb 2020-12-13 stsp echo "new file on master" > $testroot/content.expected
1749 a347e6bb 2020-12-13 stsp cat $testroot/wt/epsilon/new > $testroot/content
1750 a347e6bb 2020-12-13 stsp cmp -s $testroot/content.expected $testroot/content
1752 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1753 a347e6bb 2020-12-13 stsp diff -u $testroot/content.expected $testroot/content
1754 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1758 a347e6bb 2020-12-13 stsp (cd $testroot/wt && got status > $testroot/stdout)
1760 a347e6bb 2020-12-13 stsp echo -n > $testroot/stdout.expected
1761 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1763 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1764 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1765 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1769 a347e6bb 2020-12-13 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
1770 a347e6bb 2020-12-13 stsp echo "commit $new_commit1 (master)" > $testroot/stdout.expected
1771 c50a7455 2021-10-04 thomas echo "commit $orig_commit" >> $testroot/stdout.expected
1772 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1774 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1775 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1777 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1780 c50a7455 2021-10-04 thomas test_histedit_edit_only() {
1781 c50a7455 2021-10-04 thomas local testroot=`test_init histedit_edit_only`
1783 c50a7455 2021-10-04 thomas local orig_commit=`git_show_head $testroot/repo`
1785 c50a7455 2021-10-04 thomas echo "modified alpha on master" > $testroot/repo/alpha
1786 c50a7455 2021-10-04 thomas (cd $testroot/repo && git rm -q beta)
1787 c50a7455 2021-10-04 thomas echo "new file on master" > $testroot/repo/epsilon/new
1788 c50a7455 2021-10-04 thomas (cd $testroot/repo && git add epsilon/new)
1789 c50a7455 2021-10-04 thomas git_commit $testroot/repo -m "committing changes"
1790 c50a7455 2021-10-04 thomas local old_commit1=`git_show_head $testroot/repo`
1792 c50a7455 2021-10-04 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1793 c50a7455 2021-10-04 thomas git_commit $testroot/repo -m "committing to zeta on master"
1794 c50a7455 2021-10-04 thomas local old_commit2=`git_show_head $testroot/repo`
1796 c50a7455 2021-10-04 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1798 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1799 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1800 c50a7455 2021-10-04 thomas return 1
1803 c50a7455 2021-10-04 thomas (cd $testroot/wt && got histedit -e > $testroot/stdout)
1805 c50a7455 2021-10-04 thomas local short_old_commit1=`trim_obj_id 28 $old_commit1`
1806 c50a7455 2021-10-04 thomas local short_old_commit2=`trim_obj_id 28 $old_commit2`
1808 c50a7455 2021-10-04 thomas echo "G alpha" > $testroot/stdout.expected
1809 c50a7455 2021-10-04 thomas echo "D beta" >> $testroot/stdout.expected
1810 c50a7455 2021-10-04 thomas echo "A epsilon/new" >> $testroot/stdout.expected
1811 c50a7455 2021-10-04 thomas echo "Stopping histedit for amending commit $old_commit1" \
1812 c50a7455 2021-10-04 thomas >> $testroot/stdout.expected
1813 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1815 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1816 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1817 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1818 c50a7455 2021-10-04 thomas return 1
1821 c50a7455 2021-10-04 thomas echo "edited modified alpha on master" > $testroot/wt/alpha
1823 c50a7455 2021-10-04 thomas cat > $testroot/editor.sh <<EOF
1824 c50a7455 2021-10-04 thomas #!/bin/sh
1825 c50a7455 2021-10-04 thomas sed -i 's/.*/committing edited changes 1/' "\$1"
1827 c50a7455 2021-10-04 thomas chmod +x $testroot/editor.sh
1829 c50a7455 2021-10-04 thomas (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1830 c50a7455 2021-10-04 thomas VISUAL="$testroot/editor.sh" got histedit -c > $testroot/stdout)
1832 c50a7455 2021-10-04 thomas local new_commit1=$(cd $testroot/wt && got info | \
1833 c50a7455 2021-10-04 thomas grep '^work tree base commit: ' | cut -d: -f2 | tr -d ' ')
1834 c50a7455 2021-10-04 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1836 c50a7455 2021-10-04 thomas echo -n "$short_old_commit1 -> $short_new_commit1: " \
1837 c50a7455 2021-10-04 thomas > $testroot/stdout.expected
1838 c50a7455 2021-10-04 thomas echo "committing edited changes 1" >> $testroot/stdout.expected
1839 c50a7455 2021-10-04 thomas echo "G epsilon/zeta" >> $testroot/stdout.expected
1840 c50a7455 2021-10-04 thomas echo "Stopping histedit for amending commit $old_commit2" \
1841 c50a7455 2021-10-04 thomas >> $testroot/stdout.expected
1842 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1844 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1845 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1846 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1847 c50a7455 2021-10-04 thomas return 1
1850 c50a7455 2021-10-04 thomas echo "edited zeta on master" > $testroot/wt/epsilon/zeta
1852 c50a7455 2021-10-04 thomas cat > $testroot/editor.sh <<EOF
1853 c50a7455 2021-10-04 thomas #!/bin/sh
1854 c50a7455 2021-10-04 thomas sed -i 's/.*/committing edited changes 2/' "\$1"
1856 c50a7455 2021-10-04 thomas chmod +x $testroot/editor.sh
1858 c50a7455 2021-10-04 thomas (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
1859 c50a7455 2021-10-04 thomas VISUAL="$testroot/editor.sh" got histedit -c > $testroot/stdout)
1861 c50a7455 2021-10-04 thomas local new_commit2=`git_show_head $testroot/repo`
1862 c50a7455 2021-10-04 thomas local short_new_commit2=`trim_obj_id 28 $new_commit2`
1864 c50a7455 2021-10-04 thomas echo -n "$short_old_commit2 -> $short_new_commit2: " \
1865 c50a7455 2021-10-04 thomas > $testroot/stdout.expected
1866 c50a7455 2021-10-04 thomas echo "committing edited changes 2" >> $testroot/stdout.expected
1867 c50a7455 2021-10-04 thomas echo "Switching work tree to refs/heads/master" \
1868 c50a7455 2021-10-04 thomas >> $testroot/stdout.expected
1870 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1872 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1873 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1874 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1875 c50a7455 2021-10-04 thomas return 1
1878 c50a7455 2021-10-04 thomas echo "edited modified alpha on master" > $testroot/content.expected
1879 c50a7455 2021-10-04 thomas cat $testroot/wt/alpha > $testroot/content
1880 c50a7455 2021-10-04 thomas cmp -s $testroot/content.expected $testroot/content
1882 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1883 c50a7455 2021-10-04 thomas diff -u $testroot/content.expected $testroot/content
1884 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1885 c50a7455 2021-10-04 thomas return 1
1888 c50a7455 2021-10-04 thomas if [ -e $testroot/wt/beta ]; then
1889 c50a7455 2021-10-04 thomas echo "removed file beta still exists on disk" >&2
1890 c50a7455 2021-10-04 thomas test_done "$testroot" "1"
1891 c50a7455 2021-10-04 thomas return 1
1894 c50a7455 2021-10-04 thomas echo "new file on master" > $testroot/content.expected
1895 c50a7455 2021-10-04 thomas cat $testroot/wt/epsilon/new > $testroot/content
1896 c50a7455 2021-10-04 thomas cmp -s $testroot/content.expected $testroot/content
1898 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1899 c50a7455 2021-10-04 thomas diff -u $testroot/content.expected $testroot/content
1900 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1901 c50a7455 2021-10-04 thomas return 1
1904 c50a7455 2021-10-04 thomas (cd $testroot/wt && got status > $testroot/stdout)
1906 c50a7455 2021-10-04 thomas echo -n > $testroot/stdout.expected
1907 c50a7455 2021-10-04 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1909 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1910 c50a7455 2021-10-04 thomas diff -u $testroot/stdout.expected $testroot/stdout
1911 c50a7455 2021-10-04 thomas test_done "$testroot" "$ret"
1912 c50a7455 2021-10-04 thomas return 1
1915 c50a7455 2021-10-04 thomas (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1916 c50a7455 2021-10-04 thomas echo "commit $new_commit2 (master)" > $testroot/stdout.expected
1917 c50a7455 2021-10-04 thomas echo "commit $new_commit1" >> $testroot/stdout.expected
1918 a347e6bb 2020-12-13 stsp echo "commit $orig_commit" >> $testroot/stdout.expected
1919 a347e6bb 2020-12-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1921 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1922 a347e6bb 2020-12-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1924 a347e6bb 2020-12-13 stsp test_done "$testroot" "$ret"
1927 66eecf0d 2021-10-08 thomas test_histedit_prepend_line() {
1928 66eecf0d 2021-10-08 thomas local testroot=`test_init histedit_prepend_line`
1929 66eecf0d 2021-10-08 thomas local orig_commit=`git_show_head $testroot/repo`
1931 66eecf0d 2021-10-08 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1933 7a9950a8 2022-11-18 thomas ed -s "$testroot/wt/alpha" <<EOF
1935 66eecf0d 2021-10-08 thomas first line
1940 66eecf0d 2021-10-08 thomas cp $testroot/wt/alpha $testroot/content.expected
1942 66eecf0d 2021-10-08 thomas (cd $testroot/wt/ && got commit -m 'modified alpha on master' \
1943 66eecf0d 2021-10-08 thomas alpha > /dev/null)
1945 66eecf0d 2021-10-08 thomas if [ "$?" != 0 ]; then
1946 66eecf0d 2021-10-08 thomas echo "got commit failed unexpectedly" >&2
1947 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
1948 66eecf0d 2021-10-08 thomas return 1
1951 66eecf0d 2021-10-08 thomas local top_commit=`git_show_head $testroot/repo`
1952 66eecf0d 2021-10-08 thomas echo "pick $top_commit" > "$testroot/histedit-script"
1954 66eecf0d 2021-10-08 thomas (cd $testroot/wt/ && got update -c $orig_commit > /dev/null)
1956 66eecf0d 2021-10-08 thomas if [ "$?" != 0 ]; then
1957 66eecf0d 2021-10-08 thomas echo "got update failed unexpectedly" >&2
1958 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
1959 66eecf0d 2021-10-08 thomas return 1
1962 66eecf0d 2021-10-08 thomas (cd $testroot/wt && got histedit -F "$testroot/histedit-script" \
1963 66eecf0d 2021-10-08 thomas > /dev/null)
1965 66eecf0d 2021-10-08 thomas if [ "$?" != 0 ]; then
1966 66eecf0d 2021-10-08 thomas echo "got histedit failed unexpectedly" >&2
1967 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
1968 66eecf0d 2021-10-08 thomas return 1
1971 66eecf0d 2021-10-08 thomas cp $testroot/wt/alpha $testroot/content
1972 66eecf0d 2021-10-08 thomas cmp -s $testroot/content.expected $testroot/content
1974 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1975 66eecf0d 2021-10-08 thomas diff -u $testroot/content.expected $testroot/content
1976 66eecf0d 2021-10-08 thomas test_done "$testroot" "$ret"
1977 66eecf0d 2021-10-08 thomas return 1
1980 66eecf0d 2021-10-08 thomas test_done "$testroot" $ret
1983 8ea72c47 2022-07-12 thomas test_histedit_mesg_invalid() {
1984 8ea72c47 2022-07-12 thomas local testroot=`test_init mesg_invalid`
1986 8ea72c47 2022-07-12 thomas local orig_commit=`git_show_head $testroot/repo`
1988 8ea72c47 2022-07-12 thomas echo "modified alpha on master" > $testroot/repo/alpha
1989 8ea72c47 2022-07-12 thomas (cd $testroot/repo && git rm -q beta)
1990 8ea72c47 2022-07-12 thomas echo "new file on master" > $testroot/repo/epsilon/new
1991 8ea72c47 2022-07-12 thomas (cd $testroot/repo && git add epsilon/new)
1992 8ea72c47 2022-07-12 thomas git_commit $testroot/repo -m 'committing changes'
1993 8ea72c47 2022-07-12 thomas local old_commit1=`git_show_head $testroot/repo`
1995 8ea72c47 2022-07-12 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1996 8ea72c47 2022-07-12 thomas git_commit $testroot/repo -m 'committing to zeto on master'
1997 8ea72c47 2022-07-12 thomas local old_commit2=`git_show_head $testroot/repo`
1999 8ea72c47 2022-07-12 thomas got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
2001 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2002 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2003 4ec2ae63 2022-07-20 thomas return 1
2006 8ea72c47 2022-07-12 thomas # try with a leading mesg
2008 8ea72c47 2022-07-12 thomas echo "mesg something something" > $testroot/histedit-script
2009 8ea72c47 2022-07-12 thomas echo "pick $old_commit1" >> $testroot/histedit-script
2010 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2012 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2013 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2015 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2016 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2017 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2018 8ea72c47 2022-07-12 thomas return 1
2021 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2022 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2024 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2025 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2026 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2027 8ea72c47 2022-07-12 thomas return 1
2030 8ea72c47 2022-07-12 thomas # try again with mesg -> mesg
2032 8ea72c47 2022-07-12 thomas echo "pick $old_commit1" > $testroot/histedit-script
2033 8ea72c47 2022-07-12 thomas echo "mesg something something" >> $testroot/histedit-script
2034 8ea72c47 2022-07-12 thomas echo "mesg something something else" >> $testroot/histedit-script
2035 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2037 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2038 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2040 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2041 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2042 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2043 8ea72c47 2022-07-12 thomas return 1
2046 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2047 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2049 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2050 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2051 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2052 8ea72c47 2022-07-12 thomas return 1
2055 8ea72c47 2022-07-12 thomas # try again with drop -> mesg
2057 8ea72c47 2022-07-12 thomas echo "drop $old_commit1" > $testroot/histedit-script
2058 8ea72c47 2022-07-12 thomas echo "mesg something something" >> $testroot/histedit-script
2059 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2061 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2062 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2064 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2065 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2066 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2067 8ea72c47 2022-07-12 thomas return 1
2070 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2071 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2073 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2074 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2075 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2076 8ea72c47 2022-07-12 thomas return 1
2079 8ea72c47 2022-07-12 thomas # try again with fold -> mesg
2081 8ea72c47 2022-07-12 thomas echo "fold $old_commit1" > $testroot/histedit-script
2082 8ea72c47 2022-07-12 thomas echo "mesg something something" >> $testroot/histedit-script
2083 8ea72c47 2022-07-12 thomas echo "pick $old_commit2" >> $testroot/histedit-script
2085 8ea72c47 2022-07-12 thomas (cd $testroot/wt && got histedit -F $testroot/histedit-script \
2086 8ea72c47 2022-07-12 thomas > $testroot/stdout 2> $testroot/stderr)
2088 8ea72c47 2022-07-12 thomas if [ $ret -eq 0 ]; then
2089 8ea72c47 2022-07-12 thomas echo "histedit succeeded unexpectedly" >&2
2090 8ea72c47 2022-07-12 thomas test_done "$testroot" 1
2091 8ea72c47 2022-07-12 thomas return 1
2094 8ea72c47 2022-07-12 thomas echo "got: bad histedit command" > $testroot/stderr.expected
2095 8ea72c47 2022-07-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
2097 8ea72c47 2022-07-12 thomas if [ $ret -ne 0 ]; then
2098 8ea72c47 2022-07-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
2100 8ea72c47 2022-07-12 thomas test_done "$testroot" $ret
2103 150d7275 2022-07-22 thomas test_histedit_resets_committer() {
2104 150d7275 2022-07-22 thomas local testroot=`test_init histedit_resets_committer`
2105 150d7275 2022-07-22 thomas local orig_commit=`git_show_head $testroot/repo`
2106 150d7275 2022-07-22 thomas local committer="Flan Luck <flan_luck@openbsd.org>"
2108 150d7275 2022-07-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
2110 150d7275 2022-07-22 thomas echo "modified alpha" > $testroot/wt/alpha
2112 150d7275 2022-07-22 thomas (cd $testroot/wt/ && got commit -m 'modified alpha on master' \
2113 150d7275 2022-07-22 thomas alpha > /dev/null)
2115 150d7275 2022-07-22 thomas if [ "$?" != 0 ]; then
2116 150d7275 2022-07-22 thomas echo "got commit failed unexpectedly" >&2
2117 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2118 150d7275 2022-07-22 thomas return 1
2121 150d7275 2022-07-22 thomas local top_commit=`git_show_head $testroot/repo`
2122 150d7275 2022-07-22 thomas echo "pick $top_commit" > "$testroot/histedit-script"
2124 150d7275 2022-07-22 thomas (cd $testroot/wt/ && got update -c $orig_commit > /dev/null)
2126 150d7275 2022-07-22 thomas if [ "$?" != 0 ]; then
2127 150d7275 2022-07-22 thomas echo "got update failed unexpectedly" >&2
2128 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2129 150d7275 2022-07-22 thomas return 1
2132 150d7275 2022-07-22 thomas (cd $testroot/wt && env GOT_AUTHOR="$committer" \
2133 150d7275 2022-07-22 thomas got histedit -F "$testroot/histedit-script" > /dev/null)
2135 150d7275 2022-07-22 thomas if [ "$?" != 0 ]; then
2136 150d7275 2022-07-22 thomas echo "got histedit failed unexpectedly" >&2
2137 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2138 150d7275 2022-07-22 thomas return 1
2140 150d7275 2022-07-22 thomas local edited_commit=`git_show_head $testroot/repo`
2142 150d7275 2022-07-22 thomas # Original commit only had one author
2143 150d7275 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $top_commit | \
2144 150d7275 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
2145 150d7275 2022-07-22 thomas echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
2146 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2148 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
2149 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
2150 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2151 150d7275 2022-07-22 thomas return 1
2154 150d7275 2022-07-22 thomas # Edited commit should have new committer name added
2155 150d7275 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $edited_commit | \
2156 150d7275 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
2157 150d7275 2022-07-22 thomas echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
2158 150d7275 2022-07-22 thomas echo "via: $committer" >> $testroot/stdout.expected
2160 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2162 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
2163 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
2165 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
2168 a2c162eb 2022-10-30 thomas test_histedit_umask() {
2169 a2c162eb 2022-10-30 thomas local testroot=`test_init histedit_umask`
2170 a2c162eb 2022-10-30 thomas local orig_commit=`git_show_head "$testroot/repo"`
2172 a2c162eb 2022-10-30 thomas got checkout "$testroot/repo" "$testroot/wt" >/dev/null
2174 a2c162eb 2022-10-30 thomas echo "modified alpha" > $testroot/wt/alpha
2175 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'edit #1') >/dev/null
2176 a2c162eb 2022-10-30 thomas local commit1=`git_show_head "$testroot/repo"`
2178 a2c162eb 2022-10-30 thomas echo "modified again" > $testroot/wt/alpha
2179 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'edit #2') >/dev/null
2180 a2c162eb 2022-10-30 thomas local commit2=`git_show_head "$testroot/repo"`
2182 a2c162eb 2022-10-30 thomas echo "modified again!" > $testroot/wt/alpha
2183 a2c162eb 2022-10-30 thomas echo "modify beta too!" > $testroot/wt/beta
2184 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'edit #3') >/dev/null
2185 a2c162eb 2022-10-30 thomas local commit3=`git_show_head "$testroot/repo"`
2187 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got update -c "$orig_commit") >/dev/null
2189 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
2190 a2c162eb 2022-10-30 thomas echo "update to $orig_commit failed!" >&2
2191 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
2192 a2c162eb 2022-10-30 thomas return 1
2195 a2c162eb 2022-10-30 thomas echo fold $commit1 >$testroot/histedit-script
2196 a2c162eb 2022-10-30 thomas echo fold $commit2 >>$testroot/histedit-script
2197 a2c162eb 2022-10-30 thomas echo pick $commit3 >>$testroot/histedit-script
2198 a2c162eb 2022-10-30 thomas echo mesg folding changes >>$testroot/histedit-script
2200 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
2201 a2c162eb 2022-10-30 thomas (umask 077 && cd "$testroot/wt" && \
2202 a2c162eb 2022-10-30 thomas got histedit -F "$testroot/histedit-script") >/dev/null
2205 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
2206 a2c162eb 2022-10-30 thomas echo "histedit operation failed" >&2
2207 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
2208 a2c162eb 2022-10-30 thomas return 1
2211 a2c162eb 2022-10-30 thomas for f in alpha beta; do
2212 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/$f" | grep -q ^-rw-------
2213 a2c162eb 2022-10-30 thomas if [ $? -ne 0 ]; then
2214 a2c162eb 2022-10-30 thomas echo "$f is not 0600 after histedi" >&2
2215 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/$f" >&2
2216 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
2217 a2c162eb 2022-10-30 thomas return 1
2221 a2c162eb 2022-10-30 thomas test_done "$testroot" 0
2224 7fb414ae 2020-08-08 stsp test_parseargs "$@"
2225 0ebf8283 2019-07-24 stsp run_test test_histedit_no_op
2226 0ebf8283 2019-07-24 stsp run_test test_histedit_swap
2227 0ebf8283 2019-07-24 stsp run_test test_histedit_drop
2228 0ebf8283 2019-07-24 stsp run_test test_histedit_fold
2229 0ebf8283 2019-07-24 stsp run_test test_histedit_edit
2230 0ebf8283 2019-07-24 stsp run_test test_histedit_fold_last_commit
2231 0ebf8283 2019-07-24 stsp run_test test_histedit_missing_commit
2232 0ebf8283 2019-07-24 stsp run_test test_histedit_abort
2233 a4027091 2019-07-25 stsp run_test test_histedit_path_prefix_drop
2234 b2c50a0a 2019-07-25 stsp run_test test_histedit_path_prefix_edit
2235 c7d20a3f 2019-07-30 stsp run_test test_histedit_outside_refs_heads
2236 0def28b1 2019-08-17 stsp run_test test_histedit_fold_last_commit_swap
2237 de05890f 2020-03-05 stsp run_test test_histedit_split_commit
2238 5b87815e 2020-03-05 stsp run_test test_histedit_duplicate_commit_in_script
2239 ecfff807 2020-09-23 stsp run_test test_histedit_fold_add_delete
2240 239f5c5a 2020-12-13 stsp run_test test_histedit_fold_only
2241 a347e6bb 2020-12-13 stsp run_test test_histedit_fold_only_empty_logmsg
2242 c50a7455 2021-10-04 thomas run_test test_histedit_edit_only
2243 66eecf0d 2021-10-08 thomas run_test test_histedit_prepend_line
2244 8ea72c47 2022-07-12 thomas run_test test_histedit_mesg_invalid
2245 150d7275 2022-07-22 thomas run_test test_histedit_resets_committer
2246 a2c162eb 2022-10-30 thomas run_test test_histedit_umask
