Diffstat (limited to 'ui-log.c')
| -rw-r--r-- | ui-log.c | 76 |
1 files changed, 63 insertions, 13 deletions
@@ -8,14 +8,69 @@ #include "cgit.h" -void print_commit(struct commit *commit) +static int get_one_line(char *txt) { - char buf[32]; - struct commitinfo *info; + char *t; + + for(t=txt; *t != '\n' && t != '\0'; t++) + ; + *t = '\0'; + return t-txt-1; +} + +static void cgit_print_commit_shortlog(struct commit *commit) +{ + char *h, *t, *p; + char *tree = NULL, *author = NULL, *subject = NULL; + int len; + time_t sec; struct tm *time; + char buf[32]; + + h = t = commit->buffer; + + if (strncmp(h, "tree ", 5)) + die("Bad commit format: %s", + sha1_to_hex(commit->object.sha1)); + + len = get_one_line(h); + tree = h+5; + h += len + 2; + + while (!strncmp(h, "parent ", 7)) + h += get_one_line(h) + 2; + + if (!strncmp(h, "author ", 7)) { + author = h+7; + h += get_one_line(h) + 2; + t = author; + while(t!=h && *t!='<') + t++; + *t='\0'; + p = t; + while(--t!=author && *t==' ') + *t='\0'; + while(++p!=h && *p!='>') + ; + while(++p!=h && !isdigit(*p)) + ; + + t = p; + while(++p && isdigit(*p)) + ; + *p = '\0'; + sec = atoi(t); + time = gmtime(&sec); + } + + while((len = get_one_line(h)) > 0) + h += len+2; + + h++; + len = get_one_line(h); + + subject = h; - info = cgit_parse_commit(commit); - time = gmtime(&commit->date); html("<tr><td>"); strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); html_txt(buf); @@ -23,23 +78,18 @@ void print_commit(struct commit *commit) char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); char *url = cgit_pageurl(cgit_query_repo, "view", qry); html_link_open(url, NULL, NULL); - html_txt(info->subject); + html_txt(subject); html_link_close(); html("</td><td>"); - html_txt(info->author); + html_txt(author); html("</td><td><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)))); html("'>tree</a>"); html("</td></tr>\n"); - free(info->author); - free(info->committer); - free(info->subject); - free(info); } - void cgit_print_log(const char *tip, int ofs, int cnt) { struct rev_info rev; @@ -70,7 +120,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt) } for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { - print_commit(commit); + cgit_print_commit_shortlog(commit); free(commit->buffer); commit->buffer = NULL; free_commit_list(commit->parents); |