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

commit-reach: prepare in_merge_bases[_many] to handle any repo

Browse Source 
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2018-11-13 16:12:56 -08:00
committed by Junio C Hamano
parent 21a9651ba3
commit 4d5430f747
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
commit-reach.c
View File

@ -312,16 +312,17 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
/* /*
* Is "commit" an ancestor of one of the "references"? * Is "commit" an ancestor of one of the "references"?
*/ */
int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference) int repo_in_merge_bases_many(struct repository *r, struct commit *commit,
int nr_reference, struct commit **reference)
{ {
struct commit_list *bases; struct commit_list *bases;
int ret = 0, i; int ret = 0, i;
uint32_t min_generation = GENERATION_NUMBER_INFINITY; uint32_t min_generation = GENERATION_NUMBER_INFINITY;
if (parse_commit(commit)) if (repo_parse_commit(r, commit))
return ret; return ret;
for (i = 0; i < nr_reference; i++) { for (i = 0; i < nr_reference; i++) {
if (parse_commit(reference[i])) if (repo_parse_commit(r, reference[i]))
return ret; return ret;
if (reference[i]->generation < min_generation) if (reference[i]->generation < min_generation)
min_generation = reference[i]->generation; min_generation = reference[i]->generation;
@ -330,7 +331,7 @@ int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit *
if (commit->generation > min_generation) if (commit->generation > min_generation)
return ret; return ret;
bases = paint_down_to_common(the_repository, commit, bases = paint_down_to_common(r, commit,
nr_reference, reference, nr_reference, reference,
commit->generation); commit->generation);
if (commit->object.flags & PARENT2) if (commit->object.flags & PARENT2)
@ -344,9 +345,11 @@ int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit *
/* /*
* Is "commit" an ancestor of (i.e. reachable from) the "reference"? * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
*/ */
int in_merge_bases(struct commit *commit, struct commit *reference) int repo_in_merge_bases(struct repository *r,
struct commit *commit,
struct commit *reference)
{ {
return in_merge_bases_many(commit, 1, &reference); return repo_in_merge_bases_many(r, commit, 1, &reference);
} }
struct commit_list *reduce_heads(struct commit_list *heads) struct commit_list *reduce_heads(struct commit_list *heads)

12
commit-reach.h
View File

@ -27,8 +27,16 @@ struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
struct commit_list *get_octopus_merge_bases(struct commit_list *in); struct commit_list *get_octopus_merge_bases(struct commit_list *in);
int is_descendant_of(struct commit *commit, struct commit_list *with_commit); int is_descendant_of(struct commit *commit, struct commit_list *with_commit);
int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference); int repo_in_merge_bases(struct repository *r,
int in_merge_bases(struct commit *commit, struct commit *reference); struct commit *commit,
struct commit *reference);
int repo_in_merge_bases_many(struct repository *r,
struct commit *commit,
int nr_reference, struct commit **reference);
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
#define in_merge_bases(c1, c2) repo_in_merge_bases(the_repository, c1, c2)
#define in_merge_bases_many(c1, n, cs) repo_in_merge_bases_many(the_repository, c1, n, cs)
#endif
/* /*
* Takes a list of commits and returns a new list where those * Takes a list of commits and returns a new list where those

17
contrib/coccinelle/the_repository.pending.cocci
View File

@ -90,3 +90,20 @@ expression G;
- get_merge_bases_many_dirty( - get_merge_bases_many_dirty(
+ repo_get_merge_bases_many_dirty(the_repository, + repo_get_merge_bases_many_dirty(the_repository,
E, F, G); E, F, G);
@@
expression E;
expression F;
@@
- in_merge_bases(
+ repo_in_merge_bases(the_repository,
E, F);
@@
expression E;
expression F;
expression G;
@@
- in_merge_bases_many(
+ repo_in_merge_bases_many(the_repository,
E, F, G);