From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Karsten Blees" <karsten.blees@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Stefan Beller" <sbeller@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v9 40/41] apply: refactor `git apply` option parsing
Date: Sat, 30 Jul 2016 19:25:08 +0200 [thread overview]
Message-ID: <20160730172509.22939-41-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160730172509.22939-1-chriscool@tuxfamily.org>
Parsing `git apply` options can be useful to other commands that
want to call the libified apply functionality, because this way
they can easily pass some options from their own command line to
the libified apply functionality.
This will be used by `git am` in a following patch.
To make this possible, let's refactor the `git apply` option
parsing code into a new libified apply_parse_options() function.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
apply.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
apply.h | 4 +++
builtin/apply.c | 74 +++---------------------------------------------------
3 files changed, 84 insertions(+), 71 deletions(-)
diff --git a/apply.c b/apply.c
index 51985c1..a73889e 100644
--- a/apply.c
+++ b/apply.c
@@ -4890,3 +4890,80 @@ int apply_all_patches(struct apply_state *state,
return res;
return (res == -1 ? 1 : 128);
}
+
+int apply_parse_options(int argc, const char **argv,
+ struct apply_state *state,
+ int *force_apply, int *options,
+ const char * const *apply_usage)
+{
+ struct option builtin_apply_options[] = {
+ { OPTION_CALLBACK, 0, "exclude", state, N_("path"),
+ N_("don't apply changes matching the given path"),
+ 0, apply_option_parse_exclude },
+ { OPTION_CALLBACK, 0, "include", state, N_("path"),
+ N_("apply changes matching the given path"),
+ 0, apply_option_parse_include },
+ { OPTION_CALLBACK, 'p', NULL, state, N_("num"),
+ N_("remove <num> leading slashes from traditional diff paths"),
+ 0, apply_option_parse_p },
+ OPT_BOOL(0, "no-add", &state->no_add,
+ N_("ignore additions made by the patch")),
+ OPT_BOOL(0, "stat", &state->diffstat,
+ N_("instead of applying the patch, output diffstat for the input")),
+ OPT_NOOP_NOARG(0, "allow-binary-replacement"),
+ OPT_NOOP_NOARG(0, "binary"),
+ OPT_BOOL(0, "numstat", &state->numstat,
+ N_("show number of added and deleted lines in decimal notation")),
+ OPT_BOOL(0, "summary", &state->summary,
+ N_("instead of applying the patch, output a summary for the input")),
+ OPT_BOOL(0, "check", &state->check,
+ N_("instead of applying the patch, see if the patch is applicable")),
+ OPT_BOOL(0, "index", &state->check_index,
+ N_("make sure the patch is applicable to the current index")),
+ OPT_BOOL(0, "cached", &state->cached,
+ N_("apply a patch without touching the working tree")),
+ OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,
+ N_("accept a patch that touches outside the working area")),
+ OPT_BOOL(0, "apply", force_apply,
+ N_("also apply the patch (use with --stat/--summary/--check)")),
+ OPT_BOOL('3', "3way", &state->threeway,
+ N_( "attempt three-way merge if a patch does not apply")),
+ OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,
+ N_("build a temporary index based on embedded index information")),
+ /* Think twice before adding "--nul" synonym to this */
+ OPT_SET_INT('z', NULL, &state->line_termination,
+ N_("paths are separated with NUL character"), '\0'),
+ OPT_INTEGER('C', NULL, &state->p_context,
+ N_("ensure at least <n> lines of context match")),
+ { OPTION_CALLBACK, 0, "whitespace", state, N_("action"),
+ N_("detect new or modified lines that have whitespace errors"),
+ 0, apply_option_parse_whitespace },
+ { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL,
+ N_("ignore changes in whitespace when finding context"),
+ PARSE_OPT_NOARG, apply_option_parse_space_change },
+ { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL,
+ N_("ignore changes in whitespace when finding context"),
+ PARSE_OPT_NOARG, apply_option_parse_space_change },
+ OPT_BOOL('R', "reverse", &state->apply_in_reverse,
+ N_("apply the patch in reverse")),
+ OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,
+ N_("don't expect at least one line of context")),
+ OPT_BOOL(0, "reject", &state->apply_with_reject,
+ N_("leave the rejected hunks in corresponding *.rej files")),
+ OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
+ N_("allow overlapping hunks")),
+ OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
+ OPT_BIT(0, "inaccurate-eof", options,
+ N_("tolerate incorrectly detected missing new-line at the end of file"),
+ APPLY_OPT_INACCURATE_EOF),
+ OPT_BIT(0, "recount", options,
+ N_("do not trust the line counts in the hunk headers"),
+ APPLY_OPT_RECOUNT),
+ { OPTION_CALLBACK, 0, "directory", state, N_("root"),
+ N_("prepend <root> to all filenames"),
+ 0, apply_option_parse_directory },
+ OPT_END()
+ };
+
+ return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0);
+}
diff --git a/apply.h b/apply.h
index f0d39a8..27a3a7a 100644
--- a/apply.h
+++ b/apply.h
@@ -121,6 +121,10 @@ extern int apply_option_parse_directory(const struct option *opt,
extern int apply_option_parse_space_change(const struct option *opt,
const char *arg, int unset);
+extern int apply_parse_options(int argc, const char **argv,
+ struct apply_state *state,
+ int *force_apply, int *options,
+ const char * const *apply_usage);
extern int init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file);
diff --git a/builtin/apply.c b/builtin/apply.c
index 7338701..81b9a61 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -18,80 +18,12 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
int ret;
struct apply_state state;
- struct option builtin_apply_options[] = {
- { OPTION_CALLBACK, 0, "exclude", &state, N_("path"),
- N_("don't apply changes matching the given path"),
- 0, apply_option_parse_exclude },
- { OPTION_CALLBACK, 0, "include", &state, N_("path"),
- N_("apply changes matching the given path"),
- 0, apply_option_parse_include },
- { OPTION_CALLBACK, 'p', NULL, &state, N_("num"),
- N_("remove <num> leading slashes from traditional diff paths"),
- 0, apply_option_parse_p },
- OPT_BOOL(0, "no-add", &state.no_add,
- N_("ignore additions made by the patch")),
- OPT_BOOL(0, "stat", &state.diffstat,
- N_("instead of applying the patch, output diffstat for the input")),
- OPT_NOOP_NOARG(0, "allow-binary-replacement"),
- OPT_NOOP_NOARG(0, "binary"),
- OPT_BOOL(0, "numstat", &state.numstat,
- N_("show number of added and deleted lines in decimal notation")),
- OPT_BOOL(0, "summary", &state.summary,
- N_("instead of applying the patch, output a summary for the input")),
- OPT_BOOL(0, "check", &state.check,
- N_("instead of applying the patch, see if the patch is applicable")),
- OPT_BOOL(0, "index", &state.check_index,
- N_("make sure the patch is applicable to the current index")),
- OPT_BOOL(0, "cached", &state.cached,
- N_("apply a patch without touching the working tree")),
- OPT_BOOL(0, "unsafe-paths", &state.unsafe_paths,
- N_("accept a patch that touches outside the working area")),
- OPT_BOOL(0, "apply", &force_apply,
- N_("also apply the patch (use with --stat/--summary/--check)")),
- OPT_BOOL('3', "3way", &state.threeway,
- N_( "attempt three-way merge if a patch does not apply")),
- OPT_FILENAME(0, "build-fake-ancestor", &state.fake_ancestor,
- N_("build a temporary index based on embedded index information")),
- /* Think twice before adding "--nul" synonym to this */
- OPT_SET_INT('z', NULL, &state.line_termination,
- N_("paths are separated with NUL character"), '\0'),
- OPT_INTEGER('C', NULL, &state.p_context,
- N_("ensure at least <n> lines of context match")),
- { OPTION_CALLBACK, 0, "whitespace", &state, N_("action"),
- N_("detect new or modified lines that have whitespace errors"),
- 0, apply_option_parse_whitespace },
- { OPTION_CALLBACK, 0, "ignore-space-change", &state, NULL,
- N_("ignore changes in whitespace when finding context"),
- PARSE_OPT_NOARG, apply_option_parse_space_change },
- { OPTION_CALLBACK, 0, "ignore-whitespace", &state, NULL,
- N_("ignore changes in whitespace when finding context"),
- PARSE_OPT_NOARG, apply_option_parse_space_change },
- OPT_BOOL('R', "reverse", &state.apply_in_reverse,
- N_("apply the patch in reverse")),
- OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
- N_("don't expect at least one line of context")),
- OPT_BOOL(0, "reject", &state.apply_with_reject,
- N_("leave the rejected hunks in corresponding *.rej files")),
- OPT_BOOL(0, "allow-overlap", &state.allow_overlap,
- N_("allow overlapping hunks")),
- OPT__VERBOSE(&state.apply_verbosity, N_("be verbose")),
- OPT_BIT(0, "inaccurate-eof", &options,
- N_("tolerate incorrectly detected missing new-line at the end of file"),
- APPLY_OPT_INACCURATE_EOF),
- OPT_BIT(0, "recount", &options,
- N_("do not trust the line counts in the hunk headers"),
- APPLY_OPT_RECOUNT),
- { OPTION_CALLBACK, 0, "directory", &state, N_("root"),
- N_("prepend <root> to all filenames"),
- 0, apply_option_parse_directory },
- OPT_END()
- };
-
if (init_apply_state(&state, prefix, &lock_file))
exit(128);
- argc = parse_options(argc, argv, state.prefix, builtin_apply_options,
- apply_usage, 0);
+ argc = apply_parse_options(argc, argv,
+ &state, &force_apply, &options,
+ apply_usage);
if (check_apply_state(&state, force_apply))
exit(128);
--
2.9.2.558.gf53e569
next prev parent reply other threads:[~2016-07-30 17:28 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-30 17:24 [PATCH v9 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-07-30 17:24 ` [PATCH v9 01/41] apply: make some names more specific Christian Couder
2016-07-30 17:24 ` [PATCH v9 02/41] apply: move 'struct apply_state' to apply.h Christian Couder
2016-07-30 17:24 ` [PATCH v9 03/41] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing Christian Couder
2016-08-01 16:16 ` Stefan Beller
2016-07-30 17:24 ` [PATCH v9 04/41] builtin/apply: read_patch_file() return -1 " Christian Couder
2016-08-01 16:24 ` Stefan Beller
2016-07-30 17:24 ` [PATCH v9 05/41] builtin/apply: make find_header() return -128 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 06/41] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 07/41] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 08/41] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 09/41] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 10/41] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-07-30 17:24 ` [PATCH v9 11/41] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 12/41] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 13/41] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-07-30 17:24 ` [PATCH v9 14/41] builtin/apply: make apply_all_patches() return 128 or 1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 15/41] builtin/apply: make parse_traditional_patch() return -1 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 16/41] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-07-30 17:24 ` [PATCH v9 17/41] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 18/41] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-07-30 17:24 ` [PATCH v9 19/41] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 20/41] builtin/apply: make remove_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 21/41] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 22/41] builtin/apply: make add_index_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 23/41] builtin/apply: make create_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 24/41] builtin/apply: make write_out_one_result() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 25/41] builtin/apply: make write_out_results() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 26/41] builtin/apply: make try_create_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 27/41] builtin/apply: make create_one_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 28/41] builtin/apply: rename option parsing functions Christian Couder
2016-07-30 17:24 ` [PATCH v9 29/41] apply: rename and move opt constants to apply.h Christian Couder
2016-07-30 17:24 ` [PATCH v9 31/41] apply: make some parsing functions static again Christian Couder
2016-07-30 17:25 ` [PATCH v9 32/41] apply: use error_errno() where possible Christian Couder
2016-07-30 17:25 ` [PATCH v9 33/41] environment: add set_index_file() Christian Couder
2016-08-01 17:24 ` Stefan Beller
2016-08-01 20:37 ` Junio C Hamano
2016-08-01 20:40 ` Junio C Hamano
2016-08-03 6:57 ` Christian Couder
2016-08-03 6:41 ` Christian Couder
2016-07-30 17:25 ` [PATCH v9 34/41] write_or_die: use warning() instead of fprintf(stderr, ...) Christian Couder
2016-07-30 17:25 ` [PATCH v9 35/41] apply: make it possible to silently apply Christian Couder
2016-08-01 22:05 ` Junio C Hamano
2016-07-30 17:25 ` [PATCH v9 36/41] apply: don't print on stdout in verbosity_silent mode Christian Couder
2016-07-30 17:25 ` [PATCH v9 37/41] usage: add set_warn_routine() Christian Couder
2016-07-30 17:25 ` [PATCH v9 38/41] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-07-30 17:25 ` [PATCH v9 39/41] apply: change error_routine when silent Christian Couder
2016-08-01 16:58 ` Stefan Beller
2016-08-08 11:31 ` Christian Couder
2016-07-30 17:25 ` Christian Couder [this message]
2016-07-30 17:25 ` [PATCH v9 41/41] builtin/am: use apply api in run_apply() Christian Couder
2016-07-30 19:50 ` [PATCH v9 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-08-01 22:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160730172509.22939-41-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=karsten.blees@gmail.com \
--cc=l.s.r@web.de \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).