neocgit

a more 'modern' version of cgit
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/neocgit

commit d14c5f6d3ac827e7b46831c4151638ab4b638ae1
parent 1418034e642fee67c981b31e4c3eb6e8ae14e303
Author: Lars Hjemli <hjemli@gmail.com>
Date:   Mon, 11 Dec 2006 17:04:19 +0100

Move log-functions into ui-log.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

Diffstat:
MMakefile | 3++-
Mcgit.c | 107+------------------------------------------------------------------------------
Mcgit.h | 5++---
Aui-log.c | 115+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mui-summary.c | 2+-
5 files changed, 121 insertions(+), 111 deletions(-)

diff --git a/Makefile b/Makefile @@ -5,7 +5,8 @@ INSTALL_CSS = /var/www/htdocs/cgit.css CACHE_ROOT = /var/cache/cgit EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto -OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o +OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o \ + ui-log.o CFLAGS += -Wall diff --git a/cgit.c b/cgit.c @@ -84,111 +84,6 @@ void cgit_querystring_cb(const char *name, const char *value) } } -static int get_one_line(char *txt) -{ - 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; - - html("<tr><td>"); - strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); - html_txt(buf); - html("</td><td>"); - 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(subject); - html_link_close(); - html("</td><td>"); - html_txt(author); - html("</td></tr>\n"); -} - -static void cgit_print_log(const char *tip, int ofs, int cnt) -{ - struct rev_info rev; - struct commit *commit; - const char *argv[2] = {NULL, tip}; - int n = 0; - - init_revisions(&rev, NULL); - rev.abbrev = DEFAULT_ABBREV; - rev.commit_format = CMIT_FMT_DEFAULT; - rev.verbose_header = 1; - rev.show_root_diff = 0; - setup_revisions(2, argv, &rev, NULL); - prepare_revision_walk(&rev); - - html("<h2>Log</h2>"); - html("<table class='list'>"); - html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n"); - while ((commit = get_revision(&rev)) != NULL && n++ < 100) { - cgit_print_commit_shortlog(commit); - free(commit->buffer); - commit->buffer = NULL; - free_commit_list(commit->parents); - commit->parents = NULL; - } - html("</table>\n"); -} - static void cgit_print_object(char *hex) { unsigned char sha1[20]; @@ -238,7 +133,7 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_docstart(title, item); cgit_print_pageheader(title); if (!cgit_query_page) - cgit_print_repo_summary(); + cgit_print_summary(); else if (!strcmp(cgit_query_page, "log")) { cgit_print_log(cgit_query_head, 0, 100); } else if (!strcmp(cgit_query_page, "view")) { diff --git a/cgit.h b/cgit.h @@ -75,11 +75,10 @@ extern void cgit_print_docend(); extern void cgit_print_pageheader(char *title); extern void cgit_print_repolist(struct cacheitem *item); - +extern void cgit_print_summary(); +extern void cgit_print_log(const char *tip, int ofs, int cnt); extern void cgit_repo_config_cb(const char *name, const char *value); -extern void cgit_print_repo_summary(); - #endif /* CGIT_H */ diff --git a/ui-log.c b/ui-log.c @@ -0,0 +1,115 @@ +/* ui-log.c: functions for log output + * + * Copyright (C) 2006 Lars Hjemli + * + * Licensed under GNU General Public License v2 + * (see COPYING for full license text) + */ + +#include "cgit.h" + +static int get_one_line(char *txt) +{ + 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; + + html("<tr><td>"); + strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); + html_txt(buf); + html("</td><td>"); + 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(subject); + html_link_close(); + html("</td><td>"); + html_txt(author); + html("</td></tr>\n"); +} + +void cgit_print_log(const char *tip, int ofs, int cnt) +{ + struct rev_info rev; + struct commit *commit; + const char *argv[2] = {NULL, tip}; + int n = 0; + + init_revisions(&rev, NULL); + rev.abbrev = DEFAULT_ABBREV; + rev.commit_format = CMIT_FMT_DEFAULT; + rev.verbose_header = 1; + rev.show_root_diff = 0; + setup_revisions(2, argv, &rev, NULL); + prepare_revision_walk(&rev); + + html("<h2>Log</h2>"); + html("<table class='list'>"); + html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n"); + while ((commit = get_revision(&rev)) != NULL && n++ < 100) { + cgit_print_commit_shortlog(commit); + free(commit->buffer); + commit->buffer = NULL; + free_commit_list(commit->parents); + commit->parents = NULL; + } + html("</table>\n"); +} + diff --git a/ui-summary.c b/ui-summary.c @@ -46,7 +46,7 @@ static void cgit_print_branches() html("</table>"); } -void cgit_print_repo_summary() +void cgit_print_summary() { html("<h2>"); html_txt("Repo summary page");