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

[PATCH v7 02/40] builtin/apply: make apply_patch() return -1 instead of die()ing

From
Christian Couder <christian.couder@gmail.com>
Date
Jun 13, 2016, 16:09 UTC
Message-ID
<20160613160942.1806-3-chriscool@tuxfamily.org>
In-Reply-To
<20160613160942.1806-1-chriscool@tuxfamily.org>

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing.

As a first step in this direction, let's make apply_patch() return -1 in case of errors instead of dying. For now its only caller apply_all_patches() will exit(1) when apply_patch() return -1.

In a later patch, apply_all_patches() will return -1 too instead of exiting.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/apply.c | 54 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 3a0c53a..598e479 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4404,6 +4404,14 @@ static struct lock_file lock_file;
 #define INACCURATE_EOF	(1<<0)
 #define RECOUNT		(1<<1)
 
+/*
+ * Try to apply a patch.
+ *
+ * Returns:
+ *  -1 if an error happened
+ *   0 if the patch applied
+ *   1 if the patch did not apply
+ */
 static int apply_patch(struct apply_state *state,
 		       int fd,
 		       const char *filename,
@@ -4413,6 +4421,7 @@ static int apply_patch(struct apply_state *state,
 	struct strbuf buf = STRBUF_INIT; /* owns the patch text */
 	struct patch *list = NULL, **listp = &list;
 	int skipped_patch = 0;
+	int res = 0;
 
 	state->patch_input_file = filename;
 	read_patch_file(&buf, fd);
@@ -4445,8 +4454,10 @@ static int apply_patch(struct apply_state *state,
 		offset += nr;
 	}
 
-	if (!list && !skipped_patch)
-		die(_("unrecognized input"));
+	if (!list && !skipped_patch) {
+		res = error(_("unrecognized input"));
+		goto end;
+	}
 
 	if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))
 		state->apply = 0;
