X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=c134ffda1913082e3b38c6bee7acd3747d633ffd;hb=34155390a576d8124e0adc864aaf2f11bbf5168b;hp=69749f5b783bfc35c91b8aa4a98ff7adac3714c1;hpb=178cb243387a24b1dec7613c4c5e97158163ac60;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index 69749f5b..c134ffda 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -4,11 +4,147 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "commit.h"
+
+static char *def = NULL;
+static int no_revs = 0;
+static int single_rev = 0;
+static int revs_only = 0;
+static int do_rev_argument = 1;
+static int output_revs = 0;
+
+#define NORMAL 0
+#define REVERSED 1
+static int show_type = NORMAL;
+
+static int get_extended_sha1(char *name, unsigned char *sha1);
+
+/*
+ * Some arguments are relevant "revision" arguments,
+ * others are about output format or other details.
+ * This sorts it all out.
+ */
+static int is_rev_argument(const char *arg)
+{
+	static const char *rev_args[] = {
+		"--max-count=",
+		"--max-age=",
+		"--min-age=",
+		"--merge-order",
+		NULL
+	};
+	const char **p = rev_args;
+
+	for (;;) {
+		const char *str = *p++;
+		int len;
+		if (!str)
+			return 0;
+		len = strlen(str);
+		if (!strncmp(arg, str, len))
+			return 1;
+	}
+}
+
+static void show_rev(int type, unsigned char *sha1)
+{
+	if (no_revs)
+		return;
+	output_revs++;
+	printf("%s%s\n", type == show_type ? "" : "^", sha1_to_hex(sha1));
+}
+
+static void show_rev_arg(char *rev)
+{
+	if (no_revs)
+		return;
+	puts(rev);
+}
+
+static void show_norev(char *norev)
+{
+	if (revs_only)
+		return;
+	puts(norev);
+}
+
+static void show_arg(char *arg)
+{
+	if (do_rev_argument && is_rev_argument(arg))
+		show_rev_arg(arg);
+	else
+		show_norev(arg);
+}
+
+static int get_parent(char *name, unsigned char *result, int idx)
+{
+	unsigned char sha1[20];
+	int ret = get_extended_sha1(name, sha1);
+	struct commit *commit;
+	struct commit_list *p;
+
+	if (ret)
+		return ret;
+	commit = lookup_commit_reference(sha1);
+	if (!commit)
+		return -1;
+	if (parse_commit(commit))
+		return -1;
+	p = commit->parents;
+	while (p) {
+		if (!--idx) {
+			memcpy(result, p->item->object.sha1, 20);
+			return 0;
+		}
+		p = p->next;
+	}
+	return -1;
+}
+
+/*
+ * This is like "get_sha1()", except it allows "sha1 expressions",
+ * notably "xyz^" for "parent of xyz"
+ */
+static int get_extended_sha1(char *name, unsigned char *sha1)
+{
+	int parent;
+	int len = strlen(name);
+
+	parent = 1;
+	if (len > 2 && name[len-1] >= '1' && name[len-1] <= '9') {
+		parent = name[len-1] - '0';
+		len--;
+	}
+	if (len > 1 && name[len-1] == '^') {
+		int ret;
+		name[len-1] = 0;
+		ret = get_parent(name, sha1, parent);
+		name[len-1] = '^';
+		if (!ret)
+			return 0;
+	}
+	return get_sha1(name, sha1);
+}
+
+static void show_default(void)
+{
+	char *s = def;
+
+	if (s) {
+		unsigned char sha1[20];
+
+		def = NULL;
+		if (!get_extended_sha1(s, sha1)) {
+			show_rev(NORMAL, sha1);
+			return;
+		}
+		show_arg(s);
+	}
+}
 
 int main(int argc, char **argv)
 {
 	int i, as_is = 0;
-	char *def = NULL;
 	unsigned char sha1[20];
 
 	for (i = 1; i < argc; i++) {
@@ -16,34 +152,40 @@ int main(int argc, char **argv)
 		char *dotdot;
 	
 		if (as_is) {
-			printf("%s\n", arg);
+			show_norev(arg);
 			continue;
 		}
 		if (*arg == '-') {
 			if (!strcmp(arg, "--")) {
-				if (def) {
-					printf("%s\n", def);
-					def = NULL;
-				}
+				show_default();
+				if (revs_only)
+					break;
 				as_is = 1;
 			}
 			if (!strcmp(arg, "--default")) {
-				if (def)
-					printf("%s\n", def);
 				def = argv[i+1];
 				i++;
 				continue;
 			}
-			printf("%s\n", arg);
-			continue;
-		}
-		def = NULL;
-		if (!get_sha1(arg, sha1)) {
-			printf("%s\n", sha1_to_hex(sha1));
-			continue;
-		}
-		if (*arg == '^' && !get_sha1(arg+1, sha1)) {
-			printf("^%s\n", sha1_to_hex(sha1));
+			if (!strcmp(arg, "--revs-only")) {
+				revs_only = 1;
+				continue;
+			}
+			if (!strcmp(arg, "--no-revs")) {
+				no_revs = 1;
+				continue;
+			}
+			if (!strcmp(arg, "--verify")) {
+				revs_only = 1;
+				do_rev_argument = 0;
+				single_rev = 1;
+				continue;
+			}
+			if (!strcmp(arg, "--not")) {
+				show_type ^= REVERSED;
+				continue;
+			}
+			show_arg(arg);
 			continue;
 		}
 		dotdot = strstr(arg, "..");
@@ -51,20 +193,41 @@ int main(int argc, char **argv)
 			unsigned char end[20];
 			char *n = dotdot+2;
 			*dotdot = 0;
-			if (!get_sha1(arg, sha1)) {
+			if (!get_extended_sha1(arg, sha1)) {
 				if (!*n)
 					n = "HEAD";
-				if (!get_sha1(n, end)) {
-					printf("%s\n", sha1_to_hex(end));
-					printf("^%s\n", sha1_to_hex(sha1));
+				if (!get_extended_sha1(n, end)) {
+					if (no_revs)
+						continue;
+					def = NULL;
+					show_rev(NORMAL, end);
+					show_rev(REVERSED, sha1);
 					continue;
 				}
 			}
 			*dotdot = '.';
 		}
-		printf("%s\n", arg);
+		if (!get_extended_sha1(arg, sha1)) {
+			if (no_revs)
+				continue;
+			def = NULL;
+			show_rev(NORMAL, sha1);
+			continue;
+		}
+		if (*arg == '^' && !get_extended_sha1(arg+1, sha1)) {
+			if (no_revs)
+				continue;
+			def = NULL;
+			show_rev(REVERSED, sha1);
+			continue;
+		}
+		show_default();
+		show_norev(arg);
+	}
+	show_default();
+	if (single_rev && output_revs != 1) {
+		fprintf(stderr, "Needed a single revision\n");
+		exit(1);
 	}
-	if (def)
-		printf("%s\n", def);
 	return 0;
 }