Commit b2c50a0a51e3a8e22fb1e9867cbf6bc7356acbd3
2019-07-25T13:05:09
add another histedit test for path prefix behaviour
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147
diff --git a/regress/cmdline/histedit.sh b/regress/cmdline/histedit.sh
index df4bf3a..4c72997 100755
--- a/regress/cmdline/histedit.sh
+++ b/regress/cmdline/histedit.sh
@@ -908,6 +908,137 @@ function test_histedit_path_prefix_drop {
test_done "$testroot" "$ret"
}
+function test_histedit_path_prefix_edit {
+ local testroot=`test_init histedit_path_prefix_edit`
+ local orig_commit=`git_show_head $testroot/repo`
+
+ echo "modified zeta" > $testroot/repo/epsilon/zeta
+ git_commit $testroot/repo -m "changing zeta"
+ local old_commit1=`git_show_head $testroot/repo`
+
+ got diff -r $testroot/repo $orig_commit $old_commit1 \
+ > $testroot/diff.expected
+
+ got checkout -c $orig_commit -p gamma $testroot/repo \
+ $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo "edit $old_commit1" > $testroot/histedit-script
+ echo "mesg modified zeta" >> $testroot/histedit-script
+
+ (cd $testroot/wt && got histedit -F $testroot/histedit-script \
+ > $testroot/stdout 2> $testroot/stderr)
+
+ ret="$?"
+ if [ "$ret" == "0" ]; then
+ echo "histedit succeeded unexpectedly" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ echo -n "got: cannot edit branch history which contains changes " \
+ > $testroot/stderr.expected
+ echo "outside of this work tree's path prefix" \
+ >> $testroot/stderr.expected
+
+ cmp -s $testroot/stderr.expected $testroot/stderr
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/stderr.expected $testroot/stderr
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ rm -rf $testroot/wt
+ got checkout -c $orig_commit -p epsilon $testroot/repo \
+ $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+ (cd $testroot/wt && got histedit -F $testroot/histedit-script \
+ > $testroot/stdout)
+
+ local short_old_commit1=`trim_obj_id 28 $old_commit1`
+
+ echo "G zeta" > $testroot/stdout.expected
+ echo "Stopping histedit for amending commit $old_commit1" \
+ >> $testroot/stdout.expected
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo "modified zeta" > $testroot/content.expected
+ cat $testroot/wt/zeta > $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/content.expected $testroot/content
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ (cd $testroot/wt && got status > $testroot/stdout)
+
+ echo "M zeta"> $testroot/stdout.expected
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ (cd $testroot/wt && got histedit -c > $testroot/stdout)
+
+ local new_commit1=`git_show_head $testroot/repo`
+ local short_new_commit1=`trim_obj_id 28 $new_commit1`
+
+ echo -n "$short_old_commit1 -> $short_new_commit1: " \
+ > $testroot/stdout.expected
+ echo "modified zeta" >> $testroot/stdout.expected
+ echo "Switching work tree to refs/heads/master" \
+ >> $testroot/stdout.expected
+
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
+ echo "commit $new_commit1 (master)" > $testroot/stdout.expected
+ echo "commit $orig_commit" >> $testroot/stdout.expected
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ got diff -r $testroot/repo $orig_commit $new_commit1 \
+ > $testroot/diff
+ sed -i -e "s/$old_commit1/$new_commit1/" $testroot/diff.expected
+ cmp -s $testroot/diff.expected $testroot/diff
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/diff.expected $testroot/diff
+ fi
+ test_done "$testroot" "$ret"
+}
+
run_test test_histedit_no_op
run_test test_histedit_swap
run_test test_histedit_drop
@@ -917,3 +1048,4 @@ run_test test_histedit_fold_last_commit
run_test test_histedit_missing_commit
run_test test_histedit_abort
run_test test_histedit_path_prefix_drop
+run_test test_histedit_path_prefix_edit