mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
This removes the ability to inject "poison" gettext() messages via the GIT_TEST_GETTEXT_POISON special test setup. I initially added this as a compile-time option inbb946bba76
(i18n: add GETTEXT_POISON to simulate unfriendly translator, 2011-02-22), and most recently modified to be toggleable at runtime in6cdccfce1e
(i18n: make GETTEXT_POISON a runtime option, 2018-11-08).. The reason for its removal is that the trade-off of maintaining it v.s. what it's getting us has long since flipped. When gettext was integrated in5e9637c629
(i18n: add infrastructure for translating Git with gettext, 2011-11-18) there was understandable concern on the Git ML that in marking messages for translation en-masse we'd inadvertently mark plumbing messages. The GETTEXT_POISON facility was a way to smoke those out via our test suite. Nowadays however we're done (or almost entirely done) with any marking of messages for translation. New messages are usually marked by their authors, who'll know whether it makes sense to translate them or not. If not any errors in marking the messages are much more likely to be spotted in review than in the the initial deluge of i18n patches in the 2011-2012 era. So let's just remove this. This leaves the test suite in a state where we still have a lot of test_i18n, C_LOCALE_OUTPUT etc. uses. Subsequent commits will remove those too. The change to t/lib-rebase.sh is a selective revert of the relevant part off2d17068fd
(i18n: rebase-interactive: mark comments of squash for translation, 2016-06-17), and the comment in t/t3406-rebase-message.sh is fromc7108bf9ed
(i18n: rebase: mark messages for translation, 2012-07-25). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
149 lines
4 KiB
Bash
149 lines
4 KiB
Bash
# Helper functions used by interactive rebase tests.
|
|
|
|
# After setting the fake editor with this function, you can
|
|
#
|
|
# - override the commit message with $FAKE_COMMIT_MESSAGE
|
|
# - amend the commit message with $FAKE_COMMIT_AMEND
|
|
# - check that non-commit messages have a certain line count with $EXPECT_COUNT
|
|
# - check the commit count in the commit message header with $EXPECT_HEADER_COUNT
|
|
# - 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:
|
|
#
|
|
# "<lineno>" -- add a "pick" line with the SHA1 taken from the
|
|
# specified line.
|
|
#
|
|
# "<cmd> <lineno>" -- add a line with the specified command
|
|
# ("pick", "squash", "fixup", "edit", "reword" or "drop") and the
|
|
# SHA1 taken from the specified line.
|
|
#
|
|
# "exec_cmd_with_args" -- add an "exec cmd with args" line.
|
|
#
|
|
# "#" -- Add a comment line.
|
|
#
|
|
# ">" -- Add a blank line.
|
|
|
|
set_fake_editor () {
|
|
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")" ||
|
|
exit
|
|
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
|
|
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
|
|
exit
|
|
;;
|
|
esac
|
|
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
|
|
action=\&
|
|
for line in $FAKE_LINES; do
|
|
case $line in
|
|
pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
|
|
action="$line";;
|
|
exec_*|x_*|break|b)
|
|
echo "$line" | sed 's/_/ /g' >> "$1";;
|
|
"#")
|
|
echo '# comment' >> "$1";;
|
|
">")
|
|
echo >> "$1";;
|
|
bad)
|
|
action="badcmd";;
|
|
fakesha)
|
|
test \& != "$action" || action=pick
|
|
echo "$action XXXXXXX False commit" >> "$1"
|
|
action=pick;;
|
|
*)
|
|
sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
|
|
action=\&;;
|
|
esac
|
|
done
|
|
echo 'rebase -i script after editing:'
|
|
cat "$1"
|
|
EOF
|
|
|
|
test_set_editor "$(pwd)/fake-editor.sh"
|
|
}
|
|
|
|
# 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"
|
|
}
|
|
|
|
# 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
|
|
}
|
|
|
|
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"
|
|
}
|
|
|
|
# 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
|
|
}
|