X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-list.c;h=a8fe83c5d805ea8944a07be3832977487b41080d;hb=6fe31e2e4cdb7ed5333107174e23fbf2e226e370;hp=897a0e7ad84b8e42e498770717d9ca05cca19e63;hpb=51b1e1713b1ed8e962e994cd0850ea439ad8c3de;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 897a0e7a..a8fe83c5 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -1,121 +1,188 @@
 #include "cache.h"
+#include "refs.h"
+#include "tag.h"
 #include "commit.h"
-#include "epoch.h"
+#include "tree.h"
+#include "blob.h"
+#include "tree-walk.h"
+#include "diff.h"
+#include "revision.h"
 
-#define SEEN		(1u << 0)
-#define INTERESTING	(1u << 1)
-#define COUNTED		(1u << 2)
-#define SHOWN		(LAST_EPOCH_FLAG << 2)
+/* bits #0-15 in revision.h */
+
+#define COUNTED		(1u<<16)
 
 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\n"
-		      "  --pretty\n"
-		      "  --merge-order [ --show-breaks ]";
+"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
+"  limiting output:\n"
+"    --max-count=nr\n"
+"    --max-age=epoch\n"
+"    --min-age=epoch\n"
+"    --sparse\n"
+"    --no-merges\n"
+"    --remove-empty\n"
+"    --all\n"
+"  ordering output:\n"
+"    --topo-order\n"
+"    --date-order\n"
+"  formatting output:\n"
+"    --parents\n"
+"    --objects | --objects-edge\n"
+"    --unpacked\n"
+"    --header | --pretty\n"
+"    --abbrev=nr | --no-abbrev\n"
+"    --abbrev-commit\n"
+"  special purpose:\n"
+"    --bisect"
+;
+
+struct rev_info revs;
 
 static int bisect_list = 0;
 static int verbose_header = 0;
-static int show_parents = 0;
+static int abbrev = DEFAULT_ABBREV;
+static int abbrev_commit = 0;
+static int show_timestamp = 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 const char *commit_prefix = "";
 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
-static int merge_order = 0;
-static int show_breaks = 0;
 
 static void show_commit(struct commit *commit)
 {
-	commit->object.flags |= SHOWN;
-	if (show_breaks) {
-		prefix = "| ";
-		if (commit->object.flags & DISCONTINUITY) {
-			prefix = "^ ";     
-		} else if (commit->object.flags & BOUNDARY) {
-			prefix = "= ";
-		} 
-        }        		
-	printf("%s%s", prefix, sha1_to_hex(commit->object.sha1));
-	if (show_parents) {
+	if (show_timestamp)
+		printf("%lu ", commit->date);
+	if (commit_prefix[0])
+		fputs(commit_prefix, stdout);
+	if (commit->object.flags & BOUNDARY)
+		putchar('-');
+	if (abbrev_commit && abbrev)
+		fputs(find_unique_abbrev(commit->object.sha1, abbrev), stdout);
+	else
+		fputs(sha1_to_hex(commit->object.sha1), stdout);
+	if (revs.parents) {
 		struct commit_list *parents = commit->parents;
 		while (parents) {
-			printf(" %s", sha1_to_hex(parents->item->object.sha1));
+			struct object *o = &(parents->item->object);
 			parents = parents->next;
+			if (o->flags & TMP_MARK)
+				continue;
+			printf(" %s", sha1_to_hex(o->sha1));
+			o->flags |= TMP_MARK;
 		}
+		/* TMP_MARK is a general purpose flag that can
+		 * be used locally, but the user should clean
+		 * things up after it is done with them.
+		 */
+		for (parents = commit->parents;
+		     parents;
+		     parents = parents->next)
+			parents->item->object.flags &= ~TMP_MARK;
 	}
-	putchar('\n');
+	if (commit_format == CMIT_FMT_ONELINE)
+		putchar(' ');
+	else
+		putchar('\n');
+
 	if (verbose_header) {
 		static char pretty_header[16384];
-		pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
+		pretty_print_commit(commit_format, commit, ~0, pretty_header, sizeof(pretty_header), abbrev);
 		printf("%s%c", pretty_header, hdr_termination);
-	}	
-}
-
-static int filter_commit(struct commit * commit)
-{
-	if (commit->object.flags & (UNINTERESTING|SHOWN))
-		return CONTINUE;
-	if (min_age != -1 && (commit->date > min_age))
-		return CONTINUE;
-	if (max_age != -1 && (commit->date < max_age))
-		return STOP;
-	if (max_count != -1 && !max_count--)
-		return STOP;
-	return DO;
+	}
+	fflush(stdout);
 }
 
-static int process_commit(struct commit * commit)
+static struct object_list **process_blob(struct blob *blob,
+					 struct object_list **p,
+					 struct name_path *path,
+					 const char *name)
 {
-	int action=filter_commit(commit);
-
-	if (action == STOP) {
-		return STOP;
-	}
-
-	if (action == CONTINUE) {
-		return CONTINUE;
-	}
-
-	show_commit(commit);
-
-	return CONTINUE;
+	struct object *obj = &blob->object;
+
+	if (!revs.blob_objects)
+		return p;
+	if (obj->flags & (UNINTERESTING | SEEN))
+		return p;
+	obj->flags |= SEEN;
+	return add_object(obj, p, path, name);
 }
 
