On Wed, Dec 25, 2019 at 11:56:52AM +0000, Johannes Schindelin via GitGitGadget wrote:
> The Perl version supports post-processing the colored diff (that is
> generated in addition to the uncolored diff, intended to offer a
> prettier user experience) by a command configured via that config
> setting, and now the built-in version does that, too.
So this patch makes the test 'detect bogus diffFilter output' in
't3701-add-interactive.sh' succeed with the builtin interactive add,
but I stumbled upon a test failure caused by SIGPIPE in an
experimental Travis CI s390x build:
expecting success of 3701.49 'detect bogus diffFilter output':
git reset --hard &&
echo content >test &&
test_config interactive.diffFilter "echo too-short" &&
printf y >y &&
test_must_fail force_color git add -p <y
+ git reset --hard
HEAD is now at 6ee5ee5 test
+ echo content
+ test_config interactive.diffFilter echo too-short
+ printf y
+ test_must_fail force_color git add -p
test_must_fail: died by signal 13: force_color git add -p
error: last command exited with $?=1
Turns out it's a general issue, and
GIT_TEST_ADD_I_USE_BUILTIN=1 ./t3701-add-interactive.sh -r 39,49 --stress
fails within 10 seconds on my Linux box, whereas the scripted 'add -p'
managed to survive a couple hundred repetitions.
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
> add-interactive.c | 12 ++++++++++++
> add-interactive.h | 3 +++
> add-patch.c | 33 +++++++++++++++++++++++++++++++++
> 3 files changed, 48 insertions(+)
>
> diff --git a/add-interactive.c b/add-interactive.c
> index a5bb14f2f4..1786ea29c4 100644
> --- a/add-interactive.c
> +++ b/add-interactive.c
> @@ -52,6 +52,17 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
> diff_get_color(s->use_color, DIFF_FILE_OLD));
> init_color(r, s, "new", s->file_new_color,
> diff_get_color(s->use_color, DIFF_FILE_NEW));
> +
> + FREE_AND_NULL(s->interactive_diff_filter);
> + git_config_get_string("interactive.difffilter",
> + &s->interactive_diff_filter);
> +}
> +
> +void clear_add_i_state(struct add_i_state *s)
> +{
> + FREE_AND_NULL(s->interactive_diff_filter);
> + memset(s, 0, sizeof(*s));
> + s->use_color = -1;
> }
>
> /*
> @@ -1149,6 +1160,7 @@ int run_add_i(struct repository *r, const struct pathspec *ps)
> strbuf_release(&print_file_item_data.worktree);
> strbuf_release(&header);
> prefix_item_list_clear(&commands);
> + clear_add_i_state(&s);
>
> return res;
> }
> diff --git a/add-interactive.h b/add-interactive.h
> index b2f23479c5..46c73867ad 100644
> --- a/add-interactive.h
> +++ b/add-interactive.h
> @@ -15,9 +15,12 @@ struct add_i_state {
> char context_color[COLOR_MAXLEN];
> char file_old_color[COLOR_MAXLEN];
> char file_new_color[COLOR_MAXLEN];
> +
> + char *interactive_diff_filter;
> };
>
> void init_add_i_state(struct add_i_state *s, struct repository *r);
> +void clear_add_i_state(struct add_i_state *s);
>
> struct repository;
> struct pathspec;
> diff --git a/add-patch.c b/add-patch.c
> index 46c6c183d5..78bde41df0 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -398,6 +398,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
>
> if (want_color_fd(1, -1)) {
> struct child_process colored_cp = CHILD_PROCESS_INIT;
> + const char *diff_filter = s->s.interactive_diff_filter;
>
> setup_child_process(s, &colored_cp, NULL);
> xsnprintf((char *)args.argv[color_arg_index], 8, "--color");
> @@ -407,6 +408,24 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
> argv_array_clear(&args);
> if (res)
> return error(_("could not parse colored diff"));
> +
> + if (diff_filter) {
> + struct child_process filter_cp = CHILD_PROCESS_INIT;
> +
> + setup_child_process(s, &filter_cp,
> + diff_filter, NULL);
> + filter_cp.git_cmd = 0;
> + filter_cp.use_shell = 1;
> + strbuf_reset(&s->buf);
> + if (pipe_command(&filter_cp,
> + colored->buf, colored->len,
> + &s->buf, colored->len,
> + NULL, 0) < 0)
> + return error(_("failed to run '%s'"),
> + diff_filter);
> + strbuf_swap(colored, &s->buf);
> + }
> +
> strbuf_complete_line(colored);
> colored_p = colored->buf;
> colored_pend = colored_p + colored->len;
> @@ -531,6 +550,9 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
> colored_pend - colored_p);
> if (colored_eol)
> colored_p = colored_eol + 1;
> + else if (p != pend)
> + /* colored shorter than non-colored? */
> + goto mismatched_output;
> else
> colored_p = colored_pend;
>
> @@ -555,6 +577,15 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
> */
> hunk->splittable_into++;
>
> + /* non-colored shorter than colored? */
> + if (colored_p != colored_pend) {
> +mismatched_output:
> + error(_("mismatched output from interactive.diffFilter"));
> + advise(_("Your filter must maintain a one-to-one correspondence\n"
> + "between its input and output lines."));
> + return -1;
> + }
> +
> return 0;
> }
>
> @@ -1612,6 +1643,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
> parse_diff(&s, ps) < 0) {
> strbuf_release(&s.plain);
> strbuf_release(&s.colored);
> + clear_add_i_state(&s.s);
> return -1;
> }
>
> @@ -1630,5 +1662,6 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
> strbuf_release(&s.buf);
> strbuf_release(&s.plain);
> strbuf_release(&s.colored);
> + clear_add_i_state(&s.s);
> return 0;
> }
> --
> gitgitgadget
>
