ref-filter: move `struct atom_value` to ref-filter.c

diff --git a/parse-options-cb.c b/parse-options-cb.c
index be8c413cfebb414bcbb7815cf4fe42bc31444d65..239898d946f06d102030569fd45780f523fdcd5a 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -4,6 +4,8 @@
 #include "commit.h"
 #include "color.h"
 #include "string-list.h"
+#include "argv-array.h"
+#include "sha1-array.h"
 
 /*----- some often used options -----*/
 
@@ -76,7 +78,7 @@ int parse_opt_verbosity_cb(const struct option *opt, const char *arg,
        return 0;
 }
 
-int parse_opt_with_commit(const struct option *opt, const char *arg, int unset)
+int parse_opt_commits(const struct option *opt, const char *arg, int unset)
 {
        unsigned char sha1[20];
        struct commit *commit;
@@ -92,6 +94,22 @@ int parse_opt_with_commit(const struct option *opt, const char *arg, int unset)
        return 0;
 }
 
+int parse_opt_object_name(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;
+}
+
 int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
 {
        int *target = opt->value;
@@ -134,3 +152,71 @@ int parse_opt_noop_cb(const struct option *opt, const char *arg, int unset)
 {
        return 0;
 }
+
+/**
+ * Recreates the command-line option in the strbuf.
+ */
+static int recreate_opt(struct strbuf *sb, const struct option *opt,
+               const char *arg, int unset)
+{
+       strbuf_reset(sb);
+
+       if (opt->long_name) {
+               strbuf_addstr(sb, unset ? "--no-" : "--");
+               strbuf_addstr(sb, opt->long_name);
+               if (arg) {
+                       strbuf_addch(sb, '=');
+                       strbuf_addstr(sb, arg);
+               }
+       } else if (opt->short_name && !unset) {
+               strbuf_addch(sb, '-');
+               strbuf_addch(sb, opt->short_name);
+               if (arg)
+                       strbuf_addstr(sb, arg);
+       } else
+               return -1;
+
+       return 0;
+}
+
+/**
+ * For an option opt, recreates the command-line option in opt->value which
+ * must be an char* initialized to NULL. This is useful when we need to pass
+ * the command-line option to another command. Since any previous value will be
+ * overwritten, this callback should only be used for options where the last
+ * one wins.
+ */
+int parse_opt_passthru(const struct option *opt, const char *arg, int unset)
+{
+       static struct strbuf sb = STRBUF_INIT;
+       char **opt_value = opt->value;
+
+       if (recreate_opt(&sb, opt, arg, unset) < 0)
+               return -1;
+
+       if (*opt_value)
+               free(*opt_value);
+
+       *opt_value = strbuf_detach(&sb, NULL);
+
+       return 0;
+}
+
+/**
+ * For an option opt, recreate the command-line option, appending it to
+ * opt->value which must be a argv_array. This is useful when we need to pass
+ * the command-line option, which can be specified multiple times, to another
+ * command.
+ */
+int parse_opt_passthru_argv(const struct option *opt, const char *arg, int unset)
+{
+       static struct strbuf sb = STRBUF_INIT;
+       struct argv_array *opt_value = opt->value;
+
+       if (recreate_opt(&sb, opt, arg, unset) < 0)
+               return -1;
+
+       argv_array_push(opt_value, sb.buf);
+
+       return 0;
+}