git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 11/13] bisect: libify `check_good_are_ancestors_of_bad` and its dependents

From
Miriam Rubio <mirucam@gmail.com>
Date
Feb 8, 2020, 09:07 UTC
Message-ID
<20200208090704.26506-12-mirucam@gmail.com>
In-Reply-To
<20200208090704.26506-1-mirucam@gmail.com>
From: Pranit Bauva <pranit.bauva@gmail.com>

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.

Code that turns BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11)
 to BISECT_OK (0) from `check_good_are_ancestors_of_bad()` has been moved to
`cmd_bisect__helper()`.
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>
---
 bisect.c                 | 41 ++++++++++++++++++++++++++--------------
 builtin/bisect--helper.c | 11 ++++++++++-
 2 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/bisect.c b/bisect.c
index 382e0b471f..f5ce3a4b70 100644
--- a/bisect.c
+++ b/bisect.c
@@ -872,20 +872,23 @@ static int check_ancestors(struct repository *r, int rev_nr,
  *
  * If that's not the case, we need to check the merge bases.
  * If a merge base must be tested by the user, its source code will be
- * checked out to be tested by the user and we will exit.
+ * checked out to be tested by the user and we will return.
  */
-static void check_good_are_ancestors_of_bad(struct repository *r,
+
+static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
 					    const char *prefix,
 					    int no_checkout)
 {
-	char *filename = git_pathdup("BISECT_ANCESTORS_OK");
+	char *filename;
 	struct stat st;
 	int fd, rev_nr;
 	enum bisect_error res = BISECT_OK;
 	struct commit **rev;
 
 	if (!current_bad_oid)
-		die(_("a %s revision is needed"), term_bad);
+		return error(_("a %s revision is needed"), term_bad);
+
+	filename = git_pathdup("BISECT_ANCESTORS_OK");
 
 	/* Check if file BISECT_ANCESTORS_OK exists. */
 	if (!stat(filename, &st) && S_ISREG(st.st_mode))
@@ -901,18 +904,26 @@ static void check_good_are_ancestors_of_bad(struct repository *r,
 	if (check_ancestors(r, rev_nr, rev, prefix))
 		res = check_merge_bases(rev_nr, rev, no_checkout);
 	free(rev);
-	if (res)
-		exit(res == BISECT_INTERNAL_SUCCESS_MERGE_BASE ? BISECT_OK : -res);
 
-	/* Create file BISECT_ANCESTORS_OK. */
-	fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-	if (fd < 0)
-		warning_errno(_("could not create file '%s'"),
-			      filename);
-	else
-		close(fd);
+	if (!res) {
+		/* Create file BISECT_ANCESTORS_OK. */
+		fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+		if (fd < 0)
+			/*
+			 * BISECT_ANCESTORS_OK file is not absolutely necessary,
+			 * the bisection process will continue at the next
+			 * bisection step.
+			 * So, just signal with a warning that something
+			 * might be wrong.
+			 */
+			warning_errno(_("could not create file '%s'"),
+				filename);
+		else
+			close(fd);
+	}
  done:
 	free(filename);
+	return res;
 }
 
 /*
@@ -984,7 +995,9 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int
 	if (read_bisect_refs())
 		die(_("reading bisect refs failed"));
 
-	check_good_are_ancestors_of_bad(r, prefix, no_checkout);
+	res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
+	if (res)
+		return res;
 
 	bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);
 	revs.limited = 1;
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index e6bd4d6645..c1c40b516d 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -666,7 +666,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 
 	switch (cmdmode) {
 	case NEXT_ALL:
-		return bisect_next_all(the_repository, prefix, no_checkout);
+		res = bisect_next_all(the_repository, prefix, no_checkout);
+		break;
 	case WRITE_TERMS:
 		if (argc != 2)
 			return error(_("--write-terms requires two arguments"));
@@ -713,5 +714,13 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		return error("BUG: unknown subcommand '%d'", cmdmode);
 	}
 	free_terms(&terms);
+
+	/*
+	 * Handle early success
+	 * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
+	 */
+	if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE)
+		res = BISECT_OK;
+
 	return abs(res);
 }

-- 
2.25.0
Previous: Miriam RubioNext: Miriam Rubio
Message 16 of 18 in “Finish converting git bisect to C part 1”
  1. Miriam RubioFeb 8, 2020
  2. 01/13 bisect--helper: convert `vocab_*` char pointers to char arraysMiriam Rubio, Feb 8, 2020
  3. 02/13 bisect--helper: change `retval` to `res`Miriam Rubio, Feb 8, 2020
  4. 03/13 bisect: use the standard 'if (!var)' way to check for 0Miriam Rubio, Feb 8, 2020
  5. 04/13 run-command: make `exists_in_PATH()` non-staticMiriam Rubio, Feb 8, 2020
  6. René ScharfeFeb 8, 2020
  7. Miriam R.Feb 9, 2020
  8. Taylor BlauFeb 9, 2020
  9. 06/13 bisect: add enum to represent bisect returning codesMiriam Rubio, Feb 8, 2020
  10. 05/13 bisect--helper: introduce new `decide_next()` functionMiriam Rubio, Feb 8, 2020
  11. 07/13 bisect--helper: return error codes from `cmd_bisect__helper()`Miriam Rubio, Feb 8, 2020
  12. 08/13 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependentsMiriam Rubio, Feb 8, 2020
  13. 09/13 bisect: libify `bisect_checkout`Miriam Rubio, Feb 8, 2020
  14. 10/13 bisect: libify `check_merge_bases` and its dependentsMiriam Rubio, Feb 8, 2020
  15. 12/13 bisect: libify `handle_bad_merge_base` and its dependentsMiriam Rubio, Feb 8, 2020
  16. 11/13 bisect: libify `check_good_are_ancestors_of_bad` and its dependentsMiriam Rubio, Feb 8, 2020
  17. 13/13 bisect: libify `bisect_next_all`Miriam Rubio, Feb 8, 2020
  18. Miriam R.Feb 10, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.