sideband: clear full line when printing remote messages

demultiplex_sideband() can write its remote output over active local
progress lines.  That's why it has been using ANSI code Erase in Line on
smart terminals to clear the remainder of lines it writes since
ebe8fa738d (fix display overlap between remote and local progress,
2007-11-04).

This erases the last character of remote lines that span the full width
of the terminal, though, as the cursor is stuck at the rightmost column
for them.  It's the same effect as in the following command, which
clears the 1 and shows just the leading zeros:

   $ EL="\033[K"
   $ printf "%0${COLUMNS}d${EL}\n" 1

If we move the ANSI code to the start we get to see the 1 as well:

   $ printf "${EL}%0${COLUMNS}d\n" 1

So do the same in demultiplex_sideband() and emit the ANSI code as a
prefix instead of a suffix to show messages in full even if they happen
to fill the whole width of a smart terminal.

Reported-by: Hugo Osvaldo Barrera <hugo@whynothugo.nl>
Suggested-by: Chris Torek <chris.torek@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sideband.c b/sideband.c
index ea7c25211ef7e1c8a80cb60475ee43457c8c13f1..48ed4c80997d685a71786c97060613291bd2be84 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -120,7 +120,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n)
 
 #define DISPLAY_PREFIX "remote: "
 
-#define ANSI_SUFFIX "\033[K"
+#define ANSI_PREFIX "\033[K"
 #define DUMB_SUFFIX "        "
 
 int demultiplex_sideband(const char *me, int status,
@@ -129,15 +129,18 @@ int demultiplex_sideband(const char *me, int status,
                         struct strbuf *scratch,
                         enum sideband_type *sideband_type)
 {
-       static const char *suffix;
+       static const char *prefix, *suffix;
        const char *b, *brk;
        int band;
 
        if (!suffix) {
-               if (isatty(2) && !is_terminal_dumb())
-                       suffix = ANSI_SUFFIX;
-               else
+               if (isatty(2) && !is_terminal_dumb()) {
+                       prefix = ANSI_PREFIX DISPLAY_PREFIX;
+                       suffix = "";
+               } else {
+                       prefix = DISPLAY_PREFIX;
                        suffix = DUMB_SUFFIX;
+               }
        }
 
        if (status == PACKET_READ_EOF) {
@@ -171,8 +174,7 @@ int demultiplex_sideband(const char *me, int status,
        case 3:
                if (die_on_error)
                        die(_("remote error: %s"), buf + 1);
-               strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "",
-                           DISPLAY_PREFIX);
+               strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "", prefix);
                maybe_colorize_sideband(scratch, buf + 1, len);
 
                *sideband_type = SIDEBAND_REMOTE_ERROR;
@@ -203,7 +205,7 @@ int demultiplex_sideband(const char *me, int status,
                                strbuf_addstr(scratch, suffix);
 
                        if (!scratch->len)
-                               strbuf_addstr(scratch, DISPLAY_PREFIX);
+                               strbuf_addstr(scratch, prefix);
 
                        /*
                         * A use case that we should not add clear-to-eol suffix
@@ -229,8 +231,8 @@ int demultiplex_sideband(const char *me, int status,
                }
 
                if (*b) {
-                       strbuf_addstr(scratch, scratch->len ?
-                                   "" : DISPLAY_PREFIX);
+                       if (!scratch->len)
+                               strbuf_addstr(scratch, prefix);
                        maybe_colorize_sideband(scratch, b, strlen(b));
                }
                return 0;