microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'mh/diff-stat-color' 

* mh/diff-stat-color:
  diff: do not color --stat output like patch context
This commit is contained in:
Junio C Hamano 2009-05-18 08:59:54 -07:00
Родитель 96825a8054 a408e0e649
Коммит c16cea7345
1 изменённых файлов: 7 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
diff.c
Просмотреть файл

@ -839,10 +839,9 @@ static int scale_linear(int it, int width, int max_change)
} }
static void show_name(FILE *file, static void show_name(FILE *file,
const char *prefix, const char *name, int len, const char *prefix, const char *name, int len)
const char *reset, const char *set)
{ {
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) 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) { 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, " Bin ");
fprintf(options->file, "%s%d%s", del_c, deleted, reset); fprintf(options->file, "%s%d%s", del_c, deleted, reset);
fprintf(options->file, " -> "); fprintf(options->file, " -> ");
@ -966,7 +965,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
continue; continue;
} }
else if (data->files[i]->is_unmerged) { 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"); fprintf(options->file, " Unmerged\n");
continue; continue;
} }
@ -988,7 +987,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
add = scale_linear(add, width, max_change); add = scale_linear(add, width, max_change);
del = scale_linear(del, 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, fprintf(options->file, "%5d%s", added + deleted,
added + deleted ? " " : ""); added + deleted ? " " : "");
show_graph(options->file, '+', add, add_c, reset); show_graph(options->file, '+', add, add_c, reset);
@ -996,8 +995,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
fprintf(options->file, "\n"); fprintf(options->file, "\n");
} }
fprintf(options->file, fprintf(options->file,
"%s %d files changed, %d insertions(+), %d deletions(-)%s\n", " %d files changed, %d insertions(+), %d deletions(-)\n",
set, total_files, adds, dels, reset); total_files, adds, dels);
} }
static void show_shortstats(struct diffstat_t* data, struct diff_options *options) static void show_shortstats(struct diffstat_t* data, struct diff_options *options)