From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Lars Schneider <larsxschneider@gmail.com>
Cc: Lars Schneider <lars.schneider@autodesk.com>,
git@vger.kernel.org, sbeller@google.com, sunshine@sunshineco.com,
sandals@crustytoothpaste.net, peff@peff.net
Subject: Re: [PATCH v5 2/2] launch_editor(): indicate that Git waits for user input
Date: Thu, 7 Dec 2017 23:07:46 +0530 [thread overview]
Message-ID: <dfb2cde5-a499-8da3-9695-8c8fd46a96ad@gmail.com> (raw)
In-Reply-To: <xmqqmv2uec0p.fsf@gitster.mtv.corp.google.com>
On Thursday 07 December 2017 10:00 PM, Junio C Hamano wrote:
> +
> + if (print_waiting_for_editor) {
> + /*
> + * A dumb terminal cannot erase the line later on. Add a
> + * newline to separate the hint from subsequent output.
> + *
> + * In case the editor emits further cruft after what
> + * we wrote above, separate it from our message with SP.
I guess this part of the comment could be improved a little. I currently
interpret it as "See if the editor emits further cruft, print a space in
that case". Though, it's not what we are doing. Something like the
following, perhaps?
In a non-dumb terminal, separate our message from further cruft
that might be emitted by the editor with SP.
> + */
> + const char term = is_terminal_dumb() ? '\n' : ' ';
> +
> + fprintf(stderr,
> + _("hint: Waiting for your editor to close the file...%c"),
> + term);
> + fflush(stderr);
> + }
>
> p.argv = args;
> p.env = env;
> @@ -63,6 +80,13 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
> if (ret)
> return error("There was a problem with the editor '%s'.",
> editor);
> +
> + if (print_waiting_for_editor && !is_terminal_dumb())
> + /*
> + * Go back to the beginning and erase the entire line to
> + * avoid wasting the vertical space.
> + */
> + fputs("\r\033[K", stderr);
> }
>
> if (!buffer)
>
next prev parent reply other threads:[~2017-12-07 17:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 15:16 [PATCH v5 0/2] launch_editor(): indicate that Git waits for user input lars.schneider
2017-12-07 15:16 ` [PATCH v5 1/2] refactor "dumb" terminal determination lars.schneider
2017-12-07 15:16 ` [PATCH v5 2/2] launch_editor(): indicate that Git waits for user input lars.schneider
2017-12-07 15:43 ` Junio C Hamano
2017-12-07 15:48 ` Lars Schneider
2017-12-07 16:16 ` Lars Schneider
2017-12-07 16:30 ` Junio C Hamano
2017-12-07 16:36 ` Lars Schneider
2017-12-07 17:37 ` Kaartic Sivaraam [this message]
2017-12-07 17:56 ` Lars Schneider
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dfb2cde5-a499-8da3-9695-8c8fd46a96ad@gmail.com \
--to=kaartic.sivaraam@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lars.schneider@autodesk.com \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).