X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-list.c;h=2b098c1e88ee60e8d81f6fc16bb246819711afe6;hb=000182eacf99cde27d5916aa415921924b82972c;hp=8775b6558d69686e8446a8a271be753bf939cdd0;hpb=81f2bb1f54b20abefa9d102ea98c4ac73d81a66d;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 8775b655..2b098c1e 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -15,12 +15,12 @@ static const char rev_list_usage[] =
 
 static int verbose_header = 0;
 static int show_parents = 0;
-static int pretty_print = 0;
 static int hdr_termination = 0;
 static const char *prefix = "";
 static unsigned long max_age = -1;
 static unsigned long min_age = -1;
 static int max_count = -1;
+static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 
 static void show_commit(struct commit *commit)
 {
@@ -34,13 +34,9 @@ static void show_commit(struct commit *commit)
 	}
 	putchar('\n');
 	if (verbose_header) {
-		const char *buf = commit->buffer;
-		if (pretty_print) {
-			static char pretty_header[16384];
-			pretty_print_commit(commit->buffer, ~0, pretty_header, sizeof(pretty_header));
-			buf = pretty_header;
-		}
-		printf("%s%c", buf, hdr_termination);
+		static char pretty_header[16384];
+		pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
+		printf("%s%c", pretty_header, hdr_termination);
 	}
 }
 
@@ -84,17 +80,49 @@ static int everybody_uninteresting(struct commit_list *list)
 	return 1;
 }
 
+struct commit_list *limit_list(struct commit_list *list)
+{
+	struct commit_list *newlist = NULL;
+	struct commit_list **p = &newlist;
+	do {
+		struct commit *commit = pop_most_recent_commit(&list, SEEN);
+		struct object *obj = &commit->object;
+
+		if (obj->flags & UNINTERESTING) {
+			mark_parents_uninteresting(commit);
+			if (everybody_uninteresting(list))
+				break;
+			continue;
+		}
+		p = &commit_list_insert(commit, p)->next;
+	} while (list);
+	return newlist;
+}
+
+static enum cmit_fmt get_commit_format(const char *arg)
+{
+	if (!*arg)
+		return CMIT_FMT_DEFAULT;
+	if (!strcmp(arg, "=raw"))
+		return CMIT_FMT_RAW;
+	if (!strcmp(arg, "=medium"))
+		return CMIT_FMT_MEDIUM;
+	if (!strcmp(arg, "=short"))
+		return CMIT_FMT_SHORT;
+	usage(rev_list_usage);	
+}			
+
+
 int main(int argc, char **argv)
 {
-	int nr_sha;
-	unsigned char sha1[2][20];
 	struct commit_list *list = NULL;
-	struct commit *commit, *end;
-	int i;
+	int i, limited = 0;
 
-	nr_sha = 0;
 	for (i = 1 ; i < argc; i++) {
+		int flags;
 		char *arg = argv[i];
+		unsigned char sha1[20];
+		struct commit *commit;
 
 		if (!strncmp(arg, "--max-count=", 12)) {
 			max_count = atoi(arg + 12);
@@ -112,9 +140,9 @@ int main(int argc, char **argv)
 			verbose_header = 1;
 			continue;
 		}
-		if (!strcmp(arg, "--pretty")) {
+		if (!strncmp(arg, "--pretty", 8)) {
+			commit_format = get_commit_format(arg+8);
 			verbose_header = 1;
-			pretty_print = 1;
 			hdr_termination = '\n';
 			prefix = "commit ";
 			continue;
@@ -124,43 +152,26 @@ int main(int argc, char **argv)
 			continue;
 		}
 
-		if (nr_sha > 2 || get_sha1(arg, sha1[nr_sha]))
+		flags = 0;
+		if (*arg == '^') {
+			flags = UNINTERESTING;
+			arg++;
+			limited = 1;
+		}
+		if (get_sha1(arg, sha1))
 			usage(rev_list_usage);
-		nr_sha++;
+		commit = lookup_commit_reference(sha1);
+		if (!commit || parse_commit(commit) < 0)
+			die("bad commit object %s", arg);
+		commit->object.flags |= flags;
+		commit_list_insert(commit, &list);
 	}
 
-	if (!nr_sha)
+	if (!list)
 		usage(rev_list_usage);
 
-	commit = lookup_commit_reference(sha1[0]);
-	if (!commit || parse_commit(commit) < 0)
-		die("bad starting commit object");
-
-	end = NULL;
-	if (nr_sha > 1) {
-		end = lookup_commit_reference(sha1[1]);
-		if (!end || parse_commit(end) < 0)
-			die("bad ending commit object");
-	}
-
-	commit_list_insert(commit, &list);
-	if (end) {
-		struct commit_list *newlist = NULL;
-		struct commit_list **p = &newlist;
-		do {
-			struct commit *commit = pop_most_recent_commit(&list, SEEN);
-			struct object *obj = &commit->object;
-
-			if (commit == end || (obj->flags & UNINTERESTING)) {
-				mark_parents_uninteresting(commit);
-				if (everybody_uninteresting(list))
-					break;
-				continue;
-			}
-			p = &commit_list_insert(commit, p)->next;
-		} while (list);
-		list = newlist;
-	}
+	if (limited)
+		list = limit_list(list);
 
 	show_commit_list(list);
 	return 0;