[PATCH] Fix fd leak in git-cvsimport-script

[git.git] / commit.c

diff --git a/commit.c b/commit.c
index de5e94d..03f8ca8 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1,10 +1,26 @@
+#include <ctype.h>
 #include "tag.h"
 #include "commit.h"
 #include "cache.h"
 
 const char *commit_type = "commit";
 
-static struct commit *check_commit(struct object *obj, unsigned char *sha1)
+enum cmit_fmt get_commit_format(const char *arg)
+{
+       if (!*arg)
+               return CMIT_FMT_DEFAULT;
+       if (!strcmp(arg, "=raw"))
+               return CMIT_FMT_RAW;
+       if (!strcmp(arg, "=medium"))
+               return CMIT_FMT_MEDIUM;
+       if (!strcmp(arg, "=short"))
+               return CMIT_FMT_SHORT;
+       if (!strcmp(arg, "=full"))
+               return CMIT_FMT_FULL;
+       die("invalid --pretty format");
+}
+
+static struct commit *check_commit(struct object *obj, const unsigned char *sha1)
 {
        if (obj->type != commit_type) {
                error("Object %s is a %s, not a commit", 
@@ -14,7 +30,7 @@ static struct commit *check_commit(struct object *obj, unsigned char *sha1)
        return (struct commit *) obj;
 }
 
-struct commit *lookup_commit_reference(unsigned char *sha1)
+struct commit *lookup_commit_reference(const unsigned char *sha1)
 {
        struct object *obj = parse_object(sha1);
 
@@ -25,7 +41,7 @@ struct commit *lookup_commit_reference(unsigned char *sha1)
        return check_commit(obj, sha1);
 }
 
-struct commit *lookup_commit(unsigned char *sha1)
+struct commit *lookup_commit(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
@@ -62,6 +78,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 {
        void *bufptr = buffer;
        unsigned char parent[20];
+       struct commit_list **pptr;
 
        if (item->object.parsed)
                return 0;
@@ -71,11 +88,12 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
        if (item->tree)
                add_ref(&item->object, &item->tree->object);
        bufptr += 46; /* "tree " + "hex sha1" + "\n" */
+       pptr = &item->parents;
        while (!memcmp(bufptr, "parent ", 7) &&
               !get_sha1_hex(bufptr + 7, parent)) {
                struct commit *new_parent = lookup_commit(parent);
                if (new_parent) {
-                       commit_list_insert(new_parent, &item->parents);
+                       pptr = &commit_list_insert(new_parent, pptr)->next;
                        add_ref(&item->object, &new_parent->object);
                }
                bufptr += 48;
@@ -129,7 +147,7 @@ void free_commit_list(struct commit_list *list)
        }
 }
 
-static void insert_by_date(struct commit_list **list, struct commit *item)
+void insert_by_date(struct commit_list **list, struct commit *item)
 {
        struct commit_list **pp = list;
        struct commit_list *p;
@@ -193,14 +211,13 @@ static int get_one_line(const char *msg, unsigned long len)
        return ret;
 }
 
-static int add_author_info(char *buf, const char *line, int len)
+static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
 {
        char *date;
        unsigned int namelen;
        unsigned long time;
-       int tz;
+       int tz, ret;
 
-       line += strlen("author ");
        date = strchr(line, '>');
        if (!date)
                return 0;
@@ -208,15 +225,42 @@ static int add_author_info(char *buf, const char *line, int len)
        time = strtoul(date, &date, 10);
        tz = strtol(date, NULL, 10);
 
-       return sprintf(buf, "Author: %.*s\nDate:   %s\n",
-               namelen, line,
-               show_date(time, tz));
+       ret = sprintf(buf, "%s: %.*s\n", what, namelen, line);
+       if (fmt == CMIT_FMT_MEDIUM)
+               ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
+       return ret;
+}
+
+static int is_empty_line(const char *line, int len)
+{
+       while (len && isspace(line[len-1]))
+               len--;
+       return !len;
+}
+
+static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents)
+{
+       int offset = 0;
+       switch (parents) {
+       case 1:
+               break;
+       case 2:
+               /* Go back to the previous line: 40 characters of previous parent, and one '\n' */
+               offset = sprintf(buf, "Merge: %.40s\n", line-41);
+               /* Fallthrough */
+       default:
+               /* Replace the previous '\n' with a space */
+               buf[offset-1] = ' ';
+               offset += sprintf(buf + offset, "%.40s\n", line+7);
+       }
+       return offset;
 }
 
-unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf, unsigned long space)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
 {
-       int hdr = 1;
+       int hdr = 1, body = 0;
        unsigned long offset = 0;
+       int parents = 0;
 
        for (;;) {
                const char *line = msg;
@@ -237,13 +281,39 @@ unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf,
 
                msg += linelen;
                len -= linelen;
-               if (linelen == 1)
-                       hdr = 0;
                if (hdr) {
+                       if (linelen == 1) {
+                               hdr = 0;
+                               buf[offset++] = '\n';
+                               continue;
+                       }
+                       if (fmt == CMIT_FMT_RAW) {
+                               memcpy(buf + offset, line, linelen);
+                               offset += linelen;
+                               continue;
+                       }
+                       if (!memcmp(line, "parent ", 7)) {
+                               if (linelen != 48)
+                                       die("bad parent line in commit");
+                               offset += add_parent_info(fmt, buf + offset, line, ++parents);
+                       }
                        if (!memcmp(line, "author ", 7))
-                               offset += add_author_info(buf + offset, line, linelen);
+                               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);
+                       }
                        continue;
                }
+
+               if (is_empty_line(line, linelen)) {
+                       if (!body)
+                               continue;
+                       if (fmt == CMIT_FMT_SHORT)
+                               break;
+               } else {
+                       body = 1;
+               }
                memset(buf + offset, ' ', 4);
                memcpy(buf + offset + 4, line, linelen);
                offset += linelen + 4;
@@ -254,3 +324,25 @@ unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf,
        buf[offset] = '\0';
        return offset;
 }
+
+struct commit *pop_commit(struct commit_list **stack)
+{
+       struct commit_list *top = *stack;
+       struct commit *item = top ? top->item : NULL;
+
+       if (top) {
+               *stack = top->next;
+               free(top);
+       }
+       return item;
+}
+
+int count_parents(struct commit * commit)
+{
+        int count = 0;
+        struct commit_list * parents = commit->parents;
+        for (count=0;parents; parents=parents->next,count++)
+          ;
+        return count;
+}
+