4 files changed, 59 insertions, 47 deletions

diff --git a/Makefile b/Makefile
index 81ebb18..71ddc40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,27 @@
 CGIT_VERSION = 0.1-pre
 
 INSTALL_BIN = /var/www/htdocs/cgit.cgi
 INSTALL_CSS = /var/www/htdocs/cgit.css
 CACHE_ROOT = /var/cache/cgit
 
 EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
-OBJECTS = parsing.o html.o cache.o ui-shared.o ui-repolist.o
+OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o
 
 CFLAGS += -Wall
 
 all: cgit
 
 install: all
         install cgit $(INSTALL_BIN)
         install cgit.css $(INSTALL_CSS)
         rm -rf $(CACHE_ROOT)/*
 
 cgit: cgit.c cgit.h git.h $(OBJECTS)
         $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
                 $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git.h
 
 .PHONY: clean
 clean:
         rm -f cgit *.o
diff --git a/cgit.c b/cgit.c
index b3ff512..300fe46 100644
--- a/cgit.c
+++ b/cgit.c
@@ -39,134 +39,96 @@ char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_sha1   = NULL;
 
 struct cacheitem cacheitem;
 
 void cgit_global_config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "root"))
                 cgit_root = xstrdup(value);
         else if (!strcmp(name, "root-title"))
                 cgit_root_title = xstrdup(value);
         else if (!strcmp(name, "css"))
                 cgit_css = xstrdup(value);
         else if (!strcmp(name, "logo"))
                 cgit_logo = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
                 cgit_logo_link = xstrdup(value);
         else if (!strcmp(name, "virtual-root"))
                 cgit_virtual_root = xstrdup(value);
 }
 
 void cgit_repo_config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "name"))
                 cgit_repo_name = xstrdup(value);
         else if (!strcmp(name, "desc"))
                 cgit_repo_desc = xstrdup(value);
         else if (!strcmp(name, "owner"))
                 cgit_repo_owner = xstrdup(value);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)
 {
         if (!strcmp(name,"r"))
                 cgit_query_repo = xstrdup(value);
         else if (!strcmp(name, "p"))
                 cgit_query_page = xstrdup(value);
         else if (!strcmp(name, "h")) {
                 cgit_query_head = xstrdup(value);
                 cgit_query_has_symref = 1;
         } else if (!strcmp(name, "id")) {
                 cgit_query_sha1 = xstrdup(value);
                 cgit_query_has_sha1 = 1;
         }
 }
 
-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;
 
         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;
@@ -182,104 +144,96 @@ static void cgit_print_commit_shortlog(struct commit *commit)
 
         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_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];
         //struct object *object;
         char type[20];
         unsigned char *buf;
         unsigned long size;
 
         if (get_sha1_hex(hex, sha1)){
                 cgit_print_error(fmt("Bad hex value: %s", hex));
                 return;
         }
 
         if (sha1_object_info(sha1, type, NULL)){
                 cgit_print_error("Bad object name");
                 return;
         }
 
         buf = read_sha1_file(sha1, type, &size);
         if (!buf) {
                 cgit_print_error("Error reading object");
                 return;
         }
 
         buf[size] = '\0';
         html("<h2>Object view</h2>");
         htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size);
         html("<pre>");
         html_txt(buf);
         html("</pre>");
 }
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {
         if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
             cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title);
                 cgit_print_error(fmt("Unable to scan repository: %s",
                                      strerror(errno)));
                 cgit_print_docend();
                 return;
         }
         setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
         char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
         cgit_print_docstart(title, item);
         cgit_print_pageheader(title);
diff --git a/cgit.h b/cgit.h
index bf5bd8d..3a153a5 100644
--- a/cgit.h
+++ b/cgit.h
@@ -34,49 +34,52 @@ extern int cgit_cache_max_create_time;
 
 extern char *cgit_repo_name;
 extern char *cgit_repo_desc;
 extern char *cgit_repo_owner;
 
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 
 extern int htmlfd;
 
 extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 
 extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
                           const char *query);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title);
 
 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
new file mode 100644
index 0000000..532ddbf
--- a/dev/null
+++ b/ui-summary.c
@@ -0,0 +1,55 @@
+/* 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();
+}