-#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"
+#include "commit.h"
/*
* revision.h leaves the low 16 bits of the "flags" field of the
* this commit <N>" bitmask.
*/
#define MAX_COMMITS 16
+#define REACHABLE (1U << 16)
+
+#define cmit_flags(cmit) ((cmit)->object.flags & ~REACHABLE)
static int show_edges = 0;
static int basemask = 0;
static void read_cache_file(const char *path)
{
- FILE *file = fopen(path, "r");
- 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);
-}
-
-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;
- }
+ die("no revtree cache file yet");
}
/*
* And sometimes we're only interested in "edge" commits, ie
* 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 = cmit_flags(rev);
if (!mask)
return 0;
if (show_edges) {
- struct parent *p = rev->parent;
+ struct commit_list *p = rev->parents;
while (p) {
- if (mask != marked(p->parent))
+ if (mask != cmit_flags(p->item))
return 1;
p = p->next;
}
}
/*
- * Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
+ * Usage: git-rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
*
* The cache-file can be quite important for big trees. This is an
* expensive operation if you have to walk the whole chain of
int i;
int nr = 0;
unsigned char sha1[MAX_COMMITS][20];
+ struct commit_list *list = NULL;
/*
* First - pick up all the revisions we can (both from
*/
for (i = 1; i < argc ; i++) {
char *arg = argv[i];
+ struct commit *commit;
if (!strcmp(arg, "--cache")) {
- read_cache_file(argv[2]);
- i++;
+ read_cache_file(argv[++i]);
continue;
}
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]);
+ if (nr >= MAX_COMMITS || get_sha1(arg, sha1[nr]))
+ usage("git-rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
+
+ commit = lookup_commit_reference(sha1[nr]);
+ if (!commit || parse_commit(commit) < 0)
+ die("bad commit object");
+ commit_list_insert(commit, &list);
nr++;
}
+ /*
+ * Parse all the commits in date order.
+ *
+ * We really should stop once we know enough, but that's a
+ * decision that isn't trivial to make.
+ */
+ while (list)
+ pop_most_recent_commit(&list, REACHABLE);
+
/*
* 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_commit_reference(sha1[i])->object, 1 << i);
/*
* Now print out the results..
*/
- for (i = 0; i < nr_revs; i++) {
- struct revision *rev = revs[i];
- struct parent *p;
+ for (i = 0; i < nr_objs; i++) {
+ struct object *obj = objs[i];
+ struct commit *commit;
+ struct commit_list *p;
+
+ if (obj->type != commit_type)
+ continue;
+
+ commit = (struct commit *) obj;
- if (!interesting(rev))
+ if (!interesting(commit))
continue;
- printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev));
- p = rev->parent;
+ printf("%lu %s:%d", commit->date, sha1_to_hex(obj->sha1),
+ cmit_flags(commit));
+ p = commit->parents;
while (p) {
- printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent));
+ printf(" %s:%d", sha1_to_hex(p->item->object.sha1),
+ cmit_flags(p->item));
p = p->next;
}
printf("\n");