2013-11-25 22:03:06 +01:00
|
|
|
# Helper functions used by interactive rebase tests.
|
2009-01-27 23:34:29 +01:00
|
|
|
|
2009-01-27 23:34:35 +01:00
|
|
|
# After setting the fake editor with this function, you can
|
|
|
|
#
|
2010-01-14 06:54:48 +01:00
|
|
|
# - override the commit message with $FAKE_COMMIT_MESSAGE
|
2009-01-27 23:34:35 +01:00
|
|
|
# - amend the commit message with $FAKE_COMMIT_AMEND
|
|
|
|
# - check that non-commit messages have a certain line count with $EXPECT_COUNT
|
2010-01-14 06:54:48 +01:00
|
|
|
# - check the commit count in the commit message header with $EXPECT_HEADER_COUNT
|
2010-01-12 16:38:35 +01:00
|
|
|
# - rewrite a rebase -i script as directed by $FAKE_LINES.
|
|
|
|
# $FAKE_LINES consists of a sequence of words separated by spaces.
|
|
|
|
# The following word combinations are possible:
|
2009-01-27 23:34:35 +01:00
|
|
|
#
|
2010-01-12 16:38:35 +01:00
|
|
|
# "<lineno>" -- add a "pick" line with the SHA1 taken from the
|
|
|
|
# specified line.
|
2009-01-27 23:34:35 +01:00
|
|
|
#
|
2010-01-12 16:38:35 +01:00
|
|
|
# "<cmd> <lineno>" -- add a line with the specified command
|
t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'
The verbose output of the test 'reword without issues functions as
intended' in 't3423-rebase-reword.sh', added in a9279c6785 (sequencer:
do not squash 'reword' commits when we hit conflicts, 2018-06-19),
contains the following error output:
sed: -e expression #1, char 2: extra characters after command
This error comes from within the 'fake-editor.sh' script created by
'lib-rebase.sh's set_fake_editor() function, and the root cause is the
FAKE_LINES="pick 1 reword 2" variable in the test in question, in
particular the "pick" word. 'fake-editor.sh' assumes 'pick' to be the
default rebase command and doesn't support an explicit 'pick' command
in FAKE_LINES. As a result, 'pick' will be used instead of a line
number when assembling the following 'sed' script:
sed -n picks/^pick/pick/p
which triggers the aforementioned error.
Luckily, this didn't affect the test's correctness: the erroring 'sed'
command doesn't write anything to the todo script, and processing the
rest of FAKE_LINES generates the desired todo script, as if that
'pick' command were not there at all.
The minimal fix would be to remove the 'pick' word from FAKE_LINES,
but that would leave us susceptible to similar issues in the future.
Instead, teach the fake-editor script to recognize an explicit 'pick'
command, which is still a fairly trivial change.
In the future we might want to consider reinforcing this fake editor
script with an &&-chain and stricter parsing of the FAKE_LINES
variable (e.g. to error out when encountering unknown rebase commands
or commands and line numbers in the wrong order).
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-23 12:09:15 +02:00
|
|
|
# ("pick", "squash", "fixup", "edit", "reword" or "drop") and the
|
|
|
|
# SHA1 taken from the specified line.
|
2010-01-12 16:38:35 +01:00
|
|
|
#
|
2013-07-01 18:20:35 +02:00
|
|
|
# "exec_cmd_with_args" -- add an "exec cmd with args" line.
|
|
|
|
#
|
2010-01-12 16:38:35 +01:00
|
|
|
# "#" -- Add a comment line.
|
|
|
|
#
|
|
|
|
# ">" -- Add a blank line.
|
2009-01-27 23:34:35 +01:00
|
|
|
|
2009-01-27 23:34:29 +01:00
|
|
|
set_fake_editor () {
|
2013-07-01 18:23:38 +02:00
|
|
|
write_script fake-editor.sh <<-\EOF
|
|
|
|
case "$1" in
|
|
|
|
*/COMMIT_EDITMSG)
|
|
|
|
test -z "$EXPECT_HEADER_COUNT" ||
|
|
|
|
test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
|
2016-06-17 22:21:05 +02:00
|
|
|
test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" ||
|
2013-07-01 18:23:38 +02:00
|
|
|
exit
|
|
|
|
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
|
|
|
|
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
|
2010-01-14 06:54:48 +01:00
|
|
|
exit
|
2013-07-01 18:23:38 +02:00
|
|
|
;;
|
2009-01-27 23:34:29 +01:00
|
|
|
esac
|
2013-07-01 18:23:38 +02:00
|
|
|
test -z "$EXPECT_COUNT" ||
|
|
|
|
test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
|
|
|
|
exit
|
|
|
|
test -z "$FAKE_LINES" && exit
|
|
|
|
grep -v '^#' < "$1" > "$1".tmp
|
|
|
|
rm -f "$1"
|
|
|
|
echo 'rebase -i script before editing:'
|
|
|
|
cat "$1".tmp
|
t/lib-rebase: prepare for testing `git rebase --rebase-merges`
The format of the todo list is quite a bit different in the
`--rebase-merges` mode; Let's prepare the fake editor to handle those
todo lists properly, too.
The original idea was that we keep the original command unless
overridden, and because the original todo lists only had `pick` lines
anyway, we could be sloppy and "override" the command by the same
command (i.e. use the sed replacement pattern "pick" instead of "&").
This actually would not have worked with `fixup` and `squash` commands,
but it would appear that we never tried to use the fake editor with
`--autosquash`.
However, in the next commit we want to use the fake editor in
conjunction with `--rebase-merges`, so let's use the correct sed
replacement pattern.
Technically, it is not necessary to take care of the `fakesha` thing
(where we reuse the sed replacement pattern to craft a new todo
command), at least for now, as the only user of that thing overrides the
`action` anyway. Nevertheless, for completeness' sake, we do take care
of it.
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-07-31 17:18:48 +02:00
|
|
|
action=\&
|
2013-07-01 18:23:38 +02:00
|
|
|
for line in $FAKE_LINES; do
|
|
|
|
case $line in
|
t/lib-rebase: prepare for testing `git rebase --rebase-merges`
The format of the todo list is quite a bit different in the
`--rebase-merges` mode; Let's prepare the fake editor to handle those
todo lists properly, too.
The original idea was that we keep the original command unless
overridden, and because the original todo lists only had `pick` lines
anyway, we could be sloppy and "override" the command by the same
command (i.e. use the sed replacement pattern "pick" instead of "&").
This actually would not have worked with `fixup` and `squash` commands,
but it would appear that we never tried to use the fake editor with
`--autosquash`.
However, in the next commit we want to use the fake editor in
conjunction with `--rebase-merges`, so let's use the correct sed
replacement pattern.
Technically, it is not necessary to take care of the `fakesha` thing
(where we reuse the sed replacement pattern to craft a new todo
command), at least for now, as the only user of that thing overrides the
`action` anyway. Nevertheless, for completeness' sake, we do take care
of it.
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-07-31 17:18:48 +02:00
|
|
|
pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
|
2013-07-01 18:23:38 +02:00
|
|
|
action="$line";;
|
2018-11-06 07:50:22 +01:00
|
|
|
exec_*|x_*|break|b)
|
2013-07-01 18:23:38 +02:00
|
|
|
echo "$line" | sed 's/_/ /g' >> "$1";;
|
|
|
|
"#")
|
|
|
|
echo '# comment' >> "$1";;
|
|
|
|
">")
|
|
|
|
echo >> "$1";;
|
2015-06-29 22:20:32 +02:00
|
|
|
bad)
|
|
|
|
action="badcmd";;
|
|
|
|
fakesha)
|
t/lib-rebase: prepare for testing `git rebase --rebase-merges`
The format of the todo list is quite a bit different in the
`--rebase-merges` mode; Let's prepare the fake editor to handle those
todo lists properly, too.
The original idea was that we keep the original command unless
overridden, and because the original todo lists only had `pick` lines
anyway, we could be sloppy and "override" the command by the same
command (i.e. use the sed replacement pattern "pick" instead of "&").
This actually would not have worked with `fixup` and `squash` commands,
but it would appear that we never tried to use the fake editor with
`--autosquash`.
However, in the next commit we want to use the fake editor in
conjunction with `--rebase-merges`, so let's use the correct sed
replacement pattern.
Technically, it is not necessary to take care of the `fakesha` thing
(where we reuse the sed replacement pattern to craft a new todo
command), at least for now, as the only user of that thing overrides the
`action` anyway. Nevertheless, for completeness' sake, we do take care
of it.
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-07-31 17:18:48 +02:00
|
|
|
test \& != "$action" || action=pick
|
2015-06-29 22:20:32 +02:00
|
|
|
echo "$action XXXXXXX False commit" >> "$1"
|
|
|
|
action=pick;;
|
2013-07-01 18:23:38 +02:00
|
|
|
*)
|
t/lib-rebase: prepare for testing `git rebase --rebase-merges`
The format of the todo list is quite a bit different in the
`--rebase-merges` mode; Let's prepare the fake editor to handle those
todo lists properly, too.
The original idea was that we keep the original command unless
overridden, and because the original todo lists only had `pick` lines
anyway, we could be sloppy and "override" the command by the same
command (i.e. use the sed replacement pattern "pick" instead of "&").
This actually would not have worked with `fixup` and `squash` commands,
but it would appear that we never tried to use the fake editor with
`--autosquash`.
However, in the next commit we want to use the fake editor in
conjunction with `--rebase-merges`, so let's use the correct sed
replacement pattern.
Technically, it is not necessary to take care of the `fakesha` thing
(where we reuse the sed replacement pattern to craft a new todo
command), at least for now, as the only user of that thing overrides the
`action` anyway. Nevertheless, for completeness' sake, we do take care
of it.
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-07-31 17:18:48 +02:00
|
|
|
sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
|
|
|
|
action=\&;;
|
2013-07-01 18:23:38 +02:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
echo 'rebase -i script after editing:'
|
|
|
|
cat "$1"
|
|
|
|
EOF
|
2009-01-27 23:34:29 +01:00
|
|
|
|
|
|
|
test_set_editor "$(pwd)/fake-editor.sh"
|
|
|
|
}
|
2013-06-07 08:11:37 +02:00
|
|
|
|
2013-06-27 21:26:31 +02:00
|
|
|
# After set_cat_todo_editor, rebase -i will write the todo list (ignoring
|
|
|
|
# blank lines and comments) to stdout, and exit failure (so you should run
|
|
|
|
# it with test_must_fail). This can be used to verify the expected user
|
|
|
|
# experience, for todo list changes that do not affect the outcome of
|
|
|
|
# rebase; or as an extra check in addition to checking the outcome.
|
|
|
|
|
|
|
|
set_cat_todo_editor () {
|
|
|
|
write_script fake-editor.sh <<-\EOF
|
|
|
|
grep "^[^#]" "$1"
|
|
|
|
exit 1
|
|
|
|
EOF
|
|
|
|
test_set_editor "$(pwd)/fake-editor.sh"
|
|
|
|
}
|
|
|
|
|
2013-06-07 08:11:37 +02:00
|
|
|
# checks that the revisions in "$2" represent a linear range with the
|
|
|
|
# subjects in "$1"
|
|
|
|
test_linear_range () {
|
|
|
|
revlist_merges=$(git rev-list --merges "$2") &&
|
|
|
|
test -z "$revlist_merges" &&
|
|
|
|
expected=$1
|
|
|
|
set -- $(git log --reverse --format=%s "$2")
|
|
|
|
test "$expected" = "$*"
|
|
|
|
}
|
|
|
|
|
|
|
|
reset_rebase () {
|
|
|
|
test_might_fail git rebase --abort &&
|
|
|
|
git reset --hard &&
|
|
|
|
git clean -f
|
|
|
|
}
|
2013-06-07 08:11:38 +02:00
|
|
|
|
|
|
|
cherry_pick () {
|
|
|
|
git cherry-pick -n "$2" &&
|
|
|
|
git commit -m "$1" &&
|
|
|
|
git tag "$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
revert () {
|
|
|
|
git revert -n "$2" &&
|
|
|
|
git commit -m "$1" &&
|
|
|
|
git tag "$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
make_empty () {
|
|
|
|
git commit --allow-empty -m "$1" &&
|
|
|
|
git tag "$1"
|
|
|
|
}
|
2019-10-15 12:25:29 +02:00
|
|
|
|
|
|
|
# Call this (inside test_expect_success) at the end of a test file to
|
|
|
|
# check that no tests have changed editor related environment
|
|
|
|
# variables or config settings
|
|
|
|
test_editor_unchanged () {
|
|
|
|
# We're only interested in exported variables hence 'sh -c'
|
|
|
|
sh -c 'cat >actual <<-EOF
|
|
|
|
EDITOR=$EDITOR
|
|
|
|
FAKE_COMMIT_AMEND=$FAKE_COMMIT_AMEND
|
|
|
|
FAKE_COMMIT_MESSAGE=$FAKE_COMMIT_MESSAGE
|
|
|
|
FAKE_LINES=$FAKE_LINES
|
|
|
|
GIT_EDITOR=$GIT_EDITOR
|
|
|
|
GIT_SEQUENCE_EDITOR=$GIT_SEQUENCE_EDITOR
|
|
|
|
core.editor=$(git config core.editor)
|
|
|
|
sequence.editor=$(git config sequence.editor)
|
|
|
|
EOF'
|
|
|
|
cat >expect <<-\EOF
|
|
|
|
EDITOR=:
|
|
|
|
FAKE_COMMIT_AMEND=
|
|
|
|
FAKE_COMMIT_MESSAGE=
|
|
|
|
FAKE_LINES=
|
|
|
|
GIT_EDITOR=
|
|
|
|
GIT_SEQUENCE_EDITOR=
|
|
|
|
core.editor=
|
|
|
|
sequence.editor=
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|