From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] rebase: fix garbled progress display with '-x'
Date: Fri, 3 May 2019 10:41:01 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905031034400.45@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190501231640.GD14763@szeder.dev>
[-- Attachment #1: Type: text/plain, Size: 2053 bytes --]
Hi,
On Thu, 2 May 2019, SZEDER Gábor wrote:
> On Tue, Apr 30, 2019 at 06:25:35PM -0400, Johannes Schindelin wrote:
> >
> > On Tue, 30 Apr 2019, SZEDER Gábor wrote:
> >
> > > diff --git a/sequencer.c b/sequencer.c
> > > index 546f281898..c2e4baa90e 100644
> > > --- a/sequencer.c
> > > +++ b/sequencer.c
> > > @@ -3631,6 +3631,12 @@ static int pick_commits(struct repository *r,
> > > int saved = *end_of_arg;
> > > struct stat st;
> > >
> > > + if (!opts->verbose)
> > > + /*
> > > + * Fully cover the previous "Rebasing (n/m)"
> > > + * progress line.
> > > + */
> > > + fprintf(stderr, "%*s\r", term_columns(), "");
> >
> > IIRC there are terminals (`cmd.exe`?) that would advance to the next row
> > automatically when printing the exact number of columns in a row. So this
> > would not work.
>
> Hrm, I though about using 'term_columns()-1', or moving the '\r' from
> the format string to the string to be printed, but in the end didn't
> do either, because it seemed to work well as it is in the two
> terminals that I tried (on Linux).
>
> > But isn't there an ANSI sequence that we can use?
> >
> > *clicketyclick*
> >
> > Yes: https://github.com/git/git/blob/v2.21.0/editor.c#L101 (introduced in
> > https://github.com/git/git/commit/abfb04d0c7#diff-cdeec438beb851e450b94a11db9ab7edR89)
> >
> > So maybe we should do the same here, i.e.
> >
> > fputs("\r\033[K", stderr);
>
> Oh, that would be nice (and not only here, but it could have made the
> changes in 'sg/overlong-progress-fix' a bit simpler as well).
> Unfortunately, however, it only works on non-dumb terminals (note the
> '!is_terminal_dumb()' call in the preceeding condition), while rebase
> hasn't had such a limitation on the terminal yet.
I think it would still be nice to have it in the common case of a capable
terminal.
Maybe this could even become a helper function, e.g.
`erase_terminal_line_remainder()`? This should also help other developers
discover and use it.
Ciao,
Dscho
next prev parent reply other threads:[~2019-05-03 8:41 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 14:25 [PATCH] rebase: fix garbled progress display with '-x' SZEDER Gábor
2019-04-30 22:25 ` Johannes Schindelin
2019-05-01 23:16 ` SZEDER Gábor
2019-05-03 8:41 ` Johannes Schindelin [this message]
2019-06-11 12:38 ` SZEDER Gábor
2019-06-11 13:03 ` [PATCH v2 0/4] rebase/progress: add and use term_clear_line() SZEDER Gábor
2019-06-11 13:03 ` [PATCH v2 1/4] t3404-rebase-interactive: use the 'q_to_cr' helper SZEDER Gábor
2019-06-11 13:03 ` [PATCH v2 2/4] pager: add a helper function to clear the last line in the terminal SZEDER Gábor
2019-06-11 13:03 ` [PATCH v2 3/4] rebase: fix garbled progress display with '-x' SZEDER Gábor
2019-06-11 20:36 ` Junio C Hamano
2019-06-11 21:11 ` SZEDER Gábor
2019-06-12 19:14 ` Johannes Schindelin
2019-06-12 19:41 ` SZEDER Gábor
2019-06-13 7:54 ` Johannes Schindelin
2019-06-14 18:42 ` Johannes Schindelin
2019-06-17 18:40 ` SZEDER Gábor
2019-06-17 19:13 ` SZEDER Gábor
2019-06-17 19:25 ` SZEDER Gábor
2019-06-24 18:39 ` SZEDER Gábor
2019-06-25 10:08 ` Phillip Wood
2019-06-25 11:31 ` SZEDER Gábor
2019-06-25 13:33 ` Phillip Wood
2019-06-25 18:00 ` Phillip Wood
2019-06-25 11:38 ` Johannes Schindelin
2019-06-25 13:35 ` Phillip Wood
2019-06-11 20:48 ` Junio C Hamano
2019-06-11 23:50 ` SZEDER Gábor
2019-06-12 16:21 ` Junio C Hamano
2019-06-11 13:03 ` [PATCH v2 4/4] progress: use term_clear_line() SZEDER Gábor
2019-06-12 20:00 ` Johannes Schindelin
2019-06-24 18:13 ` [PATCH v3 0/5] rebase/progress: add and " SZEDER Gábor
2019-06-24 18:13 ` [PATCH v3 1/5] t3404: modernize here doc style SZEDER Gábor
2019-06-25 9:06 ` Johannes Schindelin
2019-06-24 18:13 ` [PATCH v3 2/5] t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused SZEDER Gábor
2019-06-25 9:07 ` Johannes Schindelin
2019-06-24 18:13 ` [PATCH v3 3/5] pager: add a helper function to clear the last line in the terminal SZEDER Gábor
2019-06-24 18:13 ` [PATCH v3 4/5] rebase: fix garbled progress display with '-x' SZEDER Gábor
2019-06-27 13:42 ` [PATCH v3.1 " SZEDER Gábor
2019-06-24 18:13 ` [PATCH v3 5/5] progress: use term_clear_line() SZEDER Gábor
2019-06-25 9:10 ` Johannes Schindelin
2019-06-25 19: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
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=nycvar.QRO.7.76.6.1905031034400.45@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@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.
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).