X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-list.c;h=cb1de39f6e5e6d0853908e37511932973baaa67d;hb=8906300f65a3b0c3e061af9d2c7ba48fedfa26a4;hp=42fd154fc1a3b9a066a5d7d3ec997355e53f784e;hpb=3c249c950649a37f2871a8b193f01a0640a20aef;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 42fd154f..cb1de39f 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -1,23 +1,124 @@
 #include "cache.h"
 #include "commit.h"
 
+#define SEEN		(1u << 0)
+#define INTERESTING	(1u << 1)
+#define UNINTERESTING	(1u << 2)
+
+static const char rev_list_usage[] =
+	"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
+		      "  --max-count=nr\n"
+		      "  --max-age=epoch\n"
+		      "  --min-age=epoch\n"
+		      "  --header";
+
+static void mark_parents_uninteresting(struct commit *commit)
+{
+	struct commit_list *parents = commit->parents;
+
+	while (parents) {
+		struct commit *commit = parents->item;
+		commit->object.flags |= UNINTERESTING;
+		parents = parents->next;
+	}
+}
+
+static int everybody_uninteresting(struct commit_list *list)
+{
+	while (list) {
+		struct commit *commit = list->item;
+		list = list->next;
+		if (commit->object.flags & UNINTERESTING)
+			continue;
+		return 0;
+	}
+	return 1;
+}
+
 int main(int argc, char **argv)
 {
-	unsigned char sha1[20];
+	int nr_sha;
+	unsigned char sha1[2][20];
 	struct commit_list *list = NULL;
-	struct commit *commit;
+	struct commit *commit, *end;
+	int i, verbose_header = 0;
+	unsigned long max_age = -1;
+	unsigned long min_age = -1;
+	int max_count = -1;
+
+	nr_sha = 0;
+	for (i = 1 ; i < argc; i++) {
+		char *arg = argv[i];
+
+		if (!strncmp(arg, "--max-count=", 12)) {
+			max_count = atoi(arg + 12);
+			continue;
+		}
+		if (!strncmp(arg, "--max-age=", 10)) {
+			max_age = atoi(arg + 10);
+			continue;
+		}
+		if (!strncmp(arg, "--min-age=", 10)) {
+			min_age = atoi(arg + 10);
+			continue;
+		}
+		if (!strcmp(arg, "--header")) {
+			verbose_header = 1;
+			continue;
+		}
+
+		if (nr_sha > 2 || get_sha1(arg, sha1[nr_sha]))
+			usage(rev_list_usage);
+		nr_sha++;
+	}
 
-	if (argc != 2 || get_sha1(argv[1], sha1))
-		usage("rev-list <commit-id>");
+	if (!nr_sha)
+		usage(rev_list_usage);
 
-	commit = lookup_commit(sha1);
+	commit = lookup_commit_reference(sha1[0]);
 	if (!commit || parse_commit(commit) < 0)
-		die("bad commit object");
+		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);
-	do {
-		struct commit *commit = pop_most_recent_commit(&list, 0x1);
+	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;
+	}
+
+	while (list) {
+		struct commit *commit = pop_most_recent_commit(&list, SEEN);
+
+		if (commit->object.flags & UNINTERESTING)
+			continue;
+		if (min_age != -1 && (commit->date > min_age))
+			continue;
+		if (max_age != -1 && (commit->date < max_age))
+			break;
+		if (max_count != -1 && !max_count--)
+			break;
 		printf("%s\n", sha1_to_hex(commit->object.sha1));
-	} while (list);
+		if (verbose_header)
+			printf("%s%c", commit->buffer, 0);
+	}
 	return 0;
 }