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

Re: [PATCH v8 40/41] builtin/am: use apply api in run_apply()

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 26, 2016, 19:48 UTC
Message-ID
<xmqq1t2g18pz.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20160627182429.31550-41-chriscool@tuxfamily.org>
Christian Couder <christian.couder@gmail.com> writes:
Show 38 quoted lines
>  static int run_apply(const struct am_state *state, const char *index_file)
>  {
> -	struct child_process cp = CHILD_PROCESS_INIT;
> +	struct argv_array apply_paths = ARGV_ARRAY_INIT;
> +	struct argv_array apply_opts = ARGV_ARRAY_INIT;
> +	struct apply_state apply_state;
> +	int res, opts_left;
> +	char *save_index_file;
> +	static struct lock_file lock_file;
> +
> +	struct option am_apply_options[] = {
> +		{ OPTION_CALLBACK, 0, "whitespace", &apply_state, N_("action"),
> +			N_("detect new or modified lines that have whitespace errors"),
> +			0, apply_option_parse_whitespace },
> +		{ OPTION_CALLBACK, 0, "ignore-space-change", &apply_state, NULL,
> +			N_("ignore changes in whitespace when finding context"),
> +			PARSE_OPT_NOARG, apply_option_parse_space_change },
> +		{ OPTION_CALLBACK, 0, "ignore-whitespace", &apply_state, NULL,
> +			N_("ignore changes in whitespace when finding context"),
> +			PARSE_OPT_NOARG, apply_option_parse_space_change },
> +		{ OPTION_CALLBACK, 0, "directory", &apply_state, N_("root"),
> +			N_("prepend <root> to all filenames"),
> +			0, apply_option_parse_directory },
> +		{ OPTION_CALLBACK, 0, "exclude", &apply_state, N_("path"),
> +			N_("don't apply changes matching the given path"),
> +			0, apply_option_parse_exclude },
> +		{ OPTION_CALLBACK, 0, "include", &apply_state, N_("path"),
> +			N_("apply changes matching the given path"),
> +			0, apply_option_parse_include },
> +		OPT_INTEGER('C', NULL, &apply_state.p_context,
> +				N_("ensure at least <n> lines of context match")),
> +		{ OPTION_CALLBACK, 'p', NULL, &apply_state, N_("num"),
> +			N_("remove <num> leading slashes from traditional diff paths"),
> +			0, apply_option_parse_p },
> +		OPT_BOOL(0, "reject", &apply_state.apply_with_reject,
> +			N_("leave the rejected hunks in corresponding *.rej files")),
> +		OPT_END()
> +	};
Is this an indication that this step came too prematurely?

Can we avoid having to maintain semi-duplicated options array if cmd_apply() is properly refactored before this step? The resulting code is unmaintainable as long as we have this duplication.

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