@@ -4455,21 +4466,22 @@ static int apply_patch(struct apply_state *state,
 	if (state->update_index && state->newfd < 0)
 		state->newfd = hold_locked_index(state->lock_file, 1);
 
-	if (state->check_index) {
-		if (read_cache() < 0)
-			die(_("unable to read index file"));
+	if (state->check_index && read_cache() < 0) {
+		res = error(_("unable to read index file"));
+		goto end;
 	}
 
 	if ((state->check || state->apply) &&
 	    check_patch_list(state, list) < 0 &&
-	    !state->apply_with_reject)
-		exit(1);
+	    !state->apply_with_reject) {
+		res = -1;
+		goto end;
+	}
 
 	if (state->apply && write_out_results(state, list)) {
-		if (state->apply_with_reject)
-			exit(1);
 		/* with --3way, we still need to write the index out */
-		return 1;
+		res = state->apply_with_reject ? -1 : 1;
+		goto end;
 	}
 
 	if (state->fake_ancestor)
@@ -4484,10 +4496,11 @@ static int apply_patch(struct apply_state *state,
 	if (state->summary)
 		summary_patch_list(list);
 
+end:
 	free_patch_list(list);
 	strbuf_release(&buf);
 	string_list_clear(&state->fn_table, 0);
-	return 0;
+	return res;
 }
 
 static void git_apply_config(void)
@@ -4625,6 +4638,7 @@ static int apply_all_patches(struct apply_state *state,
 			     int options)
 {
 	int i;
+	int res;
 	int errs = 0;
 	int read_stdin = 1;
 
@@ -4633,7 +4647,10 @@ static int apply_all_patches(struct apply_state *state,
 		int fd;
 
 		if (!strcmp(arg, "-")) {
-			errs |= apply_patch(state, 0, "<stdin>", options);
+			res = apply_patch(state, 0, "<stdin>", options);
+			if (res < 0)
+				exit(1);
+			errs |= res;
 			read_stdin = 0;
 			continue;
 		} else if (0 < state->prefix_length)
@@ -4646,12 +4663,19 @@ static int apply_all_patches(struct apply_state *state,
 			die_errno(_("can't open patch '%s'"), arg);
 		read_stdin = 0;
 		set_default_whitespace_mode(state);
-		errs |= apply_patch(state, fd, arg, options);
+		res = apply_patch(state, fd, arg, options);
+		if (res < 0)
+			exit(1);
+		errs |= res;
 		close(fd);
 	}
 	set_default_whitespace_mode(state);
-	if (read_stdin)
-		errs |= apply_patch(state, 0, "<stdin>", options);
+	if (read_stdin) {
+		res = apply_patch(state, 0, "<stdin>", options);
+		if (res < 0)
+			exit(1);
+		errs |= res;
+	}
 
 	if (state->whitespace_error) {
 		if (state->squelch_whitespace_errors &&

-- 
2.9.0.rc2.411.g3e2ca28
Previous: Christian CouderNext: Junio C Hamano
Message 42 of 46 in “libify apply and use lib in am, part 2”
  1. 00/40 libify apply and use lib in am, part 2Christian Couder, Jun 13, 2016
  2. 05/40 builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder, Jun 13, 2016
  3. 01/40 apply: move 'struct apply_state' to apply.hChristian Couder, Jun 13, 2016
  4. Junio C HamanoJun 13, 2016
  5. Christian CouderJun 14, 2016
  6. 07/40 builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder, Jun 13, 2016
  7. 09/40 builtin/apply: move init_apply_state() to apply.cChristian Couder, Jun 13, 2016
  8. 13/40 builtin/apply: make apply_all_patches() return -1 on errorChristian Couder, Jun 13, 2016
  9. 20/40 builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder, Jun 13, 2016
  10. 17/40 builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder, Jun 13, 2016
  11. 18/40 builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder, Jun 13, 2016
  12. 23/40 builtin/apply: make write_out_one_result() return -1 on errorChristian Couder, Jun 13, 2016
  13. 26/40 builtin/apply: make create_one_file() return -1 on errorChristian Couder, Jun 13, 2016
  14. 27/40 builtin/apply: rename option parsing functionsChristian Couder, Jun 13, 2016
  15. 28/40 apply: rename and move opt constants to apply.hChristian Couder, Jun 13, 2016
  16. 31/40 environment: add set_index_file()Christian Couder, Jun 13, 2016
  17. 32/40 write_or_die: use warning() instead of fprintf(stderr, ...)Christian Couder, Jun 13, 2016
  18. 22/40 builtin/apply: make create_file() return -1 on errorChristian Couder, Jun 13, 2016
  19. 24/40 builtin/apply: make write_out_results() return -1 on errorChristian Couder, Jun 13, 2016
  20. 34/40 apply: make 'be_silent' incompatible with 'apply_verbosely'Christian Couder, Jun 13, 2016
  21. 40/40 apply: use error_errno() where possibleChristian Couder, Jun 13, 2016
  22. 33/40 apply: add 'be_silent' variable to 'struct apply_state'Christian Couder, Jun 13, 2016
  23. 39/40 builtin/am: use apply api in run_apply()Christian Couder, Jun 13, 2016
  24. 35/40 apply: don't print on stdout when be_silent is setChristian Couder, Jun 13, 2016
  25. 38/40 apply: change error_routine when be_silent is setChristian Couder, Jun 13, 2016
  26. 25/40 builtin/apply: make try_create_file() return -1 on errorChristian Couder, Jun 13, 2016
  27. 36/40 usage: add set_warn_routine()Christian Couder, Jun 13, 2016
  28. 37/40 usage: add get_error_routine() and get_warn_routine()Christian Couder, Jun 13, 2016
  29. 21/40 builtin/apply: make add_index_file() return -1 on errorChristian Couder, Jun 13, 2016
  30. 30/40 apply: make some parsing functions static againChristian Couder, Jun 13, 2016
  31. 08/40 builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ingChristian Couder, Jun 13, 2016
  32. 11/40 builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder, Jun 13, 2016
  33. 16/40 builtin/apply: make gitdiff_*() return -1 on errorChristian Couder, Jun 13, 2016
  34. 15/40 builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder, Jun 13, 2016
  35. 03/40 builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder, Jun 13, 2016
  36. 10/40 apply: make init_apply_state() return -1 instead of exit()ingChristian Couder, Jun 13, 2016
  37. 14/40 builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder, Jun 13, 2016
  38. 19/40 builtin/apply: make remove_file() return -1 on errorChristian Couder, Jun 13, 2016
  39. 12/40 builtin/apply: move check_apply_state() to apply.cChristian Couder, Jun 13, 2016
  40. 06/40 builtin/apply: make parse_single_patch() return -1 on errorChristian Couder, Jun 13, 2016
  41. 04/40 builtin/apply: make find_header() return -1 instead of die()ingChristian Couder, Jun 13, 2016
  42. 02/40 builtin/apply: make apply_patch() return -1 instead of die()ingChristian Couder, Jun 13, 2016
  43. Junio C HamanoJun 13, 2016
  44. Christian CouderJun 14, 2016
  45. Junio C HamanoJun 14, 2016
  46. Christian CouderJun 13, 2016

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.