bisect: libify bisect_next_all
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. All the functions calling `bisect_next_all()` are already able to handle return values from it. 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:
committed by
Junio C Hamano
parent
9ec598e0d5
commit
6c69f22233
29
bisect.c
29
bisect.c
@@ -976,10 +976,10 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We use the convention that exiting with an exit code 10 means that
|
* We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
|
||||||
* the bisection process finished successfully.
|
* the bisection process finished successfully.
|
||||||
* In this case the calling shell script should exit 0.
|
* In this case the calling function or command should not turn a
|
||||||
*
|
* BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
|
||||||
* If no_checkout is non-zero, the bisection process does not
|
* If no_checkout is non-zero, the bisection process does not
|
||||||
* checkout the trial commit but instead simply updates BISECT_HEAD.
|
* checkout the trial commit but instead simply updates BISECT_HEAD.
|
||||||
*/
|
*/
|
||||||
@@ -1010,23 +1010,25 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int
|
|||||||
|
|
||||||
if (!revs.commits) {
|
if (!revs.commits) {
|
||||||
/*
|
/*
|
||||||
* We should exit here only if the "bad"
|
* We should return error here only if the "bad"
|
||||||
* commit is also a "skip" commit.
|
* commit is also a "skip" commit.
|
||||||
*/
|
*/
|
||||||
res = error_if_skipped_commits(tried, NULL);
|
res = error_if_skipped_commits(tried, NULL);
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
exit(-res);
|
return res;
|
||||||
printf(_("%s was both %s and %s\n"),
|
printf(_("%s was both %s and %s\n"),
|
||||||
oid_to_hex(current_bad_oid),
|
oid_to_hex(current_bad_oid),
|
||||||
term_good,
|
term_good,
|
||||||
term_bad);
|
term_bad);
|
||||||
exit(1);
|
|
||||||
|
return BISECT_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!all) {
|
if (!all) {
|
||||||
fprintf(stderr, _("No testable commit found.\n"
|
fprintf(stderr, _("No testable commit found.\n"
|
||||||
"Maybe you started with bad path parameters?\n"));
|
"Maybe you started with bad path parameters?\n"));
|
||||||
exit(4);
|
|
||||||
|
return BISECT_NO_TESTABLE_COMMIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
bisect_rev = &revs.commits->item->object.oid;
|
bisect_rev = &revs.commits->item->object.oid;
|
||||||
@@ -1034,12 +1036,19 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int
|
|||||||
if (oideq(bisect_rev, current_bad_oid)) {
|
if (oideq(bisect_rev, current_bad_oid)) {
|
||||||
res = error_if_skipped_commits(tried, current_bad_oid);
|
res = error_if_skipped_commits(tried, current_bad_oid);
|
||||||
if (res)
|
if (res)
|
||||||
exit(-res);
|
return res;
|
||||||
printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
|
printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
|
||||||
term_bad);
|
term_bad);
|
||||||
|
|
||||||
show_diff_tree(r, prefix, revs.commits->item);
|
show_diff_tree(r, prefix, revs.commits->item);
|
||||||
/* This means the bisection process succeeded. */
|
/*
|
||||||
exit(10);
|
* This means the bisection process succeeded.
|
||||||
|
* Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
|
||||||
|
* so that the call chain can simply check
|
||||||
|
* for negative return values for early returns up
|
||||||
|
* until the cmd_bisect__helper() caller.
|
||||||
|
*/
|
||||||
|
return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
nr = all - reaches - 1;
|
nr = all - reaches - 1;
|
||||||
|
|||||||
10
bisect.h
10
bisect.h
@@ -39,16 +39,22 @@ 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_MERGE_BASE_CHECK error code: merge base check failed.
|
||||||
|
* BISECT_NO_TESTABLE_COMMIT error code: no testable commit found.
|
||||||
|
* BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND early success code:
|
||||||
|
* first term_bad commit found.
|
||||||
* BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
|
* BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
|
||||||
* code: found merge base that should be tested.
|
* code: found merge base that should be tested.
|
||||||
* Early success code BISECT_INTERNAL_SUCCESS_MERGE_BASE
|
* Early success codes BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND and
|
||||||
* should be only an internal code.
|
* BISECT_INTERNAL_SUCCESS_MERGE_BASE should be only internal codes.
|
||||||
*/
|
*/
|
||||||
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_MERGE_BASE_CHECK = -3,
|
BISECT_MERGE_BASE_CHECK = -3,
|
||||||
|
BISECT_NO_TESTABLE_COMMIT = -4,
|
||||||
|
BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND = -10,
|
||||||
BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
|
BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user