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

[PATCH v7 12/40] builtin/apply: move check_apply_state() to apply.c

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

To libify `git apply` functionality we must make check_apply_state() usable outside "builtin/apply.c".

Let's do that by moving it into "apply.c".
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 apply.c         | 32 ++++++++++++++++++++++++++++++++
 apply.h         |  1 +
 builtin/apply.c | 32 --------------------------------
 3 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/apply.c b/apply.c
index c5a9ee2..84dae3d 100644
--- a/apply.c
+++ b/apply.c
@@ -90,3 +90,35 @@ void clear_apply_state(struct apply_state *state)
 
 	/* &state->fn_table is cleared at the end of apply_patch() */
 }
+
+int check_apply_state(struct apply_state *state, int force_apply)
+{
+	int is_not_gitdir = !startup_info->have_repository;
+
+	if (state->apply_with_reject && state->threeway)
+		return error("--reject and --3way cannot be used together.");
+	if (state->cached && state->threeway)
+		return error("--cached and --3way cannot be used together.");
+	if (state->threeway) {
+		if (is_not_gitdir)
+			return error(_("--3way outside a repository"));
+		state->check_index = 1;
+	}
+	if (state->apply_with_reject)
+		state->apply = state->apply_verbosely = 1;
+	if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
+		state->apply = 0;
+	if (state->check_index && is_not_gitdir)
+		return error(_("--index outside a repository"));
+	if (state->cached) {
+		if (is_not_gitdir)
+			return error(_("--cached outside a repository"));
+		state->check_index = 1;
+	}
+	if (state->check_index)
+		state->unsafe_paths = 0;
+	if (!state->lock_file)
+		return error("BUG: state->lock_file should not be NULL");
+
+	return 0;
+}
diff --git a/apply.h b/apply.h
index 7d3a03b..1f2277e 100644
--- a/apply.h
+++ b/apply.h
@@ -106,5 +106,6 @@ extern int init_apply_state(struct apply_state *state,
 			    const char *prefix,
 			    struct lock_file *lock_file);
 extern void clear_apply_state(struct apply_state *state);
+extern int check_apply_state(struct apply_state *state, int force_apply);
 
 #endif
diff --git a/builtin/apply.c b/builtin/apply.c
index d60ffce..a27fdd3 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4541,38 +4541,6 @@ static int option_parse_directory(const struct option *opt,
 	return 0;
 }
 
-static int check_apply_state(struct apply_state *state, int force_apply)
-{
-	int is_not_gitdir = !startup_info->have_repository;
-
-	if (state->apply_with_reject && state->threeway)
-		return error("--reject and --3way cannot be used together.");
-	if (state->cached && state->threeway)
-		return error("--cached and --3way cannot be used together.");
-	if (state->threeway) {
-		if (is_not_gitdir)
-			return error(_("--3way outside a repository"));
-		state->check_index = 1;
-	}
-	if (state->apply_with_reject)
-		state->apply = state->apply_verbosely = 1;
-	if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
-		state->apply = 0;
-	if (state->check_index && is_not_gitdir)
-		return error(_("--index outside a repository"));
-	if (state->cached) {
-		if (is_not_gitdir)
-			return error(_("--cached outside a repository"));
-		state->check_index = 1;
-	}
-	if (state->check_index)
-		state->unsafe_paths = 0;
-	if (!state->lock_file)
-		return error("BUG: state->lock_file should not be NULL");
-
-	return 0;
-}
-
 static int apply_all_patches(struct apply_state *state,
 			     int argc,
 			     const char **argv,

-- 
2.9.0.rc2.411.g3e2ca28
Previous: Christian CouderNext: Christian Couder
Message 39 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.