Skip to content

Commit

Permalink
diff: do not color --stat output like patch context
Browse files Browse the repository at this point in the history
The diffstat used the color.diff.plain slot (context text) for coloring
filenames and the whole summary line. This didn't look nice and the
affected text isn't patch context at all.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Markus Heidelberg authored and Junio C Hamano committed Apr 26, 2009
1 parent be66a6c commit a408e0e
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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, " -> ");
Expand All @@ -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;
}
Expand All @@ -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)
Expand Down

0 comments on commit a408e0e

Please sign in to comment.