3 #include "parse-options.h"
4 #include "range-diff.h"
8 static const char * const builtin_range_diff_usage
[] = {
9 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
10 N_("git range-diff [<options>] <old-tip>...<new-tip>"),
11 N_("git range-diff [<options>] <base> <old-tip> <new-tip>"),
15 int cmd_range_diff(int argc
, const char **argv
, const char *prefix
)
17 struct diff_options diffopt
= { NULL
};
18 struct strvec other_arg
= STRVEC_INIT
;
19 struct range_diff_options range_diff_opts
= {
20 .creation_factor
= RANGE_DIFF_CREATION_FACTOR_DEFAULT
,
22 .other_arg
= &other_arg
24 int simple_color
= -1, left_only
= 0, right_only
= 0;
25 struct option range_diff_options
[] = {
26 OPT_INTEGER(0, "creation-factor",
27 &range_diff_opts
.creation_factor
,
28 N_("percentage by which creation is weighted")),
29 OPT_BOOL(0, "no-dual-color", &simple_color
,
30 N_("use simple diff colors")),
31 OPT_PASSTHRU_ARGV(0, "notes", &other_arg
,
32 N_("notes"), N_("passed to 'git log'"),
34 OPT_BOOL(0, "left-only", &left_only
,
35 N_("only emit output related to the first range")),
36 OPT_BOOL(0, "right-only", &right_only
,
37 N_("only emit output related to the second range")),
40 struct option
*options
;
41 int i
, dash_dash
= -1, res
= 0;
42 struct strbuf range1
= STRBUF_INIT
, range2
= STRBUF_INIT
;
44 const char *three_dots
= NULL
;
46 git_config(git_diff_ui_config
, NULL
);
48 repo_diff_setup(the_repository
, &diffopt
);
50 options
= parse_options_concat(range_diff_options
, diffopt
.parseopts
);
51 argc
= parse_options(argc
, argv
, prefix
, options
,
52 builtin_range_diff_usage
, PARSE_OPT_KEEP_DASHDASH
);
54 diff_setup_done(&diffopt
);
56 /* force color when --dual-color was used */
58 diffopt
.use_color
= 1;
60 for (i
= 0; i
< argc
; i
++)
61 if (!strcmp(argv
[i
], "--")) {
67 (dash_dash
< 0 && argc
> 2 &&
68 !get_oid_committish(argv
[0], &oid
) &&
69 !get_oid_committish(argv
[1], &oid
) &&
70 !get_oid_committish(argv
[2], &oid
))) {
72 ; /* already validated arguments */
73 else if (get_oid_committish(argv
[0], &oid
))
74 usage_msg_optf(_("not a revision: '%s'"),
75 builtin_range_diff_usage
, options
,
77 else if (get_oid_committish(argv
[1], &oid
))
78 usage_msg_optf(_("not a revision: '%s'"),
79 builtin_range_diff_usage
, options
,
81 else if (get_oid_committish(argv
[2], &oid
))
82 usage_msg_optf(_("not a revision: '%s'"),
83 builtin_range_diff_usage
, options
,
86 strbuf_addf(&range1
, "%s..%s", argv
[0], argv
[1]);
87 strbuf_addf(&range2
, "%s..%s", argv
[0], argv
[2]);
89 strvec_pushv(&other_arg
, argv
+
90 (dash_dash
< 0 ? 3 : dash_dash
));
91 } else if (dash_dash
== 2 ||
92 (dash_dash
< 0 && argc
> 1 &&
93 is_range_diff_range(argv
[0]) &&
94 is_range_diff_range(argv
[1]))) {
96 ; /* already validated arguments */
97 else if (!is_range_diff_range(argv
[0]))
98 usage_msg_optf(_("not a commit range: '%s'"),
99 builtin_range_diff_usage
, options
,
101 else if (!is_range_diff_range(argv
[1]))
102 usage_msg_optf(_("not a commit range: '%s'"),
103 builtin_range_diff_usage
, options
,
106 strbuf_addstr(&range1
, argv
[0]);
107 strbuf_addstr(&range2
, argv
[1]);
109 strvec_pushv(&other_arg
, argv
+
110 (dash_dash
< 0 ? 2 : dash_dash
));
111 } else if (dash_dash
== 1 ||
112 (dash_dash
< 0 && argc
> 0 &&
113 (three_dots
= strstr(argv
[0], "...")))) {
118 ; /* already validated arguments */
119 else if (!(three_dots
= strstr(argv
[0], "...")))
120 usage_msg_optf(_("not a symmetric range: '%s'"),
121 builtin_range_diff_usage
, options
,
124 if (three_dots
== argv
[0]) {
129 a_len
= (int)(three_dots
- a
);
137 strbuf_addf(&range1
, "%s..%.*s", b
, a_len
, a
);
138 strbuf_addf(&range2
, "%.*s..%s", a_len
, a
, b
);
140 strvec_pushv(&other_arg
, argv
+
141 (dash_dash
< 0 ? 1 : dash_dash
));
143 usage_msg_opt(_("need two commit ranges"),
144 builtin_range_diff_usage
, options
);
145 FREE_AND_NULL(options
);
147 range_diff_opts
.dual_color
= simple_color
< 1;
148 range_diff_opts
.left_only
= left_only
;
149 range_diff_opts
.right_only
= right_only
;
150 res
= show_range_diff(range1
.buf
, range2
.buf
, &range_diff_opts
);
152 strvec_clear(&other_arg
);
153 strbuf_release(&range1
);
154 strbuf_release(&range2
);