From: Phillip Wood <phillip.wood123@gmail.com>
To: "Rubén Justo" <rjusto@gmail.com>,
"Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v3 2/2] launch_editor: waiting message on error
Date: Sat, 13 Apr 2024 16:09:27 +0100 [thread overview]
Message-ID: <782c7127-45d7-4bd6-930f-941a6f43088d@gmail.com> (raw)
In-Reply-To: <c430a194-32ac-403c-a381-801556275f66@gmail.com>
Hi Rubén
On 12/04/2024 18:15, Rubén Justo wrote:
> When advice.waitingForEditor configuration is not set to false, we show
> a hint telling that we are waiting for user's editor to close the file
> when we launch an editor and wait for it to return control back to us.
> We give the message on an incomplete line, expecting that we can go back
> to the line and clear the message when the editor returns successfully.
>
> However, it is possible that the editor exits with an error status, in
> which case we show an error message and then return to our caller. In
> such a case, the error message is given where the terminal cursor
> happens to be, which is most likely after the "we are waiting for your
> editor" message on the same line.
I think it is very likely that the editor has printed an error message
if it exits with a non-zero exit code and if that message does not end
with a newline that is a bug in the editor. Do you have a real-world
example of the problem you are seeking to fix?
Best Wishes
Phillip
> Only clear the line when the editor returned cleanly, and otherwise,
> complete the message on the incomplete line with a newline before giving
> the error message.
>
> While we're here, make the error message follow our CodingGuideLines.
>
> Signed-off-by: Rubén Justo <rjusto@gmail.com>
> ---
> editor.c | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/editor.c b/editor.c
> index 1da3a26f5d..eb0cfe4a28 100644
> --- a/editor.c
> +++ b/editor.c
> @@ -104,16 +104,26 @@ static int launch_specified_editor(const char *editor, const char *path,
> sigchain_pop(SIGQUIT);
> if (sig == SIGINT || sig == SIGQUIT)
> raise(sig);
> +
> + if (print_waiting_for_editor && !is_terminal_dumb()) {
> + if (!ret)
> + /*
> + * Erase the entire line to avoid wasting
> + * the vertical space.
> + */
> + term_clear_line();
> + else
> + /*
> + * We don't want term_clear_line() here
> + * because the editor could have written
> + * some useful messages to the user.
> + */
> + fprintf(stderr, "\n");
> + }
> +
> if (ret)
> - return error("There was a problem with the editor '%s'.",
> + return error("there was a problem with the editor '%s'",
> editor);
> -
> - if (print_waiting_for_editor && !is_terminal_dumb())
> - /*
> - * Erase the entire line to avoid wasting the
> - * vertical space.
> - */
> - term_clear_line();
> }
>
> if (!buffer)
next prev parent reply other threads:[~2024-04-13 15:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 21:02 [PATCH] launch_editor: waiting message on error Rubén Justo
2024-04-08 21:07 ` Rubén Justo
2024-04-08 23:09 ` [PATCH v2] " Rubén Justo
2024-04-09 1:27 ` Junio C Hamano
2024-04-09 23:38 ` Rubén Justo
2024-04-10 15:44 ` Junio C Hamano
2024-04-11 23:18 ` Rubén Justo
2024-04-12 15:46 ` Junio C Hamano
2024-04-12 17:03 ` Rubén Justo
2024-04-12 17:35 ` Junio C Hamano
2024-04-12 18:24 ` Rubén Justo
2024-04-12 17:05 ` [PATCH v3 0/2] launch_editor: waiting message Rubén Justo
2024-04-12 17:15 ` [PATCH v3 1/2] launch_editor: waiting for editor message Rubén Justo
2024-04-12 17:24 ` rsbecker
2024-04-12 17:37 ` Rubén Justo
2024-04-12 17:47 ` rsbecker
2024-04-13 15:06 ` Phillip Wood
2024-04-12 17:15 ` [PATCH v3 2/2] launch_editor: waiting message on error Rubén Justo
2024-04-13 15:09 ` Phillip Wood [this message]
2024-04-14 7:23 ` Rubén Justo
2024-04-14 7:39 ` [PATCH v4] " Rubén Justo
2024-04-15 14:05 ` Phillip Wood
2024-04-15 17:03 ` Rubén Justo
2024-04-15 17:20 ` Junio C Hamano
2024-04-15 17:07 ` Rubén Justo
2024-04-15 18:44 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=782c7127-45d7-4bd6-930f-941a6f43088d@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rjusto@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).