Merge branch 'en/incl-forward-decl'

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 94c1f362cc4feec11c2ab622f9399c1dff7e2840..f52d45d9d614445e3473c810e9305c986a4dfdf8 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -2,6 +2,7 @@
 #include "builtin.h"
 #include "parse-options.h"
 #include "range-diff.h"
+#include "config.h"
 
 static const char * const builtin_range_diff_usage[] = {
 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
@@ -10,20 +11,65 @@ N_("git range-diff [<options>] <base> <old-tip> <new-tip>"),
 NULL
 };
 
+static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
+{
+       return data;
+}
+
 int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
        int creation_factor = 60;
+       struct diff_options diffopt = { NULL };
+       int simple_color = -1;
        struct option options[] = {
                OPT_INTEGER(0, "creation-factor", &creation_factor,
                            N_("Percentage by which creation is weighted")),
+               OPT_BOOL(0, "no-dual-color", &simple_color,
+                           N_("color both diff and diff-between-diffs")),
                OPT_END()
        };
-       int res = 0;
+       int i, j, res = 0;
+       struct strbuf four_spaces = STRBUF_INIT;
        struct strbuf range1 = STRBUF_INIT, range2 = STRBUF_INIT;
 
+       git_config(git_diff_ui_config, NULL);
+
+       diff_setup(&diffopt);
+       diffopt.output_format = DIFF_FORMAT_PATCH;
+       diffopt.flags.suppress_diff_headers = 1;
+       diffopt.output_prefix = output_prefix_cb;
+       strbuf_addstr(&four_spaces, "    ");
+       diffopt.output_prefix_data = &four_spaces;
+
        argc = parse_options(argc, argv, NULL, options,
+                            builtin_range_diff_usage, PARSE_OPT_KEEP_UNKNOWN |
+                            PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
+
+       for (i = j = 1; i < argc && strcmp("--", argv[i]); ) {
+               int c = diff_opt_parse(&diffopt, argv + i, argc - i, prefix);
+
+               if (!c)
+                       argv[j++] = argv[i++];
+               else
+                       i += c;
+       }
+       while (i < argc)
+               argv[j++] = argv[i++];
+       argc = j;
+       diff_setup_done(&diffopt);
+
+       /* Make sure that there are no unparsed options */
+       argc = parse_options(argc, argv, NULL,
+                            options + ARRAY_SIZE(options) - 1, /* OPT_END */
                             builtin_range_diff_usage, 0);
 
+       if (simple_color < 1) {
+               if (!simple_color)
+                       /* force color when --dual-color was used */
+                       diffopt.use_color = 1;
+               diffopt.flags.dual_color_diffed_diffs = 1;
+       }
+
        if (argc == 2) {
                if (!strstr(argv[0], ".."))
                        die(_("no .. in range: '%s'"), argv[0]);
@@ -59,10 +105,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
                usage_with_options(builtin_range_diff_usage, options);
        }
 
-       res = show_range_diff(range1.buf, range2.buf, creation_factor);
+       res = show_range_diff(range1.buf, range2.buf, creation_factor,
+                             &diffopt);
 
        strbuf_release(&range1);
        strbuf_release(&range2);
+       strbuf_release(&four_spaces);
 
        return res;
 }