-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, 59 insertions, 47 deletions
@@ -1,16 +1,16 @@ | |||
1 | CGIT_VERSION = 0.1-pre | 1 | CGIT_VERSION = 0.1-pre |
2 | 2 | ||
3 | INSTALL_BIN = /var/www/htdocs/cgit.cgi | 3 | INSTALL_BIN = /var/www/htdocs/cgit.cgi |
4 | INSTALL_CSS = /var/www/htdocs/cgit.css | 4 | INSTALL_CSS = /var/www/htdocs/cgit.css |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | 6 | ||
7 | EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto | 7 | EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto |
8 | OBJECTS = parsing.o html.o cache.o ui-shared.o ui-repolist.o | 8 | OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o |
9 | 9 | ||
10 | CFLAGS += -Wall | 10 | CFLAGS += -Wall |
11 | 11 | ||
12 | all: cgit | 12 | all: cgit |
13 | 13 | ||
14 | install: all | 14 | install: all |
15 | install cgit $(INSTALL_BIN) | 15 | install cgit $(INSTALL_BIN) |
16 | install cgit.css $(INSTALL_CSS) | 16 | install cgit.css $(INSTALL_CSS) |
@@ -79,54 +79,16 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
79 | cgit_query_head = xstrdup(value); | 79 | cgit_query_head = xstrdup(value); |
80 | cgit_query_has_symref = 1; | 80 | cgit_query_has_symref = 1; |
81 | } else if (!strcmp(name, "id")) { | 81 | } else if (!strcmp(name, "id")) { |
82 | cgit_query_sha1 = xstrdup(value); | 82 | cgit_query_sha1 = xstrdup(value); |
83 | cgit_query_has_sha1 = 1; | 83 | cgit_query_has_sha1 = 1; |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | ||
88 | int flags, void *cb_data) | ||
89 | { | ||
90 | struct commit *commit; | ||
91 | char buf[256], *url; | ||
92 | |||
93 | commit = lookup_commit(sha1); | ||
94 | if (commit && !parse_commit(commit)){ | ||
95 | html("<tr><td>"); | ||
96 | url = cgit_pageurl(cgit_query_repo, "log", | ||
97 | fmt("h=%s", refname)); | ||
98 | html_link_open(url, NULL, NULL); | ||
99 | strncpy(buf, refname, sizeof(buf)); | ||
100 | html_txt(buf); | ||
101 | html_link_close(); | ||
102 | html("</td><td>"); | ||
103 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, | ||
104 | sizeof(buf), 0, NULL, NULL, 0); | ||
105 | html_txt(buf); | ||
106 | html("</td></tr>\n"); | ||
107 | } else { | ||
108 | html("<tr><td>"); | ||
109 | html_txt(buf); | ||
110 | html("</td><td>"); | ||
111 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); | ||
112 | html("</td></tr>\n"); | ||
113 | } | ||
114 | return 0; | ||
115 | } | ||
116 | |||
117 | static void cgit_print_branches() | ||
118 | { | ||
119 | html("<table class='list'>"); | ||
120 | html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); | ||
121 | for_each_branch_ref(cgit_print_branch_cb, NULL); | ||
122 | html("</table>"); | ||
123 | } | ||
124 | |||
125 | static int get_one_line(char *txt) | 87 | static int get_one_line(char *txt) |
126 | { | 88 | { |
127 | char *t; | 89 | char *t; |
128 | 90 | ||
129 | for(t=txt; *t != '\n' && t != '\0'; t++) | 91 | for(t=txt; *t != '\n' && t != '\0'; t++) |
130 | ; | 92 | ; |
131 | *t = '\0'; | 93 | *t = '\0'; |
132 | return t-txt-1; | 94 | return t-txt-1; |
@@ -222,24 +184,16 @@ static void cgit_print_log(const char *tip, int ofs, int cnt) | |||
222 | free(commit->buffer); | 184 | free(commit->buffer); |
223 | commit->buffer = NULL; | 185 | commit->buffer = NULL; |
224 | free_commit_list(commit->parents); | 186 | free_commit_list(commit->parents); |
225 | commit->parents = NULL; | 187 | commit->parents = NULL; |
226 | } | 188 | } |
227 | html("</table>\n"); | 189 | html("</table>\n"); |
228 | } | 190 | } |
229 | 191 | ||
230 | static void cgit_print_repo_summary() | ||
231 | { | ||
232 | html("<h2>"); | ||
233 | html_txt("Repo summary page"); | ||
234 | html("</h2>"); | ||
235 | cgit_print_branches(); | ||
236 | } | ||
237 | |||
238 | static void cgit_print_object(char *hex) | 192 | static void cgit_print_object(char *hex) |
239 | { | 193 | { |
240 | unsigned char sha1[20]; | 194 | unsigned char sha1[20]; |
241 | //struct object *object; | 195 | //struct object *object; |
242 | char type[20]; | 196 | char type[20]; |
243 | unsigned char *buf; | 197 | unsigned char *buf; |
244 | unsigned long size; | 198 | unsigned long size; |
245 | 199 | ||
@@ -74,9 +74,12 @@ extern void cgit_print_docstart(char *title, struct cacheitem *item); | |||
74 | extern void cgit_print_docend(); | 74 | extern void cgit_print_docend(); |
75 | extern void cgit_print_pageheader(char *title); | 75 | extern void cgit_print_pageheader(char *title); |
76 | 76 | ||
77 | extern void cgit_print_repolist(struct cacheitem *item); | 77 | extern void cgit_print_repolist(struct cacheitem *item); |
78 | 78 | ||
79 | 79 | ||
80 | extern void cgit_repo_config_cb(const char *name, const char *value); | 80 | extern void cgit_repo_config_cb(const char *name, const char *value); |
81 | 81 | ||
82 | extern void cgit_print_repo_summary(); | ||
83 | |||
84 | |||
82 | #endif /* CGIT_H */ | 85 | #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 @@ | |||
1 | /* ui-summary.c: functions for generating repo summary page | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include "cgit.h" | ||
10 | |||
11 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | ||
12 | int flags, void *cb_data) | ||
13 | { | ||
14 | struct commit *commit; | ||
15 | char buf[256], *url; | ||
16 | |||
17 | commit = lookup_commit(sha1); | ||
18 | if (commit && !parse_commit(commit)){ | ||
19 | html("<tr><td>"); | ||
20 | url = cgit_pageurl(cgit_query_repo, "log", | ||
21 | fmt("h=%s", refname)); | ||
22 | html_link_open(url, NULL, NULL); | ||
23 | strncpy(buf, refname, sizeof(buf)); | ||
24 | html_txt(buf); | ||
25 | html_link_close(); | ||
26 | html("</td><td>"); | ||
27 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, | ||
28 | sizeof(buf), 0, NULL, NULL, 0); | ||
29 | html_txt(buf); | ||
30 | html("</td></tr>\n"); | ||
31 | } else { | ||
32 | html("<tr><td>"); | ||
33 | html_txt(buf); | ||
34 | html("</td><td>"); | ||
35 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); | ||
36 | html("</td></tr>\n"); | ||
37 | } | ||
38 | return 0; | ||
39 | } | ||
40 | |||
41 | static void cgit_print_branches() | ||
42 | { | ||
43 | html("<table class='list'>"); | ||
44 | html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); | ||
45 | for_each_branch_ref(cgit_print_branch_cb, NULL); | ||
46 | html("</table>"); | ||
47 | } | ||
48 | |||
49 | void cgit_print_repo_summary() | ||
50 | { | ||
51 | html("<h2>"); | ||
52 | html_txt("Repo summary page"); | ||
53 | html("</h2>"); | ||
54 | cgit_print_branches(); | ||
55 | } | ||