-static void show_commit_list(struct commit_list *list)
+static struct object_list **process_tree(struct tree *tree,
+					 struct object_list **p,
+					 struct name_path *path,
+					 const char *name)
 {
-	while (list) {
-		struct commit *commit = pop_most_recent_commit(&list, SEEN);
-
-		if (process_commit(commit) == STOP)
-			break;
+	struct object *obj = &tree->object;
+	struct tree_entry_list *entry;
+	struct name_path me;
+
+	if (!revs.tree_objects)
+		return p;
+	if (obj->flags & (UNINTERESTING | SEEN))
+		return p;
+	if (parse_tree(tree) < 0)
+		die("bad tree object %s", sha1_to_hex(obj->sha1));
+	obj->flags |= SEEN;
+	p = add_object(obj, p, path, name);
+	me.up = path;
+	me.elem = name;
+	me.elem_len = strlen(name);
+	entry = tree->entries;
+	tree->entries = NULL;
+	while (entry) {
+		struct tree_entry_list *next = entry->next;
+		if (entry->directory)
+			p = process_tree(entry->item.tree, p, &me, entry->name);
+		else
+			p = process_blob(entry->item.blob, p, &me, entry->name);
+		free(entry);
+		entry = next;
 	}
+	return p;
 }
 
-static void mark_parents_uninteresting(struct commit *commit)
+static void show_commit_list(struct rev_info *revs)
 {
-	struct commit_list *parents = commit->parents;
+	struct commit *commit;
+	struct object_list *objects = NULL, **p = &objects, *pending;
 
-	while (parents) {
-		struct commit *commit = parents->item;
-		commit->object.flags |= UNINTERESTING;
-		parents = parents->next;
+	while ((commit = get_revision(revs)) != NULL) {
+		p = process_tree(commit->tree, p, NULL, "");
+		show_commit(commit);
 	}
-}
-
-static int everybody_uninteresting(struct commit_list *list)
-{
-	while (list) {
-		struct commit *commit = list->item;
-		list = list->next;
-		if (commit->object.flags & UNINTERESTING)
+	for (pending = revs->pending_objects; pending; pending = pending->next) {
+		struct object *obj = pending->item;
+		const char *name = pending->name;
+		if (obj->flags & (UNINTERESTING | SEEN))
+			continue;
+		if (obj->type == tag_type) {
+			obj->flags |= SEEN;
+			p = add_object(obj, p, NULL, name);
+			continue;
+		}
+		if (obj->type == tree_type) {
+			p = process_tree((struct tree *)obj, p, NULL, name);
+			continue;
+		}
+		if (obj->type == blob_type) {
+			p = process_blob((struct blob *)obj, p, NULL, name);
 			continue;
-		return 0;
+		}
+		die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
+	}
+	while (objects) {
+		/* An object with name "foo\n0000000..." can be used to
+		 * confuse downstream git-pack-objects very badly.
+		 */
+		const char *ep = strchr(objects->name, '\n');
+		if (ep) {
+			printf("%s %.*s\n", sha1_to_hex(objects->item->sha1),
+			       (int) (ep - objects->name),
+			       objects->name);
+		}
+		else
+			printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
+		objects = objects->next;
 	}
-	return 1;
 }
 
 /*
@@ -135,7 +202,8 @@ static int count_distance(struct commit_list *entry)
 
 		if (commit->object.flags & (UNINTERESTING | COUNTED))
 			break;
-		nr++;
+		if (!revs.prune_fn || (commit->object.flags & TREECHANGE))
+			nr++;
 		commit->object.flags |= COUNTED;
 		p = commit->parents;
 		entry = p;
@@ -147,6 +215,7 @@ static int count_distance(struct commit_list *entry)
 			}
 		}
 	}
+
 	return nr;
 }
 
@@ -167,15 +236,20 @@ static struct commit_list *find_bisection(struct commit_list *list)
 	nr = 0;
 	p = list;
 	while (p) {
-		nr++;
+		if (!revs.prune_fn || (p->item->object.flags & TREECHANGE))
+			nr++;
 		p = p->next;
 	}
 	closest = 0;
 	best = list;
 
-	p = list;
-	while (p) {
-		int distance = count_distance(p);
+	for (p = list; p; p = p->next) {
+		int distance;
+
+		if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
+			continue;
+
+		distance = count_distance(p);
 		clear_distance(list);
 		if (nr - distance < distance)
 			distance = nr - distance;
@@ -183,126 +257,131 @@ static struct commit_list *find_bisection(struct commit_list *list)
 			best = p;
 			closest = distance;
 		}
-		p = p->next;
 	}
 	if (best)
 		best->next = NULL;
 	return best;
 }
 
-struct commit_list *limit_list(struct commit_list *list)
+static void mark_edge_parents_uninteresting(struct commit *commit)
 {
-	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;
+	struct commit_list *parents;
+
+	for (parents = commit->parents; parents; parents = parents->next) {
+		struct commit *parent = parents->item;
+		if (!(parent->object.flags & UNINTERESTING))
 			continue;
+		mark_tree_uninteresting(parent->tree);
+		if (revs.edge_hint && !(parent->object.flags & SHOWN)) {
+			parent->object.flags |= SHOWN;
+			printf("-%s\n", sha1_to_hex(parent->object.sha1));
 		}
-		p = &commit_list_insert(commit, p)->next;
-	} while (list);
-	if (bisect_list)
-		newlist = find_bisection(newlist);
-	return newlist;
+	}
 }
 
-static enum cmit_fmt get_commit_format(const char *arg)
+static void mark_edges_uninteresting(struct commit_list *list)
 {
-	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)
+	for ( ; list; list = list->next) {
+		struct commit *commit = list->item;
+
+		if (commit->object.flags & UNINTERESTING) {
+			mark_tree_uninteresting(commit->tree);
+			continue;
+		}
+		mark_edge_parents_uninteresting(commit);
+	}
+}
+
+int main(int argc, const char **argv)
 {
-	struct commit_list *list = NULL;
-	int i, limited = 0;
+	struct commit_list *list;
+	int i;
+
+	argc = setup_revisions(argc, argv, &revs, NULL);
 
 	for (i = 1 ; i < argc; i++) {
-		int flags;
-		char *arg = argv[i];
-		unsigned char sha1[20];
-		struct commit *commit;
+		const char *arg = argv[i];
 
-		if (!strncmp(arg, "--max-count=", 12)) {
-			max_count = atoi(arg + 12);
+		/* accept -<digit>, like traditilnal "head" */
+		if ((*arg == '-') && isdigit(arg[1])) {
+			revs.max_count = atoi(arg + 1);
 			continue;
 		}
-		if (!strncmp(arg, "--max-age=", 10)) {
-			max_age = atoi(arg + 10);
+		if (!strcmp(arg, "-n")) {
+			if (++i >= argc)
+				die("-n requires an argument");
+			revs.max_count = atoi(argv[i]);
 			continue;
 		}
-		if (!strncmp(arg, "--min-age=", 10)) {
-			min_age = atoi(arg + 10);
+		if (!strncmp(arg,"-n",2)) {
+			revs.max_count = atoi(arg + 2);
 			continue;
 		}
 		if (!strcmp(arg, "--header")) {
 			verbose_header = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--no-abbrev")) {
+			abbrev = 0;
+			continue;
+		}
+		if (!strcmp(arg, "--abbrev")) {
+			abbrev = DEFAULT_ABBREV;
+			continue;
+		}
+		if (!strcmp(arg, "--abbrev-commit")) {
+			abbrev_commit = 1;
+			continue;
+		}
+		if (!strncmp(arg, "--abbrev=", 9)) {
+			abbrev = strtoul(arg + 9, NULL, 10);
+			if (abbrev && abbrev < MINIMUM_ABBREV)
+				abbrev = MINIMUM_ABBREV;
+			else if (40 < abbrev)
+				abbrev = 40;
+			continue;
+		}
 		if (!strncmp(arg, "--pretty", 8)) {
 			commit_format = get_commit_format(arg+8);
 			verbose_header = 1;
 			hdr_termination = '\n';
-			prefix = "commit ";
+			if (commit_format == CMIT_FMT_ONELINE)
+				commit_prefix = "";
+			else
+				commit_prefix = "commit ";
 			continue;
 		}
-		if (!strcmp(arg, "--parents")) {
-			show_parents = 1;
+		if (!strcmp(arg, "--timestamp")) {
+			show_timestamp = 1;
 			continue;
 		}
 		if (!strcmp(arg, "--bisect")) {
 			bisect_list = 1;
 			continue;
 		}
-		if (!strncmp(arg, "--merge-order", 13)) {
-		        merge_order = 1;
-			continue;
-		}
-		if (!strncmp(arg, "--show-breaks", 13)) {
-			show_breaks = 1;
-			continue;
-		}
+		usage(rev_list_usage);
 
-		flags = 0;
-		if (*arg == '^') {
-			flags = UNINTERESTING;
-			arg++;
-			limited = 1;
-		}
-		if (get_sha1(arg, sha1) || (show_breaks && !merge_order))
-			usage(rev_list_usage);
-		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 (!list)
+	list = revs.commits;
+
+	if (!list &&
+	    (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
 		usage(rev_list_usage);
 
-	if (!merge_order) {		
-	        if (limited)
-			list = limit_list(list);
-		show_commit_list(list);
-	} else {
-		if (sort_list_in_merge_order(list, &process_commit)) {
-			  die("merge order sort failed\n");
-		}
-	}
+	save_commit_buffer = verbose_header;
+	track_object_refs = 0;
+	if (bisect_list)
+		revs.limited = 1;
+
+	prepare_revision_walk(&revs);
+	if (revs.tree_objects)
+		mark_edges_uninteresting(revs.commits);
+
+	if (bisect_list)
+		revs.commits = find_bisection(revs.commits);
+
+	show_commit_list(&revs);
 
 	return 0;
 }