summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-03-24 15:38:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-24 15:38:47 (UTC)
commitc5984a9896b39748e61daf6e620483749654b102 (patch) (unidiff)
tree5576deee2c5bcc92ae85ab07af215295c52d4143
parentf34478cbe0214a201e7ecef3e79ed6c957b7beee (diff)
downloadcgit-c5984a9896b39748e61daf6e620483749654b102.zip
cgit-c5984a9896b39748e61daf6e620483749654b102.tar.gz
cgit-c5984a9896b39748e61daf6e620483749654b102.tar.bz2
Add separate header-files for each page/view
Yet another step towards removing cgit.h. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h17
-rw-r--r--cmd.c11
-rw-r--r--ui-blob.h6
-rw-r--r--ui-commit.h6
-rw-r--r--ui-diff.h7
-rw-r--r--ui-log.h7
-rw-r--r--ui-patch.h6
-rw-r--r--ui-refs.c172
-rw-r--r--ui-refs.h8
-rw-r--r--ui-repolist.h6
-rw-r--r--ui-snapshot.h8
-rw-r--r--ui-summary.c174
-rw-r--r--ui-summary.h6
-rw-r--r--ui-tag.h6
-rw-r--r--ui-tree.h6
15 files changed, 257 insertions, 189 deletions
diff --git a/cgit.h b/cgit.h
index e2d5126..1b23369 100644
--- a/cgit.h
+++ b/cgit.h
@@ -16,278 +16,261 @@
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <xdiff/xdiff.h> 18#include <xdiff/xdiff.h>
19#include <utf8.h> 19#include <utf8.h>
20 20
21 21
22/* 22/*
23 * Dateformats used on misc. pages 23 * Dateformats used on misc. pages
24 */ 24 */
25#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" 25#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
26#define FMT_SHORTDATE "%Y-%m-%d" 26#define FMT_SHORTDATE "%Y-%m-%d"
27 27
28 28
29/* 29/*
30 * Limits used for relative dates 30 * Limits used for relative dates
31 */ 31 */
32#define TM_MIN 60 32#define TM_MIN 60
33#define TM_HOUR (TM_MIN * 60) 33#define TM_HOUR (TM_MIN * 60)
34#define TM_DAY (TM_HOUR * 24) 34#define TM_DAY (TM_HOUR * 24)
35#define TM_WEEK (TM_DAY * 7) 35#define TM_WEEK (TM_DAY * 7)
36#define TM_YEAR (TM_DAY * 365) 36#define TM_YEAR (TM_DAY * 365)
37#define TM_MONTH (TM_YEAR / 12.0) 37#define TM_MONTH (TM_YEAR / 12.0)
38 38
39 39
40/* 40/*
41 * Default encoding 41 * Default encoding
42 */ 42 */
43#define PAGE_ENCODING "UTF-8" 43#define PAGE_ENCODING "UTF-8"
44 44
45typedef void (*configfn)(const char *name, const char *value); 45typedef void (*configfn)(const char *name, const char *value);
46typedef void (*filepair_fn)(struct diff_filepair *pair); 46typedef void (*filepair_fn)(struct diff_filepair *pair);
47typedef void (*linediff_fn)(char *line, int len); 47typedef void (*linediff_fn)(char *line, int len);
48 48
49struct cacheitem { 49struct cacheitem {
50 char *name; 50 char *name;
51 struct stat st; 51 struct stat st;
52 int ttl; 52 int ttl;
53 int fd; 53 int fd;
54}; 54};
55 55
56struct cgit_repo { 56struct cgit_repo {
57 char *url; 57 char *url;
58 char *name; 58 char *name;
59 char *path; 59 char *path;
60 char *desc; 60 char *desc;
61 char *owner; 61 char *owner;
62 char *defbranch; 62 char *defbranch;
63 char *group; 63 char *group;
64 char *module_link; 64 char *module_link;
65 char *readme; 65 char *readme;
66 char *clone_url; 66 char *clone_url;
67 int snapshots; 67 int snapshots;
68 int enable_log_filecount; 68 int enable_log_filecount;
69 int enable_log_linecount; 69 int enable_log_linecount;
70}; 70};
71 71
72struct cgit_repolist { 72struct cgit_repolist {
73 int length; 73 int length;
74 int count; 74 int count;
75 struct cgit_repo *repos; 75 struct cgit_repo *repos;
76}; 76};
77 77
78struct commitinfo { 78struct commitinfo {
79 struct commit *commit; 79 struct commit *commit;
80 char *author; 80 char *author;
81 char *author_email; 81 char *author_email;
82 unsigned long author_date; 82 unsigned long author_date;
83 char *committer; 83 char *committer;
84 char *committer_email; 84 char *committer_email;
85 unsigned long committer_date; 85 unsigned long committer_date;
86 char *subject; 86 char *subject;
87 char *msg; 87 char *msg;
88 char *msg_encoding; 88 char *msg_encoding;
89}; 89};
90 90
91struct taginfo { 91struct taginfo {
92 char *tagger; 92 char *tagger;
93 char *tagger_email; 93 char *tagger_email;
94 int tagger_date; 94 int tagger_date;
95 char *msg; 95 char *msg;
96}; 96};
97 97
98struct refinfo { 98struct refinfo {
99 const char *refname; 99 const char *refname;
100 struct object *object; 100 struct object *object;
101 union { 101 union {
102 struct taginfo *tag; 102 struct taginfo *tag;
103 struct commitinfo *commit; 103 struct commitinfo *commit;
104 }; 104 };
105}; 105};
106 106
107struct reflist { 107struct reflist {
108 struct refinfo **refs; 108 struct refinfo **refs;
109 int alloc; 109 int alloc;
110 int count; 110 int count;
111}; 111};
112 112
113struct cgit_query { 113struct cgit_query {
114 int has_symref; 114 int has_symref;
115 int has_sha1; 115 int has_sha1;
116 char *raw; 116 char *raw;
117 char *repo; 117 char *repo;
118 char *page; 118 char *page;
119 char *search; 119 char *search;
120 char *grep; 120 char *grep;
121 char *head; 121 char *head;
122 char *sha1; 122 char *sha1;
123 char *sha2; 123 char *sha2;
124 char *path; 124 char *path;
125 char *name; 125 char *name;
126 int ofs; 126 int ofs;
127}; 127};
128 128
129struct cgit_config { 129struct cgit_config {
130 char *agefile; 130 char *agefile;
131 char *cache_root; 131 char *cache_root;
132 char *clone_prefix; 132 char *clone_prefix;
133 char *css; 133 char *css;
134 char *index_header; 134 char *index_header;
135 char *index_info; 135 char *index_info;
136 char *logo; 136 char *logo;
137 char *logo_link; 137 char *logo_link;
138 char *module_link; 138 char *module_link;
139 char *repo_group; 139 char *repo_group;
140 char *robots; 140 char *robots;
141 char *root_title; 141 char *root_title;
142 char *script_name; 142 char *script_name;
143 char *virtual_root; 143 char *virtual_root;
144 int cache_dynamic_ttl; 144 int cache_dynamic_ttl;
145 int cache_max_create_time; 145 int cache_max_create_time;
146 int cache_repo_ttl; 146 int cache_repo_ttl;
147 int cache_root_ttl; 147 int cache_root_ttl;
148 int cache_static_ttl; 148 int cache_static_ttl;
149 int enable_index_links; 149 int enable_index_links;
150 int enable_log_filecount; 150 int enable_log_filecount;
151 int enable_log_linecount; 151 int enable_log_linecount;
152 int max_commit_count; 152 int max_commit_count;
153 int max_lock_attempts; 153 int max_lock_attempts;
154 int max_msg_len; 154 int max_msg_len;
155 int max_repodesc_len; 155 int max_repodesc_len;
156 int nocache; 156 int nocache;
157 int renamelimit; 157 int renamelimit;
158 int snapshots; 158 int snapshots;
159 int summary_branches; 159 int summary_branches;
160 int summary_log; 160 int summary_log;
161 int summary_tags; 161 int summary_tags;
162}; 162};
163 163
164struct cgit_page { 164struct cgit_page {
165 time_t modified; 165 time_t modified;
166 time_t expires; 166 time_t expires;
167 char *mimetype; 167 char *mimetype;
168 char *charset; 168 char *charset;
169 char *filename; 169 char *filename;
170 char *title; 170 char *title;
171}; 171};
172 172
173struct cgit_context { 173struct cgit_context {
174 struct cgit_query qry; 174 struct cgit_query qry;
175 struct cgit_config cfg; 175 struct cgit_config cfg;
176 struct cgit_repo *repo; 176 struct cgit_repo *repo;
177 struct cgit_page page; 177 struct cgit_page page;
178}; 178};
179 179
180struct cgit_snapshot_format { 180struct cgit_snapshot_format {
181 const char *suffix; 181 const char *suffix;
182 const char *mimetype; 182 const char *mimetype;
183 write_archive_fn_t write_func; 183 write_archive_fn_t write_func;
184 int bit; 184 int bit;
185}; 185};
186 186
187extern const char *cgit_version; 187extern const char *cgit_version;
188 188
189extern struct cgit_repolist cgit_repolist; 189extern struct cgit_repolist cgit_repolist;
190extern struct cgit_context ctx; 190extern struct cgit_context ctx;
191extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 191extern const struct cgit_snapshot_format cgit_snapshot_formats[];
192extern int cgit_cmd; 192extern int cgit_cmd;
193 193
194extern void cgit_prepare_context(struct cgit_context *ctx); 194extern void cgit_prepare_context(struct cgit_context *ctx);
195extern struct cgit_repo *cgit_get_repoinfo(const char *url); 195extern struct cgit_repo *cgit_get_repoinfo(const char *url);
196extern void cgit_global_config_cb(const char *name, const char *value); 196extern void cgit_global_config_cb(const char *name, const char *value);
197extern void cgit_repo_config_cb(const char *name, const char *value); 197extern void cgit_repo_config_cb(const char *name, const char *value);
198extern void cgit_querystring_cb(const char *name, const char *value); 198extern void cgit_querystring_cb(const char *name, const char *value);
199 199
200extern int chk_zero(int result, char *msg); 200extern int chk_zero(int result, char *msg);
201extern int chk_positive(int result, char *msg); 201extern int chk_positive(int result, char *msg);
202extern int chk_non_negative(int result, char *msg); 202extern int chk_non_negative(int result, char *msg);
203 203
204extern int hextoint(char c); 204extern int hextoint(char c);
205extern char *trim_end(const char *str, char c); 205extern char *trim_end(const char *str, char c);
206extern char *strlpart(char *txt, int maxlen); 206extern char *strlpart(char *txt, int maxlen);
207extern char *strrpart(char *txt, int maxlen); 207extern char *strrpart(char *txt, int maxlen);
208 208
209extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 209extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
210extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 210extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
211 int flags, void *cb_data); 211 int flags, void *cb_data);
212 212
213extern void *cgit_free_commitinfo(struct commitinfo *info); 213extern void *cgit_free_commitinfo(struct commitinfo *info);
214 214
215extern int cgit_diff_files(const unsigned char *old_sha1, 215extern int cgit_diff_files(const unsigned char *old_sha1,
216 const unsigned char *new_sha1, 216 const unsigned char *new_sha1,
217 linediff_fn fn); 217 linediff_fn fn);
218 218
219extern void cgit_diff_tree(const unsigned char *old_sha1, 219extern void cgit_diff_tree(const unsigned char *old_sha1,
220 const unsigned char *new_sha1, 220 const unsigned char *new_sha1,
221 filepair_fn fn, const char *prefix); 221 filepair_fn fn, const char *prefix);
222 222
223extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 223extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
224 224
225extern char *fmt(const char *format,...); 225extern char *fmt(const char *format,...);
226 226
227extern int cgit_read_config(const char *filename, configfn fn); 227extern int cgit_read_config(const char *filename, configfn fn);
228extern int cgit_parse_query(char *txt, configfn fn); 228extern int cgit_parse_query(char *txt, configfn fn);
229extern struct commitinfo *cgit_parse_commit(struct commit *commit); 229extern struct commitinfo *cgit_parse_commit(struct commit *commit);
230extern struct taginfo *cgit_parse_tag(struct tag *tag); 230extern struct taginfo *cgit_parse_tag(struct tag *tag);
231extern void cgit_parse_url(const char *url); 231extern void cgit_parse_url(const char *url);
232 232
233extern char *cache_safe_filename(const char *unsafe); 233extern char *cache_safe_filename(const char *unsafe);
234extern int cache_lock(struct cacheitem *item); 234extern int cache_lock(struct cacheitem *item);
235extern int cache_unlock(struct cacheitem *item); 235extern int cache_unlock(struct cacheitem *item);
236extern int cache_cancel_lock(struct cacheitem *item); 236extern int cache_cancel_lock(struct cacheitem *item);
237extern int cache_exist(struct cacheitem *item); 237extern int cache_exist(struct cacheitem *item);
238extern int cache_expired(struct cacheitem *item); 238extern int cache_expired(struct cacheitem *item);
239 239
240extern char *cgit_repourl(const char *reponame); 240extern char *cgit_repourl(const char *reponame);
241extern char *cgit_fileurl(const char *reponame, const char *pagename, 241extern char *cgit_fileurl(const char *reponame, const char *pagename,
242 const char *filename, const char *query); 242 const char *filename, const char *query);
243extern char *cgit_pageurl(const char *reponame, const char *pagename, 243extern char *cgit_pageurl(const char *reponame, const char *pagename,
244 const char *query); 244 const char *query);
245 245
246extern const char *cgit_repobasename(const char *reponame); 246extern const char *cgit_repobasename(const char *reponame);
247 247
248extern void cgit_tree_link(char *name, char *title, char *class, char *head, 248extern void cgit_tree_link(char *name, char *title, char *class, char *head,
249 char *rev, char *path); 249 char *rev, char *path);
250extern void cgit_log_link(char *name, char *title, char *class, char *head, 250extern void cgit_log_link(char *name, char *title, char *class, char *head,
251 char *rev, char *path, int ofs, char *grep, 251 char *rev, char *path, int ofs, char *grep,
252 char *pattern); 252 char *pattern);
253extern void cgit_commit_link(char *name, char *title, char *class, char *head, 253extern void cgit_commit_link(char *name, char *title, char *class, char *head,
254 char *rev); 254 char *rev);
255extern void cgit_refs_link(char *name, char *title, char *class, char *head, 255extern void cgit_refs_link(char *name, char *title, char *class, char *head,
256 char *rev, char *path); 256 char *rev, char *path);
257extern void cgit_snapshot_link(char *name, char *title, char *class, 257extern void cgit_snapshot_link(char *name, char *title, char *class,
258 char *head, char *rev, char *archivename); 258 char *head, char *rev, char *archivename);
259extern void cgit_diff_link(char *name, char *title, char *class, char *head, 259extern void cgit_diff_link(char *name, char *title, char *class, char *head,
260 char *new_rev, char *old_rev, char *path); 260 char *new_rev, char *old_rev, char *path);
261 261
262extern void cgit_object_link(struct object *obj); 262extern void cgit_object_link(struct object *obj);
263 263
264extern void cgit_print_error(char *msg); 264extern void cgit_print_error(char *msg);
265extern void cgit_print_date(time_t secs, char *format); 265extern void cgit_print_date(time_t secs, char *format);
266extern void cgit_print_age(time_t t, time_t max_relative, char *format); 266extern void cgit_print_age(time_t t, time_t max_relative, char *format);
267extern void cgit_print_http_headers(struct cgit_context *ctx); 267extern void cgit_print_http_headers(struct cgit_context *ctx);
268extern void cgit_print_docstart(struct cgit_context *ctx); 268extern void cgit_print_docstart(struct cgit_context *ctx);
269extern void cgit_print_docend(); 269extern void cgit_print_docend();
270extern void cgit_print_pageheader(struct cgit_context *ctx); 270extern void cgit_print_pageheader(struct cgit_context *ctx);
271extern void cgit_print_filemode(unsigned short mode); 271extern void cgit_print_filemode(unsigned short mode);
272extern void cgit_print_branches(int maxcount);
273extern void cgit_print_tags(int maxcount);
274
275extern void cgit_print_repolist();
276extern void cgit_print_summary();
277extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
278 char *pattern, char *path, int pager);
279extern void cgit_print_blob(const char *hex, char *path);
280extern void cgit_print_tree(const char *rev, char *path);
281extern void cgit_print_commit(char *hex);
282extern void cgit_print_refs();
283extern void cgit_print_tag(char *revname);
284extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
285extern void cgit_print_patch(char *hex);
286extern void cgit_print_snapshot(const char *head, const char *hex,
287 const char *prefix, const char *filename,
288 int snapshot);
289extern void cgit_print_snapshot_links(const char *repo, const char *head, 272extern void cgit_print_snapshot_links(const char *repo, const char *head,
290 const char *hex, int snapshots); 273 const char *hex, int snapshots);
291extern int cgit_parse_snapshots_mask(const char *str); 274extern int cgit_parse_snapshots_mask(const char *str);
292 275
293#endif /* CGIT_H */ 276#endif /* CGIT_H */
diff --git a/cmd.c b/cmd.c
index 489a11c..e0eacbe 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,101 +1,112 @@
1/* cmd.c: the cgit command dispatcher 1/* cmd.c: the cgit command dispatcher
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cmd.h" 10#include "cmd.h"
11#include "ui-blob.h"
12#include "ui-commit.h"
13#include "ui-diff.h"
14#include "ui-log.h"
15#include "ui-patch.h"
16#include "ui-refs.h"
17#include "ui-repolist.h"
18#include "ui-snapshot.h"
19#include "ui-summary.h"
20#include "ui-tag.h"
21#include "ui-tree.h"
11 22
12static void blob_fn(struct cgit_context *ctx) 23static void blob_fn(struct cgit_context *ctx)
13{ 24{
14 cgit_print_blob(ctx->qry.sha1, ctx->qry.path); 25 cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
15} 26}
16 27
17static void commit_fn(struct cgit_context *ctx) 28static void commit_fn(struct cgit_context *ctx)
18{ 29{
19 cgit_print_commit(ctx->qry.sha1); 30 cgit_print_commit(ctx->qry.sha1);
20} 31}
21 32
22static void diff_fn(struct cgit_context *ctx) 33static void diff_fn(struct cgit_context *ctx)
23{ 34{
24 cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); 35 cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
25} 36}
26 37
27static void repolist_fn(struct cgit_context *ctx) 38static void repolist_fn(struct cgit_context *ctx)
28{ 39{
29 cgit_print_repolist(); 40 cgit_print_repolist();
30} 41}
31 42
32static void log_fn(struct cgit_context *ctx) 43static void log_fn(struct cgit_context *ctx)
33{ 44{
34 cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, 45 cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
35 ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); 46 ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
36} 47}
37 48
38static void patch_fn(struct cgit_context *ctx) 49static void patch_fn(struct cgit_context *ctx)
39{ 50{
40 cgit_print_patch(ctx->qry.sha1); 51 cgit_print_patch(ctx->qry.sha1);
41} 52}
42 53
43static void refs_fn(struct cgit_context *ctx) 54static void refs_fn(struct cgit_context *ctx)
44{ 55{
45 cgit_print_refs(); 56 cgit_print_refs();
46} 57}
47 58
48static void snapshot_fn(struct cgit_context *ctx) 59static void snapshot_fn(struct cgit_context *ctx)
49{ 60{
50 cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, 61 cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1,
51 cgit_repobasename(ctx->repo->url), ctx->qry.path, 62 cgit_repobasename(ctx->repo->url), ctx->qry.path,
52 ctx->repo->snapshots); 63 ctx->repo->snapshots);
53} 64}
54 65
55static void summary_fn(struct cgit_context *ctx) 66static void summary_fn(struct cgit_context *ctx)
56{ 67{
57 cgit_print_summary(); 68 cgit_print_summary();
58} 69}
59 70
60static void tag_fn(struct cgit_context *ctx) 71static void tag_fn(struct cgit_context *ctx)
61{ 72{
62 cgit_print_tag(ctx->qry.sha1); 73 cgit_print_tag(ctx->qry.sha1);
63} 74}
64 75
65static void tree_fn(struct cgit_context *ctx) 76static void tree_fn(struct cgit_context *ctx)
66{ 77{
67 cgit_print_tree(ctx->qry.sha1, ctx->qry.path); 78 cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
68} 79}
69 80
70#define def_cmd(name, want_repo, want_layout) \ 81#define def_cmd(name, want_repo, want_layout) \
71 {#name, name##_fn, want_repo, want_layout} 82 {#name, name##_fn, want_repo, want_layout}
72 83
73struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) 84struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
74{ 85{
75 static struct cgit_cmd cmds[] = { 86 static struct cgit_cmd cmds[] = {
76 def_cmd(blob, 1, 0), 87 def_cmd(blob, 1, 0),
77 def_cmd(commit, 1, 1), 88 def_cmd(commit, 1, 1),
78 def_cmd(diff, 1, 1), 89 def_cmd(diff, 1, 1),
79 def_cmd(log, 1, 1), 90 def_cmd(log, 1, 1),
80 def_cmd(patch, 1, 0), 91 def_cmd(patch, 1, 0),
81 def_cmd(refs, 1, 1), 92 def_cmd(refs, 1, 1),
82 def_cmd(repolist, 0, 0), 93 def_cmd(repolist, 0, 0),
83 def_cmd(snapshot, 1, 0), 94 def_cmd(snapshot, 1, 0),
84 def_cmd(summary, 1, 1), 95 def_cmd(summary, 1, 1),
85 def_cmd(tag, 1, 1), 96 def_cmd(tag, 1, 1),
86 def_cmd(tree, 1, 1), 97 def_cmd(tree, 1, 1),
87 }; 98 };
88 int i; 99 int i;
89 100
90 if (ctx->qry.page == NULL) { 101 if (ctx->qry.page == NULL) {
91 if (ctx->repo) 102 if (ctx->repo)
92 ctx->qry.page = "summary"; 103 ctx->qry.page = "summary";
93 else 104 else
94 ctx->qry.page = "repolist"; 105 ctx->qry.page = "repolist";
95 } 106 }
96 107
97 for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) 108 for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++)
98 if (!strcmp(ctx->qry.page, cmds[i].name)) 109 if (!strcmp(ctx->qry.page, cmds[i].name))
99 return &cmds[i]; 110 return &cmds[i];
100 return NULL; 111 return NULL;
101} 112}
diff --git a/ui-blob.h b/ui-blob.h
new file mode 100644
index 0000000..5a920a8
--- a/dev/null
+++ b/ui-blob.h
@@ -0,0 +1,6 @@
1#ifndef UI_BLOB_H
2#define UI_BLOB_H
3
4extern void cgit_print_blob(const char *hex, char *path);
5
6#endif /* UI_BLOB_H */
diff --git a/ui-commit.h b/ui-commit.h
new file mode 100644
index 0000000..40bcb31
--- a/dev/null
+++ b/ui-commit.h
@@ -0,0 +1,6 @@
1#ifndef UI_COMMIT_H
2#define UI_COMMIT_H
3
4extern void cgit_print_commit(char *hex);
5
6#endif /* UI_COMMIT_H */
diff --git a/ui-diff.h b/ui-diff.h
new file mode 100644
index 0000000..2307322
--- a/dev/null
+++ b/ui-diff.h
@@ -0,0 +1,7 @@
1#ifndef UI_DIFF_H
2#define UI_DIFF_H
3
4extern void cgit_print_diff(const char *new_hex, const char *old_hex,
5 const char *prefix);
6
7#endif /* UI_DIFF_H */
diff --git a/ui-log.h b/ui-log.h
new file mode 100644
index 0000000..877e40e
--- a/dev/null
+++ b/ui-log.h
@@ -0,0 +1,7 @@
1#ifndef UI_LOG_H
2#define UI_LOG_H
3
4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
5 char *pattern, char *path, int pager);
6
7#endif /* UI_LOG_H */
diff --git a/ui-patch.h b/ui-patch.h
new file mode 100644
index 0000000..9f68212
--- a/dev/null
+++ b/ui-patch.h
@@ -0,0 +1,6 @@
1#ifndef UI_PATCH_H
2#define UI_PATCH_H
3
4extern void cgit_print_patch(char *hex);
5
6#endif /* UI_PATCH_H */
diff --git a/ui-refs.c b/ui-refs.c
index e2a16f4..fc82ca7 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -1,28 +1,200 @@
1/* ui-refs.c: browse symbolic refs 1/* ui-refs.c: browse symbolic refs
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11 11
12static int header;
13
14static int cmp_age(int age1, int age2)
15{
16 if (age1 != 0 && age2 != 0)
17 return age2 - age1;
18
19 if (age1 == 0 && age2 == 0)
20 return 0;
21
22 if (age1 == 0)
23 return +1;
24
25 return -1;
26}
27
28static int cmp_ref_name(const void *a, const void *b)
29{
30 struct refinfo *r1 = *(struct refinfo **)a;
31 struct refinfo *r2 = *(struct refinfo **)b;
32
33 return strcmp(r1->refname, r2->refname);
34}
35
36static int cmp_branch_age(const void *a, const void *b)
37{
38 struct refinfo *r1 = *(struct refinfo **)a;
39 struct refinfo *r2 = *(struct refinfo **)b;
40
41 return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
42}
43
44static int cmp_tag_age(const void *a, const void *b)
45{
46 struct refinfo *r1 = *(struct refinfo **)a;
47 struct refinfo *r2 = *(struct refinfo **)b;
48
49 return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
50}
51
52static int print_branch(struct refinfo *ref)
53{
54 struct commitinfo *info = ref->commit;
55 char *name = (char *)ref->refname;
56
57 if (!info)
58 return 1;
59 html("<tr><td>");
60 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
61 html("</td><td>");
62
63 if (ref->object->type == OBJ_COMMIT) {
64 cgit_print_age(info->commit->date, -1, NULL);
65 html("</td><td>");
66 html_txt(info->author);
67 html("</td><td>");
68 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
69 } else {
70 html("</td><td></td><td>");
71 cgit_object_link(ref->object);
72 }
73 html("</td></tr>\n");
74 return 0;
75}
76
77static void print_tag_header()
78{
79 html("<tr class='nohover'><th class='left'>Tag</th>"
80 "<th class='left'>Age</th>"
81 "<th class='left'>Author</th>"
82 "<th class='left'>Reference</th></tr>\n");
83 header = 1;
84}
85
86static int print_tag(struct refinfo *ref)
87{
88 struct tag *tag;
89 struct taginfo *info;
90 char *url, *name = (char *)ref->refname;
91
92 if (ref->object->type == OBJ_TAG) {
93 tag = (struct tag *)ref->object;
94 info = ref->tag;
95 if (!tag || !info)
96 return 1;
97 html("<tr><td>");
98 url = cgit_pageurl(ctx.qry.repo, "tag",
99 fmt("id=%s", name));
100 html_link_open(url, NULL, NULL);
101 html_txt(name);
102 html_link_close();
103 html("</td><td>");
104 if (info->tagger_date > 0)
105 cgit_print_age(info->tagger_date, -1, NULL);
106 html("</td><td>");
107 if (info->tagger)
108 html(info->tagger);
109 html("</td><td>");
110 cgit_object_link(tag->tagged);
111 html("</td></tr>\n");
112 } else {
113 if (!header)
114 print_tag_header();
115 html("<tr><td>");
116 html_txt(name);
117 html("</td><td colspan='2'/><td>");
118 cgit_object_link(ref->object);
119 html("</td></tr>\n");
120 }
121 return 0;
122}
123
124static void print_refs_link(char *path)
125{
126 html("<tr class='nohover'><td colspan='4'>");
127 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
128 html("</td></tr>");
129}
130
131void cgit_print_branches(int maxcount)
132{
133 struct reflist list;
134 int i;
135
136 html("<tr class='nohover'><th class='left'>Branch</th>"
137 "<th class='left'>Idle</th>"
138 "<th class='left'>Author</th>"
139 "<th class='left'>Head commit</th></tr>\n");
140
141 list.refs = NULL;
142 list.alloc = list.count = 0;
143 for_each_branch_ref(cgit_refs_cb, &list);
144
145 if (maxcount == 0 || maxcount > list.count)
146 maxcount = list.count;
147
148 if (maxcount < list.count) {
149 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
150 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
151 }
152
153 for(i=0; i<maxcount; i++)
154 print_branch(list.refs[i]);
155
156 if (maxcount < list.count)
157 print_refs_link("heads");
158}
159
160void cgit_print_tags(int maxcount)
161{
162 struct reflist list;
163 int i;
164
165 header = 0;
166 list.refs = NULL;
167 list.alloc = list.count = 0;
168 for_each_tag_ref(cgit_refs_cb, &list);
169 if (list.count == 0)
170 return;
171 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
172 if (!maxcount)
173 maxcount = list.count;
174 else if (maxcount > list.count)
175 maxcount = list.count;
176 print_tag_header();
177 for(i=0; i<maxcount; i++)
178 print_tag(list.refs[i]);
179
180 if (maxcount < list.count)
181 print_refs_link("tags");
182}
183
12void cgit_print_refs() 184void cgit_print_refs()
13{ 185{
14 186
15 html("<table class='list nowrap'>"); 187 html("<table class='list nowrap'>");
16 188
17 if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) 189 if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5))
18 cgit_print_branches(0); 190 cgit_print_branches(0);
19 else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) 191 else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
20 cgit_print_tags(0); 192 cgit_print_tags(0);
21 else { 193 else {
22 cgit_print_branches(0); 194 cgit_print_branches(0);
23 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 195 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
24 cgit_print_tags(0); 196 cgit_print_tags(0);
25 } 197 }
26 198
27 html("</table>"); 199 html("</table>");
28} 200}
diff --git a/ui-refs.h b/ui-refs.h
new file mode 100644
index 0000000..b35c04a
--- a/dev/null
+++ b/ui-refs.h
@@ -0,0 +1,8 @@
1#ifndef UI_REFS_H
2#define UI_REFS_H
3
4extern void cgit_print_branches(int maxcount);
5extern void cgit_print_tags(int maxcount);
6extern void cgit_print_refs();
7
8#endif /* UI_REFS_H */
diff --git a/ui-repolist.h b/ui-repolist.h
new file mode 100644
index 0000000..c23e5d2
--- a/dev/null
+++ b/ui-repolist.h
@@ -0,0 +1,6 @@
1#ifndef UI_REPOLIST_H
2#define UI_REPOLIST_H
3
4extern void cgit_print_repolist();
5
6#endif /* UI_REPOLIST_H */
diff --git a/ui-snapshot.h b/ui-snapshot.h
new file mode 100644
index 0000000..6e03761
--- a/dev/null
+++ b/ui-snapshot.h
@@ -0,0 +1,8 @@
1#ifndef UI_SNAPSHOT_H
2#define UI_SNAPSHOT_H
3
4extern void cgit_print_snapshot(const char *head, const char *hex,
5 const char *prefix, const char *filename,
6 int snapshot);
7
8#endif /* UI_SNAPSHOT_H */
diff --git a/ui-summary.c b/ui-summary.c
index 0afa0a3..0b66b52 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,201 +1,31 @@
1/* ui-summary.c: functions for generating repo summary page 1/* ui-summary.c: functions for generating repo summary page
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11 11#include "ui-log.h"
12static int header; 12#include "ui-refs.h"
13
14static int cmp_age(int age1, int age2)
15{
16 if (age1 != 0 && age2 != 0)
17 return age2 - age1;
18
19 if (age1 == 0 && age2 == 0)
20 return 0;
21
22 if (age1 == 0)
23 return +1;
24
25 return -1;
26}
27
28static int cmp_ref_name(const void *a, const void *b)
29{
30 struct refinfo *r1 = *(struct refinfo **)a;
31 struct refinfo *r2 = *(struct refinfo **)b;
32
33 return strcmp(r1->refname, r2->refname);
34}
35
36static int cmp_branch_age(const void *a, const void *b)
37{
38 struct refinfo *r1 = *(struct refinfo **)a;
39 struct refinfo *r2 = *(struct refinfo **)b;
40
41 return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
42}
43
44static int cmp_tag_age(const void *a, const void *b)
45{
46 struct refinfo *r1 = *(struct refinfo **)a;
47 struct refinfo *r2 = *(struct refinfo **)b;
48
49 return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
50}
51
52static int print_branch(struct refinfo *ref)
53{
54 struct commitinfo *info = ref->commit;
55 char *name = (char *)ref->refname;
56
57 if (!info)
58 return 1;
59 html("<tr><td>");
60 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
61 html("</td><td>");
62
63 if (ref->object->type == OBJ_COMMIT) {
64 cgit_print_age(info->commit->date, -1, NULL);
65 html("</td><td>");
66 html_txt(info->author);
67 html("</td><td>");
68 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
69 } else {
70 html("</td><td></td><td>");
71 cgit_object_link(ref->object);
72 }
73 html("</td></tr>\n");
74 return 0;
75}
76
77static void print_tag_header()
78{
79 html("<tr class='nohover'><th class='left'>Tag</th>"
80 "<th class='left'>Age</th>"
81 "<th class='left'>Author</th>"
82 "<th class='left'>Reference</th></tr>\n");
83 header = 1;
84}
85
86static int print_tag(struct refinfo *ref)
87{
88 struct tag *tag;
89 struct taginfo *info;
90 char *url, *name = (char *)ref->refname;
91
92 if (ref->object->type == OBJ_TAG) {
93 tag = (struct tag *)ref->object;
94 info = ref->tag;
95 if (!tag || !info)
96 return 1;
97 html("<tr><td>");
98 url = cgit_pageurl(ctx.qry.repo, "tag",
99 fmt("id=%s", name));
100 html_link_open(url, NULL, NULL);
101 html_txt(name);
102 html_link_close();
103 html("</td><td>");
104 if (info->tagger_date > 0)
105 cgit_print_age(info->tagger_date, -1, NULL);
106 html("</td><td>");
107 if (info->tagger)
108 html(info->tagger);
109 html("</td><td>");
110 cgit_object_link(tag->tagged);
111 html("</td></tr>\n");
112 } else {
113 if (!header)
114 print_tag_header();
115 html("<tr><td>");
116 html_txt(name);
117 html("</td><td colspan='2'/><td>");
118 cgit_object_link(ref->object);
119 html("</td></tr>\n");
120 }
121 return 0;
122}
123
124static void print_refs_link(char *path)
125{
126 html("<tr class='nohover'><td colspan='4'>");
127 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
128 html("</td></tr>");
129}
130
131void cgit_print_branches(int maxcount)
132{
133 struct reflist list;
134 int i;
135
136 html("<tr class='nohover'><th class='left'>Branch</th>"
137 "<th class='left'>Idle</th>"
138 "<th class='left'>Author</th>"
139 "<th class='left'>Head commit</th></tr>\n");
140
141 list.refs = NULL;
142 list.alloc = list.count = 0;
143 for_each_branch_ref(cgit_refs_cb, &list);
144
145 if (maxcount == 0 || maxcount > list.count)
146 maxcount = list.count;
147
148 if (maxcount < list.count) {
149 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
150 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
151 }
152
153 for(i=0; i<maxcount; i++)
154 print_branch(list.refs[i]);
155
156 if (maxcount < list.count)
157 print_refs_link("heads");
158}
159
160void cgit_print_tags(int maxcount)
161{
162 struct reflist list;
163 int i;
164
165 header = 0;
166 list.refs = NULL;
167 list.alloc = list.count = 0;
168 for_each_tag_ref(cgit_refs_cb, &list);
169 if (list.count == 0)
170 return;
171 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
172 if (!maxcount)
173 maxcount = list.count;
174 else if (maxcount > list.count)
175 maxcount = list.count;
176 print_tag_header();
177 for(i=0; i<maxcount; i++)
178 print_tag(list.refs[i]);
179
180 if (maxcount < list.count)
181 print_refs_link("tags");
182}
183 13
184void cgit_print_summary() 14void cgit_print_summary()
185{ 15{
186 if (ctx.repo->readme) { 16 if (ctx.repo->readme) {
187 html("<div id='summary'>"); 17 html("<div id='summary'>");
188 html_include(ctx.repo->readme); 18 html_include(ctx.repo->readme);
189 html("</div>"); 19 html("</div>");
190 } 20 }
191 if (ctx.cfg.summary_log > 0) 21 if (ctx.cfg.summary_log > 0)
192 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, 22 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
193 NULL, NULL, 0); 23 NULL, NULL, 0);
194 html("<table summary='repository info' class='list nowrap'>"); 24 html("<table summary='repository info' class='list nowrap'>");
195 if (ctx.cfg.summary_log > 0) 25 if (ctx.cfg.summary_log > 0)
196 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 26 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
197 cgit_print_branches(ctx.cfg.summary_branches); 27 cgit_print_branches(ctx.cfg.summary_branches);
198 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 28 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
199 cgit_print_tags(ctx.cfg.summary_tags); 29 cgit_print_tags(ctx.cfg.summary_tags);
200 html("</table>"); 30 html("</table>");
201} 31}
diff --git a/ui-summary.h b/ui-summary.h
new file mode 100644
index 0000000..37aedd2
--- a/dev/null
+++ b/ui-summary.h
@@ -0,0 +1,6 @@
1#ifndef UI_SUMMARY_H
2#define UI_SUMMARY_H
3
4extern void cgit_print_summary();
5
6#endif /* UI_SUMMARY_H */
diff --git a/ui-tag.h b/ui-tag.h
new file mode 100644
index 0000000..d295cdc
--- a/dev/null
+++ b/ui-tag.h
@@ -0,0 +1,6 @@
1#ifndef UI_TAG_H
2#define UI_TAG_H
3
4extern void cgit_print_tag(char *revname);
5
6#endif /* UI_TAG_H */
diff --git a/ui-tree.h b/ui-tree.h
new file mode 100644
index 0000000..bbd34e3
--- a/dev/null
+++ b/ui-tree.h
@@ -0,0 +1,6 @@
1#ifndef UI_TREE_H
2#define UI_TREE_H
3
4extern void cgit_print_tree(const char *rev, char *path);
5
6#endif /* UI_TREE_H */