diff-parseopt: convert --stat*

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 9c8f5336bc3ee04608b81000ccb9b1ec91b7762f..1feb13deb3adef95b5d157ff817e99234215d2be 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -104,11 +104,6 @@ static const char *color_diff_slots[] = {
        [DIFF_FILE_NEW_BOLD]          = "newBold",
 };
 
        [DIFF_FILE_NEW_BOLD]          = "newBold",
 };
 

-static NORETURN void die_want_option(const char *option_name)
-{
-       die(_("option '%s' requires a value"), option_name);
-}
-

 define_list_config_array_extra(color_diff_slots, {"plain"});
 
 static int parse_diff_color_slot(const char *var)
 define_list_config_array_extra(color_diff_slots, {"plain"});
 
 static int parse_diff_color_slot(const char *var)


@@ -4661,77 +4656,56 @@ int parse_long_opt(const char *opt, const char **argv,
        return 2;
 }
 
        return 2;
 }
 

-static int stat_opt(struct diff_options *options, const char **av)
+static int diff_opt_stat(const struct option *opt, const char *value, int unset)

 {
 {

-       const char *arg = av[0];
-       char *end;
+       struct diff_options *options = opt->value;

        int width = options->stat_width;
        int name_width = options->stat_name_width;
        int graph_width = options->stat_graph_width;
        int count = options->stat_count;
        int width = options->stat_width;
        int name_width = options->stat_name_width;
        int graph_width = options->stat_graph_width;
        int count = options->stat_count;

-       int argcount = 1;
+       char *end;

 
 

-       if (!skip_prefix(arg, "--stat", &arg))
-               BUG("stat option does not begin with --stat: %s", arg);
-       end = (char *)arg;
+       BUG_ON_OPT_NEG(unset);

 
 

-       switch (*arg) {
-       case '-':
-               if (skip_prefix(arg, "-width", &arg)) {
-                       if (*arg == '=')
-                               width = strtoul(arg + 1, &end, 10);
-                       else if (!*arg && !av[1])
-                               die_want_option("--stat-width");
-                       else if (!*arg) {
-                               width = strtoul(av[1], &end, 10);
-                               argcount = 2;
-                       }
-               } else if (skip_prefix(arg, "-name-width", &arg)) {
-                       if (*arg == '=')
-                               name_width = strtoul(arg + 1, &end, 10);
-                       else if (!*arg && !av[1])
-                               die_want_option("--stat-name-width");
-                       else if (!*arg) {
-                               name_width = strtoul(av[1], &end, 10);
-                               argcount = 2;
-                       }
-               } else if (skip_prefix(arg, "-graph-width", &arg)) {
-                       if (*arg == '=')
-                               graph_width = strtoul(arg + 1, &end, 10);
-                       else if (!*arg && !av[1])
-                               die_want_option("--stat-graph-width");
-                       else if (!*arg) {
-                               graph_width = strtoul(av[1], &end, 10);
-                               argcount = 2;
-                       }
-               } else if (skip_prefix(arg, "-count", &arg)) {
-                       if (*arg == '=')
-                               count = strtoul(arg + 1, &end, 10);
-                       else if (!*arg && !av[1])
-                               die_want_option("--stat-count");
-                       else if (!*arg) {
-                               count = strtoul(av[1], &end, 10);
-                               argcount = 2;
-                       }
+       if (!strcmp(opt->long_name, "stat")) {
+               if (value) {
+                       width = strtoul(value, &end, 10);
+                       if (*end == ',')
+                               name_width = strtoul(end+1, &end, 10);
+                       if (*end == ',')
+                               count = strtoul(end+1, &end, 10);
+                       if (*end)
+                               return error(_("invalid --stat value: %s"), value);

                }
                }

-               break;
-       case '=':
-               width = strtoul(arg+1, &end, 10);
-               if (*end == ',')
-                       name_width = strtoul(end+1, &end, 10);
-               if (*end == ',')
-                       count = strtoul(end+1, &end, 10);
-       }
+       } else if (!strcmp(opt->long_name, "stat-width")) {
+               width = strtoul(value, &end, 10);
+               if (*end)
+                       return error(_("%s expects a numerical value"),
+                                    opt->long_name);
+       } else if (!strcmp(opt->long_name, "stat-name-width")) {
+               name_width = strtoul(value, &end, 10);
+               if (*end)
+                       return error(_("%s expects a numerical value"),
+                                    opt->long_name);
+       } else if (!strcmp(opt->long_name, "stat-graph-width")) {
+               graph_width = strtoul(value, &end, 10);
+               if (*end)
+                       return error(_("%s expects a numerical value"),
+                                    opt->long_name);
+       } else if (!strcmp(opt->long_name, "stat-count")) {
+               count = strtoul(value, &end, 10);
+               if (*end)
+                       return error(_("%s expects a numerical value"),
+                                    opt->long_name);
+       } else
+               BUG("%s should not get here", opt->long_name);

 
 

-       /* Important! This checks all the error cases! */
-       if (*end)
-               return 0;

        options->output_format |= DIFF_FORMAT_DIFFSTAT;
        options->stat_name_width = name_width;
        options->stat_graph_width = graph_width;
        options->stat_width = width;
        options->stat_count = count;
        options->output_format |= DIFF_FORMAT_DIFFSTAT;
        options->stat_name_width = name_width;
        options->stat_graph_width = graph_width;
        options->stat_width = width;
        options->stat_count = count;

-       return argcount;
+       return 0;

 }
 
 static int parse_dirstat_opt(struct diff_options *options, const char *params)
 }
 
 static int parse_dirstat_opt(struct diff_options *options, const char *params)


