| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cgit.c | 46 | ||||
| -rw-r--r-- | cgit.h | 3 | ||||
| -rw-r--r-- | ui-summary.c | 55 |
4 files changed, 47 insertions, 59 deletions
@@ -5,7 +5,7 @@ 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 = parsing.o html.o cache.o ui-shared.o ui-repolist.o CFLAGS += -Wall @@ -84,6 +84,44 @@ void cgit_querystring_cb(const char *name, const char *value) } } +static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, + int flags, void *cb_data) +{ + struct commit *commit; + char buf[256], *url; + + commit = lookup_commit(sha1); + if (commit && !parse_commit(commit)){ + html("<tr><td>"); + url = cgit_pageurl(cgit_query_repo, "log", + fmt("h=%s", refname)); + html_link_open(url, NULL, NULL); + strncpy(buf, refname, sizeof(buf)); + html_txt(buf); + html_link_close(); + html("</td><td>"); + pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, + sizeof(buf), 0, NULL, NULL, 0); + html_txt(buf); + html("</td></tr>\n"); + } else { + html("<tr><td>"); + html_txt(buf); + html("</td><td>"); + htmlf("*** bad ref %s", sha1_to_hex(sha1)); + html("</td></tr>\n"); + } + return 0; +} + +static void cgit_print_branches() +{ + html("<table class='list'>"); + html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); + for_each_branch_ref(cgit_print_branch_cb, NULL); + html("</table>"); +} + static int get_one_line(char *txt) { char *t; @@ -189,6 +227,14 @@ static void cgit_print_log(const char *tip, int ofs, int cnt) html("</table>\n"); } +static void cgit_print_repo_summary() +{ + html("<h2>"); + html_txt("Repo summary page"); + html("</h2>"); + cgit_print_branches(); +} + static void cgit_print_object(char *hex) { unsigned char sha1[20]; @@ -79,7 +79,4 @@ extern void cgit_print_repolist(struct cacheitem *item); 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-summary.c b/ui-summary.c deleted file mode 100644 index 532ddbf..0000000 --- a/ui-summary.c +++ /dev/null @@ -1,55 +0,0 @@ -/* ui-summary.c: functions for generating repo summary page - * - * Copyright (C) 2006 Lars Hjemli - * - * Licensed under GNU General Public License v2 - * (see COPYING for full license text) - */ - -#include "cgit.h" - -static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, - int flags, void *cb_data) -{ - struct commit *commit; - char buf[256], *url; - - commit = lookup_commit(sha1); - if (commit && !parse_commit(commit)){ - html("<tr><td>"); - url = cgit_pageurl(cgit_query_repo, "log", - fmt("h=%s", refname)); - html_link_open(url, NULL, NULL); - strncpy(buf, refname, sizeof(buf)); - html_txt(buf); - html_link_close(); - html("</td><td>"); - pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, - sizeof(buf), 0, NULL, NULL, 0); - html_txt(buf); - html("</td></tr>\n"); - } else { - html("<tr><td>"); - html_txt(buf); - html("</td><td>"); - htmlf("*** bad ref %s", sha1_to_hex(sha1)); - html("</td></tr>\n"); - } - return 0; -} - -static void cgit_print_branches() -{ - html("<table class='list'>"); - html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); - for_each_branch_ref(cgit_print_branch_cb, NULL); - html("</table>"); -} - -void cgit_print_repo_summary() -{ - html("<h2>"); - html_txt("Repo summary page"); - html("</h2>"); - cgit_print_branches(); -} |