range-diff/format-patch: refactor check for commit range

dscho · gitster · commit 679b5916cdaf · 2021-01-27T22:01:49.000-08:00
Currently, when called with exactly two arguments, `git range-diff`
tests for a literal `..` in each of the two. Likewise, the argument
provided via `--range-diff` to `git format-patch` is checked in the same
manner.

However, `&lt;commit&gt;^!` is a perfectly valid commit range, equivalent to
`&lt;commit&gt;^..&lt;commit&gt;` according to the `SPECIFYING RANGES` section of
gitrevisions[7].

In preparation for allowing more sophisticated ways to specify commit
ranges, let's refactor the check into its own function.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/log.c b/builtin/log.c
@@ -1680,7 +1680,7 @@ static void infer_range_diff_ranges(struct strbuf *r1,
 				    struct commit *head)
 {
 	const char *head_oid = oid_to_hex(&head->object.oid);
-	int prev_is_range = !!strstr(prev, "..");
+	int prev_is_range = is_range_diff_range(prev);
 
 	if (prev_is_range)
 		strbuf_addstr(r1, prev);
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
@@ -3,6 +3,7 @@
 #include "parse-options.h"
 #include "range-diff.h"
 #include "config.h"
+#include "revision.h"
 
 static const char * const builtin_range_diff_usage[] = {
 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
@@ -46,12 +47,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 		diffopt.use_color = 1;
 
 	if (argc == 2) {
-		if (!strstr(argv[0], ".."))
-			die(_("no .. in range: '%s'"), argv[0]);
+		if (!is_range_diff_range(argv[0]))
+			die(_("not a commit range: '%s'"), argv[0]);
 		strbuf_addstr(&range1, argv[0]);
 
-		if (!strstr(argv[1], ".."))
-			die(_("no .. in range: '%s'"), argv[1]);
+		if (!is_range_diff_range(argv[1]))
+			die(_("not a commit range: '%s'"), argv[1]);
 		strbuf_addstr(&range2, argv[1]);
 	} else if (argc == 3) {
 		strbuf_addf(&range1, "%s..%s", argv[0], argv[1]);
diff --git a/range-diff.c b/range-diff.c
@@ -564,3 +564,8 @@ int show_range_diff(const char *range1, const char *range2,
 
 	return res;
 }
+
+int is_range_diff_range(const char *arg)
+{
+	return !!strstr(arg, "..");
+}
diff --git a/range-diff.h b/range-diff.h
@@ -16,4 +16,12 @@ int show_range_diff(const char *range1, const char *range2,
 		    const struct diff_options *diffopt,
 		    const struct strvec *other_arg);
 
+/*
+ * Determine whether the given argument is usable as a range argument of `git
+ * range-diff`, e.g. A..B. Note that this only validates the format but does
+ * _not_ parse it, i.e. it does _not_ look up the specified commits in the
+ * local repository.
+ */
+int is_range_diff_range(const char *arg);
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1680,7 +1680,7 @@ static void infer_range_diff_ranges(struct strbuf *r1,`
`1680`	`1680`	`struct commit *head)`
`1681`	`1681`	`{`
`1682`	`1682`	`const char *head_oid = oid_to_hex(&head->object.oid);`
`1683`		`- int prev_is_range = !!strstr(prev, "..");`
	`1683`	`+ int prev_is_range = is_range_diff_range(prev);`
`1684`	`1684`
`1685`	`1685`	`if (prev_is_range)`
`1686`	`1686`	`strbuf_addstr(r1, prev);`
Original file line number	Diff line number	Diff line change
`@@ -564,3 +564,8 @@ int show_range_diff(const char range1, const char range2,`
`564`	`564`
`565`	`565`	`return res;`
`566`	`566`	`}`
	`567`	`+`
	`568`	`+int is_range_diff_range(const char *arg)`
	`569`	`+{`
	`570`	`+ return !!strstr(arg, "..");`
	`571`	`+}`