X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-list.c;h=a8fe83c5d805ea8944a07be3832977487b41080d;hb=1b9bc5a7b7434d771726011613a00cb202bd9f44;hp=8e4d83efba369c5ce925fd1e22d36a768917147b;hpb=3bddd7dbba2f178e7fab5916522bf398eb55ffc0;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 8e4d83ef..a8fe83c5 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -4,12 +4,13 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
+#include "tree-walk.h"
 #include "diff.h"
 #include "revision.h"
 
-/* bits #0-4 in revision.h */
+/* bits #0-15 in revision.h */
 
-#define COUNTED		(1u<<5)
+#define COUNTED		(1u<<16)
 
 static const char rev_list_usage[] =
 "git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -30,6 +31,7 @@ static const char rev_list_usage[] =
 "    --unpacked\n"
 "    --header | --pretty\n"
 "    --abbrev=nr | --no-abbrev\n"
+"    --abbrev-commit\n"
 "  special purpose:\n"
 "    --bisect"
 ;
@@ -39,15 +41,25 @@ struct rev_info revs;
 static int bisect_list = 0;
 static int verbose_header = 0;
 static int abbrev = DEFAULT_ABBREV;
-static int show_parents = 0;
+static int abbrev_commit = 0;
+static int show_timestamp = 0;
 static int hdr_termination = 0;
 static const char *commit_prefix = "";
 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 
 static void show_commit(struct commit *commit)
 {
-	printf("%s%s", commit_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) {
 			struct object *o = &(parents->item->object);
@@ -190,7 +202,7 @@ static int count_distance(struct commit_list *entry)
 
 		if (commit->object.flags & (UNINTERESTING | COUNTED))
 			break;
-		if (!revs.paths || (commit->object.flags & TREECHANGE))
+		if (!revs.prune_fn || (commit->object.flags & TREECHANGE))
 			nr++;
 		commit->object.flags |= COUNTED;
 		p = commit->parents;
@@ -224,7 +236,7 @@ static struct commit_list *find_bisection(struct commit_list *list)
 	nr = 0;
 	p = list;
 	while (p) {
-		if (!revs.paths || (p->item->object.flags & TREECHANGE))
+		if (!revs.prune_fn || (p->item->object.flags & TREECHANGE))
 			nr++;
 		p = p->next;
 	}
@@ -234,7 +246,7 @@ static struct commit_list *find_bisection(struct commit_list *list)
 	for (p = list; p; p = p->next) {
 		int distance;
 
-		if (revs.paths && !(p->item->object.flags & TREECHANGE))
+		if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
 			continue;
 
 		distance = count_distance(p);
@@ -313,6 +325,14 @@ int main(int argc, const char **argv)
 			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)
@@ -331,8 +351,8 @@ int main(int argc, const char **argv)
 				commit_prefix = "commit ";
 			continue;
 		}
-		if (!strcmp(arg, "--parents")) {
-			show_parents = 1;
+		if (!strcmp(arg, "--timestamp")) {
+			show_timestamp = 1;
 			continue;
 		}
 		if (!strcmp(arg, "--bisect")) {
@@ -349,6 +369,11 @@ int main(int argc, const char **argv)
 	    (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
 		usage(rev_list_usage);
 
+	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);
@@ -356,9 +381,6 @@ int main(int argc, const char **argv)
 	if (bisect_list)
 		revs.commits = find_bisection(revs.commits);
 
-	save_commit_buffer = verbose_header;
-	track_object_refs = 0;
-
 	show_commit_list(&revs);
 
 	return 0;