Merge branch 'mh/diff-stat-color'

gitster · gitster · commit c16cea73451f · 2009-05-18T08:59:54.000-07:00
* mh/diff-stat-color:
  diff: do not color --stat output like patch context
diff --git a/diff.c b/diff.c
@@ -839,10 +839,9 @@ static int scale_linear(int it, int width, int max_change)
 }
 
 static void show_name(FILE *file,
-		      const char *prefix, const char *name, int len,
-		      const char *reset, const char *set)
+		      const char *prefix, const char *name, int len)
 {
-	fprintf(file, " %s%s%-*s%s |", set, prefix, len, name, reset);
+	fprintf(file, " %s%-*s |", prefix, len, name);
 }
 
 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
@@ -956,7 +955,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 		}
 
 		if (data->files[i]->is_binary) {
-			show_name(options->file, prefix, name, len, reset, set);
+			show_name(options->file, prefix, name, len);
 			fprintf(options->file, "  Bin ");
 			fprintf(options->file, "%s%d%s", del_c, deleted, reset);
 			fprintf(options->file, " -> ");
@@ -966,7 +965,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 			continue;
 		}
 		else if (data->files[i]->is_unmerged) {
-			show_name(options->file, prefix, name, len, reset, set);
+			show_name(options->file, prefix, name, len);
 			fprintf(options->file, "  Unmerged\n");
 			continue;
 		}
@@ -988,16 +987,16 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 			add = scale_linear(add, width, max_change);
 			del = scale_linear(del, width, max_change);
 		}
-		show_name(options->file, prefix, name, len, reset, set);
+		show_name(options->file, prefix, name, len);
 		fprintf(options->file, "%5d%s", added + deleted,
 				added + deleted ? " " : "");
 		show_graph(options->file, '+', add, add_c, reset);
 		show_graph(options->file, '-', del, del_c, reset);
 		fprintf(options->file, "\n");
 	}
 	fprintf(options->file,
-	       "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
-	       set, total_files, adds, dels, reset);
+	       " %d files changed, %d insertions(+), %d deletions(-)\n",
+	       total_files, adds, dels);
 }
 
 static void show_shortstats(struct diffstat_t* data, struct diff_options *options)

Original file line number	Diff line number	Diff line change
`@@ -839,10 +839,9 @@ static int scale_linear(int it, int width, int max_change)`
`839`	`839`	`}`
`840`	`840`
`841`	`841`	`static void show_name(FILE *file,`
`842`		`- const char prefix, const char name, int len,`
`843`		`- const char reset, const char set)`
	`842`	`+ const char prefix, const char name, int len)`
`844`	`843`	`{`
`845`		`- fprintf(file, " %s%s%-*s%s \|", set, prefix, len, name, reset);`
	`844`	`+ fprintf(file, " %s%-*s \|", prefix, len, name);`
`846`	`845`	`}`
`847`	`846`
`848`	`847`	`static void show_graph(FILE file, char ch, int cnt, const char set, const char *reset)`
`@@ -956,7 +955,7 @@ static void show_stats(struct diffstat_t data, struct diff_options options)`
`956`	`955`	`}`
`957`	`956`
`958`	`957`	`if (data->files[i]->is_binary) {`
`959`		`- show_name(options->file, prefix, name, len, reset, set);`
	`958`	`+ show_name(options->file, prefix, name, len);`
`960`	`959`	`fprintf(options->file, " Bin ");`
`961`	`960`	`fprintf(options->file, "%s%d%s", del_c, deleted, reset);`
`962`	`961`	`fprintf(options->file, " -> ");`
`@@ -966,7 +965,7 @@ static void show_stats(struct diffstat_t data, struct diff_options options)`
`966`	`965`	`continue;`
`967`	`966`	`}`
`968`	`967`	`else if (data->files[i]->is_unmerged) {`
`969`		`- show_name(options->file, prefix, name, len, reset, set);`
	`968`	`+ show_name(options->file, prefix, name, len);`
`970`	`969`	`fprintf(options->file, " Unmerged\n");`
`971`	`970`	`continue;`
`972`	`971`	`}`
`@@ -988,16 +987,16 @@ static void show_stats(struct diffstat_t data, struct diff_options options)`
`988`	`987`	`add = scale_linear(add, width, max_change);`
`989`	`988`	`del = scale_linear(del, width, max_change);`
`990`	`989`	`}`
`991`		`- show_name(options->file, prefix, name, len, reset, set);`
	`990`	`+ show_name(options->file, prefix, name, len);`
`992`	`991`	`fprintf(options->file, "%5d%s", added + deleted,`
`993`	`992`	`added + deleted ? " " : "");`
`994`	`993`	`show_graph(options->file, '+', add, add_c, reset);`
`995`	`994`	`show_graph(options->file, '-', del, del_c, reset);`
`996`	`995`	`fprintf(options->file, "\n");`
`997`	`996`	`}`
`998`	`997`	`fprintf(options->file,`
`999`		`- "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",`
`1000`		`- set, total_files, adds, dels, reset);`
	`998`	`+ " %d files changed, %d insertions(+), %d deletions(-)\n",`
	`999`	`+ total_files, adds, dels);`
`1001`	`1000`	`}`
`1002`	`1001`
`1003`	`1002`	`static void show_shortstats(struct diffstat_t* data, struct diff_options *options)`