Merge branch 'jc/hide-cr-in-diff-from-less'

gitster · gitster · commit fdfb4cfadcfd · 2008-09-07T23:45:40.000-07:00
* jc/hide-cr-in-diff-from-less:
  diff: Help "less" hide ^M from the output
diff --git a/combine-diff.c b/combine-diff.c
@@ -496,6 +496,18 @@ static int hunk_comment_line(const char *bol)
 	return (isalpha(ch) || ch == '_' || ch == '$');
 }
 
+static void show_line_to_eol(const char *line, int len, const char *reset)
+{
+	int saw_cr_at_eol = 0;
+	if (len < 0)
+		len = strlen(line);
+	saw_cr_at_eol = (len && line[len-1] == '\r');
+
+	printf("%.*s%s%s\n", len - saw_cr_at_eol, line,
+	       reset,
+	       saw_cr_at_eol ? "\r" : "");
+}
+
 static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
 		       int use_color)
 {
@@ -589,7 +601,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
 					else
 						putchar(' ');
 				}
-				printf("%s%s\n", ll->line, c_reset);
+				show_line_to_eol(ll->line, -1, c_reset);
 				ll = ll->next;
 			}
 			if (cnt < lno)
@@ -613,7 +625,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
 					putchar(' ');
 				p_mask <<= 1;
 			}
-			printf("%.*s%s\n", sl->len, sl->bol, c_reset);
+			show_line_to_eol(sl->bol, sl->len, c_reset);
 		}
 	}
 }
diff --git a/diff.c b/diff.c
@@ -513,13 +513,20 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix)
 
 static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
 {
-	int has_trailing_newline = (len > 0 && line[len-1] == '\n');
+	int has_trailing_newline, has_trailing_carriage_return;
+
+	has_trailing_newline = (len > 0 && line[len-1] == '\n');
 	if (has_trailing_newline)
 		len--;
+	has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
+	if (has_trailing_carriage_return)
+		len--;
 
 	fputs(set, file);
 	fwrite(line, len, 1, file);
 	fputs(reset, file);
+	if (has_trailing_carriage_return)
+		fputc('\r', file);
 	if (has_trailing_newline)
 		fputc('\n', file);
 }
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
@@ -178,4 +178,16 @@ test_expect_success 'trailing empty lines (2)' '
 
 '
 
+test_expect_success 'do not color trailing cr in context' '
+	git config --unset core.whitespace
+	rm -f .gitattributes &&
+	echo AAAQ | tr Q "\015" >G &&
+	git add G &&
+	echo BBBQ | tr Q "\015" >>G
+	git diff --color G | tr "\015" Q >output &&
+	grep "BBB.*${blue_grep}Q" output &&
+	grep "AAA.*\[mQ" output
+
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,18 @@ static int hunk_comment_line(const char *bol)`
`496`	`496`	`return (isalpha(ch) \|\| ch == '_' \|\| ch == '$');`
`497`	`497`	`}`
`498`	`498`
	`499`	`+static void show_line_to_eol(const char line, int len, const char reset)`
	`500`	`+{`
	`501`	`+ int saw_cr_at_eol = 0;`
	`502`	`+ if (len < 0)`
	`503`	`+ len = strlen(line);`
	`504`	`+ saw_cr_at_eol = (len && line[len-1] == '\r');`
	`505`	`+`
	`506`	`+ printf("%.*s%s%s\n", len - saw_cr_at_eol, line,`
	`507`	`+ reset,`
	`508`	`+ saw_cr_at_eol ? "\r" : "");`
	`509`	`+}`
	`510`	`+`
`499`	`511`	`static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,`
`500`	`512`	`int use_color)`
`501`	`513`	`{`
`@@ -589,7 +601,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,`
`589`	`601`	`else`
`590`	`602`	`putchar(' ');`
`591`	`603`	`}`
`592`		`- printf("%s%s\n", ll->line, c_reset);`
	`604`	`+ show_line_to_eol(ll->line, -1, c_reset);`
`593`	`605`	`ll = ll->next;`
`594`	`606`	`}`
`595`	`607`	`if (cnt < lno)`
`@@ -613,7 +625,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,`
`613`	`625`	`putchar(' ');`
`614`	`626`	`p_mask <<= 1;`
`615`	`627`	`}`
`616`		`- printf("%.*s%s\n", sl->len, sl->bol, c_reset);`
	`628`	`+ show_line_to_eol(sl->bol, sl->len, c_reset);`
`617`	`629`	`}`
`618`	`630`	`}`
`619`	`631`	`}`