ls-tree: further cleanup to parallel ls-files.

diff --git a/commit.c b/commit.c
index 56192587afa7454e5db8c5ac3e4a937c1f0694ea..e867b86e6a10d64354226b04f71df98d7448e072 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1,8 +1,9 @@
-#include <ctype.h>
 #include "tag.h"
 #include "commit.h"
 #include "cache.h"
 
+int save_commit_buffer = 1;
+
 struct sort_node
 {
        /*
@@ -33,6 +34,8 @@ enum cmit_fmt get_commit_format(const char *arg)
                return CMIT_FMT_SHORT;
        if (!strcmp(arg, "=full"))
                return CMIT_FMT_FULL;
+       if (!strcmp(arg, "=fuller"))
+               return CMIT_FMT_FULLER;
        if (!strcmp(arg, "=oneline"))
                return CMIT_FMT_ONELINE;
        die("invalid --pretty format");
@@ -54,7 +57,7 @@ static struct commit *check_commit(struct object *obj,
 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
                                              int quiet)
 {
-       struct object *obj = deref_tag(parse_object(sha1));
+       struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
 
        if (!obj)
                return NULL;
@@ -102,7 +105,7 @@ static unsigned long parse_commit_date(const char *buf)
 static struct commit_graft {
        unsigned char sha1[20];
        int nr_parent;
-       unsigned char parent[][20]; /* more */
+       unsigned char parent[0][20]; /* more */
 } **commit_graft;
 static int commit_graft_alloc, commit_graft_nr;
 
@@ -201,6 +204,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
        unsigned char parent[20];
        struct commit_list **pptr;
        struct commit_graft *graft;
+       unsigned n_refs = 0;
 
        if (item->object.parsed)
                return 0;
@@ -211,7 +215,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
                return error("bad tree pointer in commit %s\n", sha1_to_hex(item->object.sha1));
        item->tree = lookup_tree(parent);
        if (item->tree)
-               add_ref(&item->object, &item->tree->object);
+               n_refs++;
        bufptr += 46; /* "tree " + "hex sha1" + "\n" */
        pptr = &item->parents;
 
@@ -227,7 +231,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
                new_parent = lookup_commit(parent);
                if (new_parent) {
                        pptr = &commit_list_insert(new_parent, pptr)->next;
-                       add_ref(&item->object, &new_parent->object);
+                       n_refs++;
                }
        }
        if (graft) {
@@ -238,10 +242,22 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
                        if (!new_parent)
                                continue;
                        pptr = &commit_list_insert(new_parent, pptr)->next;
-                       add_ref(&item->object, &new_parent->object);
+                       n_refs++;
                }
        }
        item->date = parse_commit_date(bufptr);
+
+       if (track_object_refs) {
+               unsigned i = 0;
+               struct commit_list *p;
+               struct object_refs *refs = alloc_object_refs(n_refs);
+               if (item->tree)
+                       refs->ref[i++] = &item->tree->object;
+               for (p = item->parents; p; p = p->next)
+                       refs->ref[i++] = &p->item->object;
+               set_object_refs(&item->object, refs);
+       }
+
        return 0;
 }
 
@@ -264,7 +280,7 @@ int parse_commit(struct commit *item)
                             sha1_to_hex(item->object.sha1));
        }
        ret = parse_commit_buffer(item, buffer, size);
-       if (!ret) {
+       if (save_commit_buffer && !ret) {
                item->buffer = buffer;
                return 0;
        }
@@ -357,9 +373,10 @@ static int get_one_line(const char *msg, unsigned long len)
 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
 {
        char *date;
-       unsigned int namelen;
+       int namelen;
        unsigned long time;
        int tz, ret;
+       const char *filler = "    ";
 
        if (fmt == CMIT_FMT_ONELINE)
                return 0;
@@ -370,9 +387,20 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
        time = strtoul(date, &date, 10);
        tz = strtol(date, NULL, 10);
 
-       ret = sprintf(buf, "%s: %.*s\n", what, namelen, line);
-       if (fmt == CMIT_FMT_MEDIUM)
+       ret = sprintf(buf, "%s: %.*s%.*s\n", what,
+                     (fmt == CMIT_FMT_FULLER) ? 4 : 0,
+                     filler, namelen, line);
+       switch (fmt) {
+       case CMIT_FMT_MEDIUM:
                ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
+               break;
+       case CMIT_FMT_FULLER:
+               ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
+               break;
+       default:
+               /* notin' */
+               break;
+       }
        return ret;
 }
 
@@ -447,12 +475,21 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
                                        die("bad parent line in commit");
                                offset += add_parent_info(fmt, buf + offset, line, ++parents);
                        }
+
+                       /*
+                        * MEDIUM == DEFAULT shows only author with dates.
+                        * FULL shows both authors but not dates.
+                        * FULLER shows both authors and dates.
+                        */
                        if (!memcmp(line, "author ", 7))
-                               offset += add_user_info("Author", fmt, buf + offset, line + 7);
-                       if (fmt == CMIT_FMT_FULL) {
-                               if (!memcmp(line, "committer ", 10))
-                                       offset += add_user_info("Commit", fmt, buf + offset, line + 10);
-                       }
+                               offset += add_user_info("Author", fmt,
+                                                       buf + offset,
+                                                       line + 7);
+                       if (!memcmp(line, "committer ", 10) &&
+                           (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
+                               offset += add_user_info("Commit", fmt,
+                                                       buf + offset,
+                                                       line + 10);
                        continue;
                }
 
@@ -512,7 +549,7 @@ int count_parents(struct commit * commit)
 void sort_in_topological_order(struct commit_list ** list)
 {
        struct commit_list * next = *list;
-       struct commit_list * work = NULL;
+       struct commit_list * work = NULL, **insert;
        struct commit_list ** pptr = list;
        struct sort_node * nodes;
        struct sort_node * next_nodes;
@@ -556,11 +593,12 @@ void sort_in_topological_order(struct commit_list ** list)
          * the tips serve as a starting set for the work queue.
          */
        next=*list;
+       insert = &work;
        while (next) {
                struct sort_node * node = (struct sort_node *)next->item->object.util;
 
                if (node->indegree == 0) {
-                       commit_list_insert(next->item, &work);
+                       insert = &commit_list_insert(next->item, insert)->next;
                }
                next=next->next;
        }