From: Lars Schneider <larsxschneider@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>, Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH] launch_editor(): indicate that Git waits for user input
Date: Thu, 16 Nov 2017 11:25:50 +0100 [thread overview]
Message-ID: <DAEC36C7-AE09-4C9B-ACC4-07F2C5F2B97F@gmail.com> (raw)
In-Reply-To: <xmqqr2syvjxb.fsf@gitster.mtv.corp.google.com>
> On 16 Nov 2017, at 07:04, Junio C Hamano <gitster@pobox.com> wrote:
Wow. Thanks for the quick patch :-)
> When a graphical GIT_EDITOR is spawned by a Git command that opens
> and waits for it for the user input (e.g. "git rebase -i") pops its
> window elsewhere that is obscure, the user may be left staring the
> original terminal window s/he invoked the Git command from, without
> even realizing that now s/he needs to interact with another window
> the editor is waiting in, before Git can proceed.
Maybe:
When a graphical GIT_EDITOR is spawned by a Git command that opens
and waits for user input (e.g. "git rebase -i"), then the editor window
might be obscured by other windows. The user may be left staring at the
original Git terminal window without even realizing that s/he needs to
interact with another window before Git can proceed. To this user Git
appears hanging.
> Show a message to the original terminal, and get rid of it when the
s/to/in/ ?
> editor returns.
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>
> * I tried this with "emacsclient" but it turns out that Emacs folks
> have already thought about this issue, and the program says
> "Waiting for Emacs..." while it does its thing, so from that
> point of view, perhaps as Stefan said originally, the editor Lars
> had trouble with is what is at fault and needs fixing? I dunno.
Based on my (not too extensive) testing, Emacs is probably the only
editor with this clever behavior.
> Also, emacsclient seems to conclude its message, once the editing
> is done, by emitting LF _before_ we have a chance to do the "go
> back to the beginning and clear" dance, so it probably is not a
> very good example to emulate the situation Lars had trouble with.
> You cannot observe the nuking of the "launched, waiting..." with
> it.
>
> editor.c | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/editor.c b/editor.c
> index 7519edecdc..1321944716 100644
> --- a/editor.c
> +++ b/editor.c
> @@ -40,6 +40,28 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
> const char *args[] = { editor, real_path(path), NULL };
> struct child_process p = CHILD_PROCESS_INIT;
> int ret, sig;
> + static const char *close_notice = NULL;
> +
> + if (isatty(2) && !close_notice) {
> + char *term = getenv("TERM");
> +
> + if (term && strcmp(term, "dumb"))
> + /*
> + * go back to the beginning and erase the
> + * entire line if the terminal is capable
> + * to do so, to avoid wasting the vertical
> + * space.
> + */
> + close_notice = "\r\033[K";
> + else
> + /* otherwise, complete and waste the line */
> + close_notice = "done.\n";
> + }
> +
> + if (close_notice) {
> + fprintf(stderr, "Launched your editor, waiting...");
I also noticed that some people don't get that they need to save and close the
file to continue. Plus, we should tell them that Git is waiting for *them* and
not anything else. Maybe we should also tell them the editor name, but that might
be too verbose. I dunno. How about this?
fprintf(stderr, "Launched your editor ('%s'). Adjust, save, and close the file to continue. Waiting for you input... ", editor);
- Lars
next prev parent reply other threads:[~2017-11-16 10:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-15 15:08 [RFC] Indicate that Git waits for user input via editor Lars Schneider
2017-11-15 17:51 ` Stefan Beller
2017-11-15 18:07 ` Lars Schneider
2017-11-15 18:37 ` Stefan Beller
2017-11-15 22:32 ` Junio C Hamano
2017-11-16 0:06 ` Stefan Beller
2017-11-16 0:33 ` Junio C Hamano
2017-11-16 0:37 ` Stefan Beller
2017-11-16 5:37 ` Junio C Hamano
2017-11-16 6:04 ` [PATCH] launch_editor(): indicate that Git waits for user input Junio C Hamano
2017-11-16 10:25 ` Lars Schneider [this message]
2017-11-16 14:58 ` Junio C Hamano
2017-11-16 15:24 ` Lars Schneider
2017-11-17 1:09 ` Junio C Hamano
2017-11-18 17:47 ` Kaartic Sivaraam
2017-11-19 1:07 ` 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=DAEC36C7-AE09-4C9B-ACC4-07F2C5F2B97F@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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