@matheusbsbs / matheus-bagliano / commits / 3928097020

Fork 0

diff: Help "less" hide ^M from the output

When the tracked contents have CRLF line endings, colored diff output shows "^M" at the end of output lines, which is distracting, even though the pager we use by default ("less") knows to hide them. The problem is that "less" hides a carriage-return only at the end of the line, immediately before a line feed. The colored diff output does not take this into account, and emits four element sequence for each line: - force this color; - the line up to but not including the terminating line feed; - reset color - line feed. By including the carriage return at the end of the line in the second item, we are breaking the smart our pager has in order not to show "^M". This can be fixed by changing the sequence to: - force this color; - the line up to but not including the terminating end-of-line; - reset color - end-of-line. where end-of-line is either a single linefeed or a CRLF pair. When the output is not colored, "force this color" and "reset color" sequences are both empty, so we won't have this problem with or without this patch. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Aug 27, 2008 at 19:48 UTC 392809702016cde59d50a7b07e8c27f6d0ec3c3f

3 files changed +34 -3

combine-diff.c

+14 -2

@@ -500,6 +500,18 @@ static int hunk_comment_line(const char *bol)

500 return (isalpha(ch) || ch == '_' || ch == '$');

501 }

502

503 +static void show_line_to_eol(const char *line, int len, const char *reset)

504 +{

505 + int saw_cr_at_eol = 0;

506 + if (len < 0)

507 + len = strlen(line);

508 + saw_cr_at_eol = (len && line[len-1] == '\r');

509 +

510 + printf("%.*s%s%s\n", len - saw_cr_at_eol, line,

511 + reset,

512 + saw_cr_at_eol ? "\r" : "");

513 +}

514 +

515 static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,

516 int use_color)

517 {

@@ -593,7 +605,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,

605 else

606 putchar(' ');

607 }

596 - printf("%s%s\n", ll->line, c_reset);

608 + show_line_to_eol(ll->line, -1, c_reset);

609 ll = ll->next;

610 }

611 if (cnt < lno)

@@ -617,7 +629,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,

629 putchar(' ');

630 p_mask <<= 1;

631 }

620 - printf("%.*s%s\n", sl->len, sl->bol, c_reset);

632 + show_line_to_eol(sl->bol, sl->len, c_reset);

633 }

634 }

635 }

diff.c

+8 -1

@@ -511,13 +511,20 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix)

511

512 static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)

513 {

514 - int has_trailing_newline = (len > 0 && line[len-1] == '\n');

514 + int has_trailing_newline, has_trailing_carriage_return;

515 +

516 + has_trailing_newline = (len > 0 && line[len-1] == '\n');

517 if (has_trailing_newline)

518 len--;

519 + has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');

520 + if (has_trailing_carriage_return)

521 + len--;

522

523 fputs(set, file);

524 fwrite(line, len, 1, file);

525 fputs(reset, file);

526 + if (has_trailing_carriage_return)

527 + fputc('\r', file);

528 if (has_trailing_newline)

529 fputc('\n', file);

530 }

t/t4019-diff-wserror.sh

+12

@@ -178,4 +178,16 @@ test_expect_success 'trailing empty lines (2)' '

178

179 '

180

181 +test_expect_success 'do not color trailing cr in context' '

182 + git config --unset core.whitespace

183 + rm -f .gitattributes &&

184 + echo AAAQ | tr Q "\015" >G &&

185 + git add G &&

186 + echo BBBQ | tr Q "\015" >>G

187 + git diff --color G | tr "\015" Q >output &&

188 + grep "BBB.*${blue_grep}Q" output &&

189 + grep "AAA.*\[mQ" output

190 +

191 +'

192 +

193 test_done