@@ -4958,6 +4932,21 @@ static void prep_parse_options(struct diff_options *options)
                OPT_BIT_F(0, "name-status", &options->output_format,
                          N_("show only names and status of changed files"),
                          DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),
                OPT_BIT_F(0, "name-status", &options->output_format,
                          N_("show only names and status of changed files"),
                          DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),

+               OPT_CALLBACK_F(0, "stat", options, N_("<width>[,<name-width>[,<count>]]"),
+                              N_("generate diffstat"),
+                              PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_stat),
+               OPT_CALLBACK_F(0, "stat-width", options, N_("<width>"),
+                              N_("generate diffstat with a given width"),
+                              PARSE_OPT_NONEG, diff_opt_stat),
+               OPT_CALLBACK_F(0, "stat-name-width", options, N_("<width>"),
+                              N_("generate diffstat with a given name width"),
+                              PARSE_OPT_NONEG, diff_opt_stat),
+               OPT_CALLBACK_F(0, "stat-graph-width", options, N_("<width>"),
+                              N_("generate diffstat with a given graph width"),
+                              PARSE_OPT_NONEG, diff_opt_stat),
+               OPT_CALLBACK_F(0, "stat-count", options, N_("<count>"),
+                              N_("generate diffstat with limited lines"),
+                              PARSE_OPT_NONEG, diff_opt_stat),

                OPT_END()
        };
 
                OPT_END()
        };
 


@@ -4986,10 +4975,7 @@ int diff_opt_parse(struct diff_options *options,
                return ac;
 
        /* Output format options */
                return ac;
 
        /* Output format options */

-       if (starts_with(arg, "--stat"))
-               /* --stat, --stat-width, --stat-name-width, or --stat-count */
-               return stat_opt(options, av);
-       else if (!strcmp(arg, "--compact-summary")) {
+       if (!strcmp(arg, "--compact-summary")) {

                 options->flags.stat_with_summary = 1;
                 options->output_format |= DIFF_FORMAT_DIFFSTAT;
        } else if (!strcmp(arg, "--no-compact-summary"))
                 options->flags.stat_with_summary = 1;
                 options->output_format |= DIFF_FORMAT_DIFFSTAT;
        } else if (!strcmp(arg, "--no-compact-summary"))