4 files changed, 59 insertions, 47 deletions

diff --git a/Makefile b/Makefileindex 81ebb18..71ddc40 100644--- a/Makefile+++ b/Makefile@@ -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 = 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 
diff --git a/Makefile b/Makefile
index 81ebb18..71ddc40 100644
--- a/Makefile
+++ b/Makefile
@@ -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 = 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
 
diff --git a/cgit.c b/cgit.cindex b3ff512..300fe46 100644--- a/cgit.c+++ b/cgit.c@@ -84,44 +84,6 @@ 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;@@ -227,14 +189,6 @@ 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];
diff --git a/cgit.c b/cgit.c
index b3ff512..300fe46 100644
--- a/cgit.c
+++ b/cgit.c
@@ -84,44 +84,6 @@ 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;
@@ -227,14 +189,6 @@ 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];
diff --git a/cgit.h b/cgit.hindex bf5bd8d..3a153a5 100644--- a/cgit.h+++ b/cgit.h@@ -79,4 +79,7 @@ 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/cgit.h b/cgit.h
index bf5bd8d..3a153a5 100644
--- a/cgit.h
+++ b/cgit.h
@@ -79,4 +79,7 @@ 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.cnew file mode 100644index 0000000..532ddbf--- /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();+}
diff --git a/ui-summary.c b/ui-summary.c
new file mode 100644
index 0000000..532ddbf
--- /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();
+}