[RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter()
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Jun 6, 2015, 20:04 UTC
- Message-ID
- <1433621052-5588-4-git-send-email-karthik.188@gmail.com>
- In-Reply-To
- <1433621052-5588-1-git-send-email-karthik.188@gmail.com>
Add 'parse_opt_merge_filter()' to parse '--merged' and '--no-merged' options and write MACROS for the same.
Based-on-patch-by: Jeff King <peff@peff.net> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- parse-options-cb.c | 22 ++++++++++++++++++++++ parse-options.h | 11 +++++++++++ 2 files changed, 33 insertions(+)
diff --git a/parse-options-cb.c b/parse-options-cb.c index a4d294d..1969803 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -4,6 +4,7 @@ #include "commit.h" #include "color.h" #include "string-list.h" +#include "ref-filter.h" #include "sha1-array.h" /*----- some often used options -----*/ @@ -109,6 +110,27 @@ int parse_opt_points_at(const struct option *opt, const char *arg, int unset) return 0; } +int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) +{ + struct ref_filter *rf = opt->value; + unsigned char sha1[20]; + + rf->merge = opt->long_name[0] == 'n' + ? REF_FILTER_MERGED_OMIT + : REF_FILTER_MERGED_INCLUDE; + + if (!arg) + arg = "HEAD"; + if (get_sha1(arg, sha1)) + die(_("malformed object name %s"), arg); + + rf->merge_commit = lookup_commit_reference_gently(sha1, 0); + if (!rf->merge_commit) + return opterror(opt, "must point to a commit", 0); + + return 0; +} + int parse_opt_tertiary(const struct option *opt, const char *arg, int unset) { int *target = opt->value; diff --git a/parse-options.h b/parse-options.h index 3ae16a1..7bcf0f3 100644 --- a/parse-options.h +++ b/parse-options.h @@ -221,6 +221,7 @@ extern int parse_opt_expiry_date_cb(const struct option *, const char *, int); extern int parse_opt_color_flag_cb(const struct option *, const char *, int); extern int parse_opt_verbosity_cb(const struct option *, const char *, int); extern int parse_opt_points_at(const struct option *, const char *, int); +extern int parse_opt_merge_filter(const struct option *, const char *, int); extern int parse_opt_with_commit(const struct option *, const char *, int); extern int parse_opt_tertiary(const struct option *, const char *, int); extern int parse_opt_string_list(const struct option *, const char *, int); @@ -243,5 +244,15 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int); OPT_COLOR_FLAG(0, "color", (var), (h)) #define OPT_COLUMN(s, l, v, h) \ { OPTION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG, parseopt_column_callback } +#define OPT_NO_MERGED(filter, h) \ + { OPTION_CALLBACK, 0, "no-merged", (filter), N_("commit"), (h), \ + PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, \ + parse_opt_merge_filter, (intptr_t) "HEAD" \ + } +#define OPT_MERGED(filter, h) \ + { OPTION_CALLBACK, 0, "merged", (filter), N_("commit"), (h), \ + PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, \ + parse_opt_merge_filter, (intptr_t) "HEAD" \ + } #endif
-- 2.4.2