3 #include "parse-options.h"
4 #include "range-diff.h"
7 static const char * const builtin_range_diff_usage[] = {
8 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
9 N_("git range-diff [<options>] <old-tip>...<new-tip>"),
10 N_("git range-diff [<options>] <base> <old-tip> <new-tip>"),
14 int cmd_range_diff(int argc, const char **argv, const char *prefix)
16 struct diff_options diffopt = { NULL };
17 struct strvec other_arg = STRVEC_INIT;
18 struct range_diff_options range_diff_opts = {
19 .creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT,
21 .other_arg = &other_arg
23 int simple_color = -1;
24 struct option range_diff_options[] = {
25 OPT_INTEGER(0, "creation-factor",
26 &range_diff_opts.creation_factor,
27 N_("Percentage by which creation is weighted")),
28 OPT_BOOL(0, "no-dual-color", &simple_color,
29 N_("use simple diff colors")),
30 OPT_PASSTHRU_ARGV(0, "notes", &other_arg,
31 N_("notes"), N_("passed to 'git log'"),
35 struct option *options;
37 struct strbuf range1 = STRBUF_INIT, range2 = STRBUF_INIT;
39 git_config(git_diff_ui_config, NULL);
41 repo_diff_setup(the_repository, &diffopt);
43 options = parse_options_concat(range_diff_options, diffopt.parseopts);
44 argc = parse_options(argc, argv, prefix, options,
45 builtin_range_diff_usage, 0);
47 diff_setup_done(&diffopt);
49 /* force color when --dual-color was used */
51 diffopt.use_color = 1;
54 if (!strstr(argv[0], ".."))
55 die(_("no .. in range: '%s'"), argv[0]);
56 strbuf_addstr(&range1, argv[0]);
58 if (!strstr(argv[1], ".."))
59 die(_("no .. in range: '%s'"), argv[1]);
60 strbuf_addstr(&range2, argv[1]);
61 } else if (argc == 3) {
62 strbuf_addf(&range1, "%s..%s", argv[0], argv[1]);
63 strbuf_addf(&range2, "%s..%s", argv[0], argv[2]);
64 } else if (argc == 1) {
65 const char *b = strstr(argv[0], "..."), *a = argv[0];
69 error(_("single arg format must be symmetric range"));
70 usage_with_options(builtin_range_diff_usage, options);
81 strbuf_addf(&range1, "%s..%.*s", b, a_len, a);
82 strbuf_addf(&range2, "%.*s..%s", a_len, a, b);
84 error(_("need two commit ranges"));
85 usage_with_options(builtin_range_diff_usage, options);
87 FREE_AND_NULL(options);
89 range_diff_opts.dual_color = simple_color < 1;
90 res = show_range_diff(range1.buf, range2.buf, &range_diff_opts);
92 strvec_clear(&other_arg);
93 strbuf_release(&range1);
94 strbuf_release(&range2);