mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

bisect: libify check_merge_bases and its dependents

Browse Source 
Since we want to get rid of git-bisect.sh, it would be necessary to
convert those exit() calls to return statements so that errors can be
reported.

Emulate try catch in C by converting `exit(<positive-value>)` to
`return <negative-value>`. Follow POSIX conventions to return
<negative-value> to indicate error.

In `check_merge_bases()` there is an early success special case,
so we have introduced special error code
BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) which indicates early
success. This BISECT_INTERNAL_SUCCESS_MERGE_BASE is converted back
to BISECT_OK (0) in `check_good_are_ancestors_of_bad()`.

Update all callers to handle the error returns.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pranit Bauva 2020-02-17 09:40:36 +01:00 committed by Junio C Hamano
parent e8e3ce6718
commit cdd4dc2d6a
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bisect.c
View File

@ -811,13 +811,18 @@ static void handle_skipped_merge_base(const struct object_id *mb)
* "check_merge_bases" checks that merge bases are not "bad" (or "new"). * "check_merge_bases" checks that merge bases are not "bad" (or "new").
* *
* - If one is "bad" (or "new"), it means the user assumed something wrong * - If one is "bad" (or "new"), it means the user assumed something wrong
* and we must exit with a non 0 error code. * and we must return error with a non 0 error code.
* - If one is "good" (or "old"), that's good, we have nothing to do. * - If one is "good" (or "old"), that's good, we have nothing to do.
* - If one is "skipped", we can't know but we should warn. * - If one is "skipped", we can't know but we should warn.
* - If we don't know, we should check it out and ask the user to test. * - If we don't know, we should check it out and ask the user to test.
* - If a merge base must be tested, on success return
* BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
* for early success, this will be converted back to 0 in
* check_good_are_ancestors_of_bad().
*/ */
static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
{ {
enum bisect_error res = BISECT_OK;
struct commit_list *result; struct commit_list *result;
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1); result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
@ -832,11 +837,16 @@ static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
handle_skipped_merge_base(mb); handle_skipped_merge_base(mb);
} else { } else {
printf(_("Bisecting: a merge base must be tested\n")); printf(_("Bisecting: a merge base must be tested\n"));
exit(bisect_checkout(mb, no_checkout)); res = bisect_checkout(mb, no_checkout);
if (!res)
/* indicate early success */
res = BISECT_INTERNAL_SUCCESS_MERGE_BASE;
break;
} }
} }
free_commit_list(result); free_commit_list(result);
return res;
} }
static int check_ancestors(struct repository *r, int rev_nr, static int check_ancestors(struct repository *r, int rev_nr,
@ -871,6 +881,7 @@ static void check_good_are_ancestors_of_bad(struct repository *r,
char *filename = git_pathdup("BISECT_ANCESTORS_OK"); char *filename = git_pathdup("BISECT_ANCESTORS_OK");
struct stat st; struct stat st;
int fd, rev_nr; int fd, rev_nr;
enum bisect_error res = BISECT_OK;
struct commit **rev; struct commit **rev;
if (!current_bad_oid) if (!current_bad_oid)
@ -885,10 +896,13 @@ static void check_good_are_ancestors_of_bad(struct repository *r,
goto done; goto done;
/* Check if all good revs are ancestor of the bad rev. */ /* Check if all good revs are ancestor of the bad rev. */
rev = get_bad_and_good_commits(r, &rev_nr); rev = get_bad_and_good_commits(r, &rev_nr);
if (check_ancestors(r, rev_nr, rev, prefix)) if (check_ancestors(r, rev_nr, rev, prefix))
check_merge_bases(rev_nr, rev, no_checkout); res = check_merge_bases(rev_nr, rev, no_checkout);
free(rev); free(rev);
if (res)
exit(res == BISECT_INTERNAL_SUCCESS_MERGE_BASE ? BISECT_OK : -res);
/* Create file BISECT_ANCESTORS_OK. */ /* Create file BISECT_ANCESTORS_OK. */
fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600); fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);

7
bisect.h
View File

@ -39,11 +39,16 @@ struct rev_list_info {
* BISECT_FAILED error code: default error code. * BISECT_FAILED error code: default error code.
* BISECT_ONLY_SKIPPED_LEFT error code: only skipped * BISECT_ONLY_SKIPPED_LEFT error code: only skipped
* commits left to be tested. * commits left to be tested.
* BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
* code: found merge base that should be tested.
* Early success code BISECT_INTERNAL_SUCCESS_MERGE_BASE
* should be only an internal code.
*/ */
enum bisect_error { enum bisect_error {
BISECT_OK = 0, BISECT_OK = 0,
BISECT_FAILED = -1, BISECT_FAILED = -1,
BISECT_ONLY_SKIPPED_LEFT = -2 BISECT_ONLY_SKIPPED_LEFT = -2,
BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
}; };
enum bisect_error bisect_next_all(struct repository *r, enum bisect_error bisect_next_all(struct repository *r,