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

commit-graph: refactor preparing commit graph

Browse Source 
Two functions in the code (1) check if the repository is configured for
commit graphs, (2) call prepare_commit_graph(), and (3) check if the
graph exists. Move (1) and (3) into prepare_commit_graph(), reducing
duplication of code.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan 2018-07-11 15:42:37 -07:00 committed by Junio C Hamano
parent 8295296458
commit 5faf357b43
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
commit-graph.c
View File

@ -200,15 +200,25 @@ static void prepare_commit_graph_one(const char *obj_dir)
} }
static int prepare_commit_graph_run_once = 0; static int prepare_commit_graph_run_once = 0;
static void prepare_commit_graph(void)
/*
* Return 1 if commit_graph is non-NULL, and 0 otherwise.
*
* On the first invocation, this function attemps to load the commit
* graph if the_repository is configured to have one.
*/
static int prepare_commit_graph(void)
{ {
struct alternate_object_database *alt; struct alternate_object_database *alt;
char *obj_dir; char *obj_dir;
if (prepare_commit_graph_run_once) if (prepare_commit_graph_run_once)
return; return !!commit_graph;
prepare_commit_graph_run_once = 1; prepare_commit_graph_run_once = 1;
if (!core_commit_graph)
return 0;
obj_dir = get_object_directory(); obj_dir = get_object_directory();
prepare_commit_graph_one(obj_dir); prepare_commit_graph_one(obj_dir);
prepare_alt_odb(the_repository); prepare_alt_odb(the_repository);
@ -216,6 +226,7 @@ static void prepare_commit_graph(void)
!commit_graph && alt; !commit_graph && alt;
alt = alt->next) alt = alt->next)
prepare_commit_graph_one(alt->path); prepare_commit_graph_one(alt->path);
return !!commit_graph;
} }
static void close_commit_graph(void) static void close_commit_graph(void)
@ -337,22 +348,17 @@ static int parse_commit_in_graph_one(struct commit_graph *g, struct commit *item
int parse_commit_in_graph(struct commit *item) int parse_commit_in_graph(struct commit *item)
{ {
if (!core_commit_graph) if (!prepare_commit_graph())
return 0; return 0;
return parse_commit_in_graph_one(commit_graph, item);
prepare_commit_graph();
if (commit_graph)
return parse_commit_in_graph_one(commit_graph, item);
return 0;
} }
void load_commit_graph_info(struct commit *item) void load_commit_graph_info(struct commit *item)
{ {
uint32_t pos; uint32_t pos;
if (!core_commit_graph) if (!prepare_commit_graph())
return; return;
prepare_commit_graph(); if (find_commit_in_graph(item, commit_graph, &pos))
if (commit_graph && find_commit_in_graph(item, commit_graph, &pos))
fill_commit_graph_info(item, commit_graph, pos); fill_commit_graph_info(item, commit_graph, pos);
} }