diff --no-index: use parse_options() instead of diff_opt_parse()

diff --git a/diff.c b/diff.c
index 8b65b03c0dfdd36e57d1ad9ed90724512bd64393..8b770cd396737172342c4de4f3e36d25f75934d9 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4841,6 +4841,45 @@ static int diff_opt_char(const struct option *opt,
        return 0;
 }
 
+static int diff_opt_color_moved(const struct option *opt,
+                               const char *arg, int unset)
+{
+       struct diff_options *options = opt->value;
+
+       if (unset) {
+               options->color_moved = COLOR_MOVED_NO;
+       } else if (!arg) {
+               if (diff_color_moved_default)
+                       options->color_moved = diff_color_moved_default;
+               if (options->color_moved == COLOR_MOVED_NO)
+                       options->color_moved = COLOR_MOVED_DEFAULT;
+       } else {
+               int cm = parse_color_moved(arg);
+               if (cm < 0)
+                       return error(_("bad --color-moved argument: %s"), arg);
+               options->color_moved = cm;
+       }
+       return 0;
+}
+
+static int diff_opt_color_moved_ws(const struct option *opt,
+                                  const char *arg, int unset)
+{
+       struct diff_options *options = opt->value;
+       unsigned cm;
+
+       if (unset) {
+               options->color_moved_ws_handling = 0;
+               return 0;
+       }
+
+       cm = parse_color_moved_ws(arg);
+       if (cm & COLOR_MOVED_WS_ERROR)
+               return error(_("invalid mode '%s' in --color-moved-ws"), arg);
+       options->color_moved_ws_handling = cm;
+       return 0;
+}
+
 static int diff_opt_color_words(const struct option *opt,
                                const char *arg, int unset)
 {
@@ -5339,6 +5378,12 @@ static void prep_parse_options(struct diff_options *options)
                OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
                               N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
+               OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
+                              N_("move lines of code are colored differently"),
+                              PARSE_OPT_OPTARG, diff_opt_color_moved),
+               OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
+                              N_("how white spaces are ignored in --color-moved"),
+                              0, diff_opt_color_moved_ws),
 
                OPT_GROUP(N_("Diff other options")),
                OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
@@ -5406,8 +5451,6 @@ static void prep_parse_options(struct diff_options *options)
 int diff_opt_parse(struct diff_options *options,
                   const char **av, int ac, const char *prefix)
 {
-       const char *arg = av[0];
-
        if (!prefix)
                prefix = "";
 
@@ -5418,33 +5461,7 @@ int diff_opt_parse(struct diff_options *options,
                           PARSE_OPT_ONE_SHOT |
                           PARSE_OPT_STOP_AT_NON_OPTION);
 
-       if (ac)
-               return ac;
-
-       /* flags options */
-       if (!strcmp(arg, "--color-moved")) {
-               if (diff_color_moved_default)
-                       options->color_moved = diff_color_moved_default;
-               if (options->color_moved == COLOR_MOVED_NO)
-                       options->color_moved = COLOR_MOVED_DEFAULT;
-       } else if (!strcmp(arg, "--no-color-moved"))
-               options->color_moved = COLOR_MOVED_NO;
-       else if (skip_prefix(arg, "--color-moved=", &arg)) {
-               int cm = parse_color_moved(arg);
-               if (cm < 0)
-                       return error("bad --color-moved argument: %s", arg);
-               options->color_moved = cm;
-       } else if (skip_prefix(arg, "--color-moved-ws=", &arg)) {
-               unsigned cm = parse_color_moved_ws(arg);
-               if (cm & COLOR_MOVED_WS_ERROR)
-                       return -1;
-               options->color_moved_ws_handling = cm;
-       }
-
-       /* misc options */
-       else
-               return 0;
-       return 1;
+       return ac;
 }
 
 int parse_rename_score(const char **cp_p)