X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-tree.c;h=3c54769258b82a9384248fbf10530e25d8b2dd8f;hb=d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6;hp=7669c5ed18239d9306a77dac3ecebc36f4e1adcd;hpb=771364af0ebc34ba968590eeebf0b78ee148f0a5;p=git.git

diff --git a/rev-tree.c b/rev-tree.c
index 7669c5ed..3c547692 100644
--- a/rev-tree.c
+++ b/rev-tree.c
@@ -1,161 +1,57 @@
+#define _XOPEN_SOURCE /* glibc2 needs this */
+#define _BSD_SOURCE /* for tm.tm_gmtoff */
+#include <time.h>
+#include <ctype.h>
+
 #include "cache.h"
+#include "revision.h"
 
 /*
- * The low 16 bits of the "flags" field shows whether
- * a commit is part of the path to the root for that
- * parent.
- *
- * Bit 16 is an internal flag that we've seen the
- * definition for this rev, and not just seen it as
- * a parent target.
+ * revision.h leaves the low 16 bits of the "flags" field of the
+ * revision data structure unused. We use it for a "reachable from
+ * this commit <N>" bitmask.
  */
-#define MAX_COMMITS (16)
-#define marked(rev)	((rev)->flags & 0xffff)
-#define SEEN 0x10000
+#define MAX_COMMITS 16
 
 static int show_edges = 0;
-
-struct parent {
-	struct revision *parent;
-	struct parent *next;
-};
-
-struct revision {
-	unsigned int flags;
-	unsigned char sha1[20];
-	struct parent *parent;
-};
-
-static struct revision **revs;
-static int nr_revs, rev_allocs;
-
-static int find_rev(unsigned char *sha1)
-{
-	int first = 0, last = nr_revs;
-
-	while (first < last) {
-		int next = (first + last) / 2;
-		struct revision *rev = revs[next];
-		int cmp;
-
-		cmp = memcmp(sha1, rev->sha1, 20);
-		if (!cmp)
-			return next;
-		if (cmp < 0) {
-			last = next;
-			continue;
-		}
-		first = next+1;
-	}
-	return -first-1;
-}
-
-static struct revision *lookup_rev(unsigned char *sha1)
-{
-	int pos = find_rev(sha1);
-	struct revision *n;
-
-	if (pos >= 0)
-		return revs[pos];
-	
-	pos = -pos-1;
-
-	if (rev_allocs == nr_revs) {
-		rev_allocs = alloc_nr(rev_allocs);
-		revs = realloc(revs, rev_allocs * sizeof(struct revision *));
-	}
-	n = malloc(sizeof(struct revision));
-
-	n->flags = 0;
-	memcpy(n->sha1, sha1, 20);
-	n->parent = NULL;
-
-	/* Insert it into the right place */
-	memmove(revs + pos + 1, revs + pos, (nr_revs - pos) * sizeof(struct revision *));
-	revs[pos] = n;
-	nr_revs++;
-
-	return n;
-}
-
-static int add_relationship(struct revision *rev, unsigned char *parent_sha)
-{
-	struct revision *parent_rev = lookup_rev(parent_sha);
-	struct parent **pp = &rev->parent, *p;
-
-	while ((p = *pp) != NULL) {
-		if (p->parent == parent_rev)
-			return 0;
-		pp = &p->next;
-	}
-
-	p = malloc(sizeof(*p));
-	p->parent = parent_rev;
-	p->next = NULL;
-	*pp = p;
-	return 1;
-}
-
-static int parse_commit(unsigned char *sha1)
-{
-	struct revision *rev = lookup_rev(sha1);
-
-	if (!(rev->flags & SEEN)) {
-		void *buffer;
-		unsigned long size;
-		char type[20];
-		unsigned char parent[20];
-
-		rev->flags |= SEEN;
-		buffer = read_sha1_file(sha1, type, &size);
-		if (!buffer || strcmp(type, "commit"))
-			return -1;
-		buffer += 46; /* "tree " + "hex sha1" + "\n" */
-		while (!memcmp(buffer, "parent ", 7) && !get_sha1_hex(buffer+7, parent)) {
-			add_relationship(rev, parent);
-			parse_commit(parent);
-			buffer += 48;	/* "parent " + "hex sha1" + "\n" */
-		}
-	}
-	return 0;	
-}
+static int basemask = 0;
 
 static void read_cache_file(const char *path)
 {
 	FILE *file = fopen(path, "r");
-	char line[100];
+	char line[500];
 
 	if (!file)
-		usage("bad revtree cache file (%s)", path);
+		die("bad revtree cache file (%s)", path);
 
 	while (fgets(line, sizeof(line), file)) {
-		unsigned char sha1[20], parent[20];
+		unsigned long date;
+		unsigned char sha1[20];
 		struct revision *rev;
-
-		if (get_sha1_hex(line, sha1) || get_sha1_hex(line + 41, parent))
-			usage("bad rev-tree cache file %s", path);
-		rev = lookup_rev(sha1);
+		const char *buf;
+
+		if (sscanf(line, "%lu", &date) != 1)
+			break;
+		buf = strchr(line, ' ');
+		if (!buf)
+			break;
+		if (get_sha1_hex(buf+1, sha1))
+			break;
+		rev = lookup_rev(sha1, "commit");
 		rev->flags |= SEEN;
-		add_relationship(rev, parent);
+		rev->date = date;
+
+		/* parents? */
+		while ((buf = strchr(buf+1, ' ')) != NULL) {
+			unsigned char parent[20];
+			if (get_sha1_hex(buf + 1, parent))
+				break;
+			add_relationship(rev, parent, "commit");
+		}
 	}
 	fclose(file);
 }
 
-static void mark_sha1_path(struct revision *rev, unsigned int mask)
-{
-	struct parent *p;
-
-	if (rev->flags & mask)
-		return;
-
-	rev->flags |= mask;
-	p = rev->parent;
-	while (p) {
-		mark_sha1_path(p->parent, mask);
-		p = p->next;
-	}
-}
-
 /*
  * Some revisions are less interesting than others.
  *
@@ -180,6 +76,9 @@ static int interesting(struct revision *rev)
 		}
 		return 0;
 	}
+	if (mask & basemask)
+		return 0;
+
 	return 1;
 }
 
@@ -214,6 +113,10 @@ int main(int argc, char **argv)
 			continue;
 		}
 
+		if (arg[0] == '^') {
+			arg++;
+			basemask |= 1<<nr;
+		}
 		if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
 			usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
 		parse_commit(sha1[nr]);
@@ -224,7 +127,7 @@ int main(int argc, char **argv)
 	 * Now we have the maximal tree. Walk the different sha files back to the root.
 	 */
 	for (i = 0; i < nr; i++)
-		mark_sha1_path(lookup_rev(sha1[i]), 1 << i);
+		mark_reachable(lookup_rev(sha1[i], "commit"), 1 << i);
 
 	/*
 	 * Now print out the results..
@@ -236,7 +139,7 @@ int main(int argc, char **argv)
 		if (!interesting(rev))
 			continue;
 
-		printf("%s:%d", sha1_to_hex(rev->sha1), marked(rev));
+		printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev));
 		p = rev->parent;
 		while (p) {
 			printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent));