mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: refactor common tail part of dirstat computation

Browse Source 
This will become useful when we plug leaks in these two functions.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2023-05-05 14:19:16 -07:00
parent ec58344906
commit 34a94897e0
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
diff.c
View File

@ -2971,6 +2971,19 @@ static int dirstat_compare(const void *_a, const void *_b)
return strcmp(a->name, b->name); return strcmp(a->name, b->name);
} }
static void conclude_dirstat(struct diff_options *options,
struct dirstat_dir *dir,
unsigned long changed)
{
/* This can happen even with many files, if everything was renames */
if (!changed)
return;
/* Show all directories with more than x% of the changes */
QSORT(dir->files, dir->nr, dirstat_compare);
gather_dirstat(options, dir, changed, "", 0);
}
static void show_dirstat(struct diff_options *options) static void show_dirstat(struct diff_options *options)
{ {
int i; int i;
@ -3060,13 +3073,7 @@ found_damage:
dir.nr++; dir.nr++;
} }
/* This can happen even with many files, if everything was renames */ conclude_dirstat(options, &dir, changed);
if (!changed)
return;
/* Show all directories with more than x% of the changes */
QSORT(dir.files, dir.nr, dirstat_compare);
gather_dirstat(options, &dir, changed, "", 0);
} }
static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options) static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
@ -3104,13 +3111,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
dir.nr++; dir.nr++;
} }
/* This can happen even with many files, if everything was renames */ conclude_dirstat(options, &dir, changed);
if (!changed)
return;
/* Show all directories with more than x% of the changes */
QSORT(dir.files, dir.nr, dirstat_compare);
gather_dirstat(options, &dir, changed, "", 0);
} }
static void free_diffstat_file(struct diffstat_file *f) static void free_diffstat_file(struct diffstat_file *f)