X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-list.c;h=93bee1962bed94df4b91d54e7f38d5e204451a88;hb=866b973b5d418622cbe28fea85169379dcb30f9d;hp=77bfc29db1aad08ba9d7d87ce08d33d4a88e74e3;hpb=58e28af6a4d4d4faa1fa628e91c0b33c2b87aade;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 77bfc29d..93bee196 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -1,23 +1,79 @@
 #include "cache.h"
 #include "commit.h"
 
+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";
+
 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 (argc != 2 || get_sha1_hex(argv[1], sha1))
-		usage("rev-list <commit-id>");
+		if (nr_sha > 2 || get_sha1(arg, sha1[nr_sha]))
+			usage(rev_list_usage);
+		nr_sha++;
+	}
 
-	commit = lookup_commit(sha1);
+	if (!nr_sha)
+		usage(rev_list_usage);
+
+	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 (commit == end)
+			break;
+		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));
+		if (verbose_header)
+			printf("%s%c", commit->buffer, 0);
 	} while (list);
 	return 0;
 }