X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=revision.h;h=7791a72e0abc7b7fad4b99aadbbe2e604b03c881;hb=c9823a427a0a7aabc4f840a90e82548e91f9bdd6;hp=4f140ca611236bdc4dd32c436616cafe7ef02249;hpb=458754a9fe2c2e889e38d1f4f53d5d457eba6faa;p=git.git

diff --git a/revision.h b/revision.h
index 4f140ca6..7791a72e 100644
--- a/revision.h
+++ b/revision.h
@@ -25,6 +25,7 @@ struct revision {
 	unsigned char sha1[20];
 	unsigned long date;
 	struct parent *parent;
+	char tag[1];
 };
 
 static struct revision **revs;
@@ -51,13 +52,17 @@ static int find_rev(unsigned char *sha1)
 	return -first-1;
 }
 
-static struct revision *lookup_rev(unsigned char *sha1)
+static struct revision *lookup_rev(unsigned char *sha1, const char *tag)
 {
 	int pos = find_rev(sha1);
 	struct revision *n;
 
-	if (pos >= 0)
-		return revs[pos];
+	if (pos >= 0) {
+		n = revs[pos];
+		if (strcmp(n->tag, tag))
+			error("expected tag %s on object %s: got %s", tag, sha1_to_hex(sha1), n->tag);
+		return n;
+	}
 	
 	pos = -pos-1;
 
@@ -65,11 +70,12 @@ static struct revision *lookup_rev(unsigned char *sha1)
 		rev_allocs = alloc_nr(rev_allocs);
 		revs = realloc(revs, rev_allocs * sizeof(struct revision *));
 	}
-	n = malloc(sizeof(struct revision));
+	n = malloc(sizeof(struct revision) + strlen(tag));
 
 	n->flags = 0;
 	memcpy(n->sha1, sha1, 20);
 	n->parent = NULL;
+	strcpy(n->tag, tag);
 
 	/* Insert it into the right place */
 	memmove(revs + pos + 1, revs + pos, (nr_revs - pos) * sizeof(struct revision *));
@@ -79,9 +85,9 @@ static struct revision *lookup_rev(unsigned char *sha1)
 	return n;
 }
 
-static struct revision *add_relationship(struct revision *rev, unsigned char *needs)
+static struct revision *add_relationship(struct revision *rev, unsigned char *needs, const char *tag)
 {
-	struct revision *parent_rev = lookup_rev(needs);
+	struct revision *parent_rev = lookup_rev(needs, tag);
 	struct parent **pp = &rev->parent, *p;
 
 	while ((p = *pp) != NULL) {
@@ -97,18 +103,62 @@ static struct revision *add_relationship(struct revision *rev, unsigned char *ne
 	return parent_rev;
 }
 
-static void mark_reachable(struct revision *rev)
+static void mark_reachable(struct revision *rev, unsigned int mask)
 {
 	struct parent *p = rev->parent;
 
 	/* If we've been here already, don't bother */
-	if (rev->flags & REACHABLE)
+	if (rev->flags & mask)
 		return;
-	rev->flags |= REACHABLE | USED;
+	rev->flags |= mask | USED;
 	while (p) {
-		mark_reachable(p->parent);
+		mark_reachable(p->parent, mask);
 		p = p->next;
 	}
 }
 
+static unsigned long parse_commit_date(const char *buf)
+{
+	unsigned long date;
+
+	if (memcmp(buf, "author", 6))
+		return 0;
+	while (*buf++ != '\n')
+		/* nada */;
+	if (memcmp(buf, "committer", 9))
+		return 0;
+	while (*buf++ != '>')
+		/* nada */;
+	date = strtoul(buf, NULL, 10);
+	if (date == ULONG_MAX)
+		date = 0;
+	return date;
+}
+
+static struct revision * parse_commit(unsigned char *sha1)
+{
+	struct revision *rev = lookup_rev(sha1, "commit");
+
+	if (!(rev->flags & SEEN)) {
+		void *buffer, *bufptr;
+		unsigned long size;
+		char type[20];
+		unsigned char parent[20];
+
+		rev->flags |= SEEN;
+		buffer = bufptr = read_sha1_file(sha1, type, &size);
+		if (!buffer || strcmp(type, "commit"))
+			die("%s is not a commit object", sha1_to_hex(sha1));
+		bufptr += 46; /* "tree " + "hex sha1" + "\n" */
+		while (!memcmp(bufptr, "parent ", 7) && !get_sha1_hex(bufptr+7, parent)) {
+			add_relationship(rev, parent, "commit");
+			parse_commit(parent);
+			bufptr += 48;	/* "parent " + "hex sha1" + "\n" */
+		}
+		rev->date = parse_commit_date(bufptr);
+		free(buffer);
+	}
+	return rev;
+}
+
 #endif /* REVISION_H */