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

combine-diff: move show_log_first logic/action out of paths scanning

Browse Source 
Judging from sample outputs and tests nothing changes in diff -c output,
and this change will help later patches, when we'll be refactoring paths
scanning into its own function with several variants - the
show_log_first logic / code will stay common to all of them.

NOTE: only now we have to take care to explicitly not show anything if
    parents array is empty, as in fact there are some clients in Git code,
    which calls diff_tree_combined() in such a way.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kirill Smelkov
2014-02-03 16:47:19 +04:00
committed by Junio C Hamano
parent fce135c4ff
commit 51af1886c7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
combine-diff.c
View File

@ -1311,6 +1311,20 @@ void diff_tree_combined(const unsigned char *sha1,
struct combine_diff_path *p, *paths = NULL; struct combine_diff_path *p, *paths = NULL;
int i, num_paths, needsep, show_log_first, num_parent = parents->nr; int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
/* nothing to do, if no parents */
if (!num_parent)
return;
show_log_first = !!rev->loginfo && !rev->no_commit_id;
needsep = 0;
if (show_log_first) {
show_log(rev);
if (rev->verbose_header && opt->output_format)
printf("%s%c", diff_line_prefix(opt),
opt->line_termination);
}
diffopts = *opt; diffopts = *opt;
copy_pathspec(&diffopts.pathspec, &opt->pathspec); copy_pathspec(&diffopts.pathspec, &opt->pathspec);
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
@ -1319,8 +1333,6 @@ void diff_tree_combined(const unsigned char *sha1,
/* tell diff_tree to emit paths in sorted (=tree) order */ /* tell diff_tree to emit paths in sorted (=tree) order */
diffopts.orderfile = NULL; diffopts.orderfile = NULL;
show_log_first = !!rev->loginfo && !rev->no_commit_id;
needsep = 0;
/* find set of paths that everybody touches */ /* find set of paths that everybody touches */
for (i = 0; i < num_parent; i++) { for (i = 0; i < num_parent; i++) {
/* show stat against the first parent even /* show stat against the first parent even
@ -1336,14 +1348,6 @@ void diff_tree_combined(const unsigned char *sha1,
diffcore_std(&diffopts); diffcore_std(&diffopts);
paths = intersect_paths(paths, i, num_parent); paths = intersect_paths(paths, i, num_parent);
if (show_log_first && i == 0) {
show_log(rev);
if (rev->verbose_header && opt->output_format)
printf("%s%c", diff_line_prefix(opt),
opt->line_termination);
}
/* if showing diff, show it in requested order */ /* if showing diff, show it in requested order */
if (diffopts.output_format != DIFF_FORMAT_NO_OUTPUT && if (diffopts.output_format != DIFF_FORMAT_NO_OUTPUT &&
opt->orderfile) { opt->orderfile) {