Re: [RFC/PATCH 1/9] tag: libify parse_opt_points_at()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 8, 2015, 19:00 UTC
- Message-ID
- <xmqq4mmiauu0.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1433621052-5588-1-git-send-email-karthik.188@gmail.com>
Karthik Nayak <karthik.188@gmail.com> writes:
Show 26 quoted lines
> diff --git a/parse-options-cb.c b/parse-options-cb.c
> index be8c413..a4d294d 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 "sha1-array.h"
> ...
> +int parse_opt_points_at(const struct option *opt, const char *arg, int unset)
> +{
> + unsigned char sha1[20];
> +
> + if (unset) {
> + sha1_array_clear(opt->value);
> + return 0;
> + }
> + if (!arg)
> + return -1;
> + if (get_sha1(arg, sha1))
> + return error(_("malformed object name '%s'"), arg);
> + sha1_array_append(opt->value, sha1);
> + return 0;
> +}
> +This feels way too specialized to live as part of parse_options infrastructure.
The existing caller(s) may want to use this callback for parsing "points-at" option they have, but is that the only plausible use of this callback? It looks to be usable by any future caller that wants to take and accumulate any object names into an sha1-array, so perhaps rename it to be a bit more generic to represent its nature better?
parse_opt_object_name()
or something?
I also wonder if we can (and want to) refactor the users of with-commit callback. Have them use this to obtain an sha1-array and then convert what they received into a commit-list themselves.
Show 15 quoted lines
> 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 c71e9da..3ae16a1 100644
> --- a/parse-options.h
> +++ b/parse-options.h
> @@ -220,6 +220,7 @@ extern int parse_opt_approxidate_cb(const struct option *, const char *, int);
> 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_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);