development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Port rev-tree to parsing functions

Browse source 
This ports rev-tree to use the parsing functions introduced in the
previous patches.

Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Daniel Barkalow 2005-04-18 11:39:48 -07:00 committed by Linus Torvalds
parent 175785e5ff
commit 5873b67eef
2 changed files with 38 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -52,8 +52,8 @@ checkout-cache: checkout-cache.o read-cache.o
diff-tree: diff-tree.o read-cache.o diff-tree: diff-tree.o read-cache.o
$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS) $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
rev-tree: rev-tree.o read-cache.o rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS) $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
show-files: show-files.o read-cache.o show-files: show-files.o read-cache.o
$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS) $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)

82
rev-tree.c
View file

@ -4,7 +4,7 @@
#include <ctype.h> #include <ctype.h>
#include "cache.h" #include "cache.h"
#include "revision.h" #include "commit.h"
/* /*
* revision.h leaves the low 16 bits of the "flags" field of the * revision.h leaves the low 16 bits of the "flags" field of the
@ -18,38 +18,7 @@ static int basemask = 0;
static void read_cache_file(const char *path) static void read_cache_file(const char *path)
{ {
FILE *file = fopen(path, "r"); die("no revtree cache file yet");
char line[500];
if (!file)
die("bad revtree cache file (%s)", path);
while (fgets(line, sizeof(line), file)) {
unsigned long date;
unsigned char sha1[20];
struct revision *rev;
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);
rev->flags |= SEEN;
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);
}
}
fclose(file);
} }
/* /*
@ -61,16 +30,16 @@ static void read_cache_file(const char *path)
* And sometimes we're only interested in "edge" commits, ie * And sometimes we're only interested in "edge" commits, ie
* places where the marking changes between parent and child. * places where the marking changes between parent and child.
*/ */
static int interesting(struct revision *rev) static int interesting(struct commit *rev)
{ {
unsigned mask = marked(rev); unsigned mask = rev->object.flags;
if (!mask) if (!mask)
return 0; return 0;
if (show_edges) { if (show_edges) {
struct parent *p = rev->parent; struct commit_list *p = rev->parents;
while (p) { while (p) {
if (mask != marked(p->parent)) if (mask != p->item->object.flags)
return 1; return 1;
p = p->next; p = p->next;
} }
@ -82,6 +51,19 @@ static int interesting(struct revision *rev)
return 1; return 1;
} }
void process_commit(unsigned char *sha1)
{
struct commit_list *parents;
struct commit *obj = lookup_commit(sha1);
parse_commit(obj);
parents = obj->parents;
while (parents) {
process_commit(parents->item->object.sha1);
parents = parents->next;
}
}
/* /*
* Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>] * Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
* *
@ -119,7 +101,7 @@ int main(int argc, char **argv)
} }
if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr])) if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]"); usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
parse_commit(sha1[nr]); process_commit(sha1[nr]);
nr++; nr++;
} }
@ -127,22 +109,30 @@ int main(int argc, char **argv)
* Now we have the maximal tree. Walk the different sha files back to the root. * Now we have the maximal tree. Walk the different sha files back to the root.
*/ */
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
mark_reachable(lookup_rev(sha1[i]), 1 << i); mark_reachable(&lookup_commit(sha1[i])->object, 1 << i);
/* /*
* Now print out the results.. * Now print out the results..
*/ */
for (i = 0; i < nr_revs; i++) { for (i = 0; i < nr_objs; i++) {
struct revision *rev = revs[i]; struct object *obj = objs[i];
struct parent *p; struct commit *commit;
struct commit_list *p;
if (!interesting(rev)) if (obj->type != commit_type)
continue; continue;
printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev)); commit = (struct commit *) obj;
p = rev->parent;
if (!interesting(commit))
continue;
printf("%lu %s:%d", commit->date, sha1_to_hex(obj->sha1),
obj->flags);
p = commit->parents;
while (p) { while (p) {
printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent)); printf(" %s:%d", sha1_to_hex(p->item->object.sha1),
p->item->object.flags);
p = p->next; p = p->next;
} }
printf("\n"); printf("\n");