undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/diff-stat-scaler' into maint

Browse Source 
* jc/diff-stat-scaler:
  diff --stat: show bars of same length for paths with same amount of changes
This commit is contained in:
Junio C Hamano 2012-02-21 15:00:33 -08:00
commit a67c235448
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
diff.c
View File

@ -1276,13 +1276,15 @@ const char mime_boundary_leader[] = "------------";
static int scale_linear(int it, int width, int max_change) static int scale_linear(int it, int width, int max_change)
{ {
if (!it)
return 0;
/* /*
* make sure that at least one '-' is printed if there were deletions, * make sure that at least one '-' or '+' is printed if
* and likewise for '+'. * there is any change to this path. The easiest way is to
* scale linearly as if the alloted width is one column shorter
* than it is, and then add 1 to the result.
*/ */
if (max_change < 2) return 1 + (it * (width - 1) / max_change);
return it;
return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
} }
static void show_name(FILE *file, static void show_name(FILE *file,
@ -1498,8 +1500,19 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
dels += del; dels += del;
if (width <= max_change) { if (width <= max_change) {
int total = add + del;
total = scale_linear(add + del, width, max_change);
if (total < 2 && add && del)
/* width >= 2 due to the sanity check */
total = 2;
if (add < del) {
add = scale_linear(add, width, max_change); add = scale_linear(add, width, max_change);
del = total - add;
} else {
del = scale_linear(del, width, max_change); del = scale_linear(del, width, max_change);
add = total - del;
}
} }
fprintf(options->file, "%s", line_prefix); fprintf(options->file, "%s", line_prefix);
show_name(options->file, prefix, name, len); show_name(options->file, prefix, name, len);