From: Junio C Hamano <gitster@pobox•com>
To: Karthik Nayak <karthik.188@gmail•com>
Cc: git@vger•kernel.org, christian.couder@gmail•com,
Matthieu.Moy@grenoble-inp•fr
Subject: Re: [RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter()
Date: Mon, 08 Jun 2015 12:20:30 -0700 [thread overview]
Message-ID: <xmqqvbey9fcx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1433621052-5588-4-git-send-email-karthik.188@gmail.com> (Karthik Nayak's message of "Sun, 7 Jun 2015 01:34:07 +0530")
Karthik Nayak <karthik.188@gmail•com> writes:
> +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;
> +}
Again, this smells too specific to live as a part of parse-options
infrastructure. If we want to have two helper callbacks, one that
gives the results in an sha1-array (because there is no guarantee
that you want only commits) and in a commit-list, I am fine with
having parse_opt_object_name() and parse_opt_with_commit(). Perhaps
rename the latter which was named too specifically to something more
sensible (e.g. parse_opt_commit_object_name()) and use it from the
caller you wanted to use parse_opt_merge_filter()? The caller, if
it is not prepared to see more than one commits specified, may have
to check if (!list || !list->next) { die("I want one and only one") }
or something, though.
Having it in ref-filter.h as parse_opt_merge_filter() is fine,
though. After all, you would be sharing it with for-each-ref,
branch and tag and nobody else anyway.
> 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" \
> + }
Likewise.
next prev parent reply other threads:[~2015-06-08 19:20 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-06 20:03 [RFC/PATCH 0/9] add options to ref-filter Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 1/9] tag: libify parse_opt_points_at() Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 2/9] ref-filter: implement '--points-at' option Karthik Nayak
2015-06-08 17:31 ` Matthieu Moy
2015-06-08 18:50 ` Karthik Nayak
2015-06-08 18:00 ` Matthieu Moy
2015-06-08 18:54 ` Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 3/9] for-each-ref: add " Karthik Nayak
2015-06-08 17:35 ` Matthieu Moy
2015-06-08 18:51 ` Karthik Nayak
2015-06-08 19:12 ` Junio C Hamano
2015-06-09 12:01 ` Karthik Nayak
2015-06-09 19:07 ` Junio C Hamano
2015-06-10 6:55 ` Karthik Nayak
2015-06-10 7:39 ` Matthieu Moy
2015-06-10 11:31 ` Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter() Karthik Nayak
2015-06-08 17:58 ` Matthieu Moy
2015-06-08 18:54 ` Karthik Nayak
2015-06-08 19:20 ` Junio C Hamano [this message]
2015-06-09 12:36 ` Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 5/9] ref-filter: implement '--merged' and '--no-merged' options Karthik Nayak
2015-06-08 17:51 ` Matthieu Moy
2015-06-08 18:53 ` Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 6/9] for-each-ref: add " Karthik Nayak
2015-06-08 17:53 ` Matthieu Moy
2015-06-08 18:54 ` Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 7/9] parse-options.h: add macros for '--contains' option Karthik Nayak
2015-06-08 19:32 ` Junio C Hamano
2015-06-09 12:49 ` Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 8/9] ref-filter: add " Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 9/9] for-each-ref: " Karthik Nayak
2015-06-08 19:00 ` [RFC/PATCH 1/9] tag: libify parse_opt_points_at() Junio C Hamano
2015-06-09 11:50 ` Karthik Nayak
2015-06-07 13:10 ` [RFC/PATCH 0/9] add options to ref-filter Christian Couder
2015-06-08 15:00 ` Karthik Nayak
2015-06-08 19:34 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvbey9fcx.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=karthik.188@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox