author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:38:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:38:47 (UTC) |
commit | c5984a9896b39748e61daf6e620483749654b102 (patch) (unidiff) | |
tree | 5576deee2c5bcc92ae85ab07af215295c52d4143 | |
parent | f34478cbe0214a201e7ecef3e79ed6c957b7beee (diff) | |
download | cgit-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>
-rw-r--r-- | cgit.h | 17 | ||||
-rw-r--r-- | cmd.c | 11 | ||||
-rw-r--r-- | ui-blob.h | 6 | ||||
-rw-r--r-- | ui-commit.h | 6 | ||||
-rw-r--r-- | ui-diff.h | 7 | ||||
-rw-r--r-- | ui-log.h | 7 | ||||
-rw-r--r-- | ui-patch.h | 6 | ||||
-rw-r--r-- | ui-refs.c | 172 | ||||
-rw-r--r-- | ui-refs.h | 8 | ||||
-rw-r--r-- | ui-repolist.h | 6 | ||||
-rw-r--r-- | ui-snapshot.h | 8 | ||||
-rw-r--r-- | ui-summary.c | 174 | ||||
-rw-r--r-- | ui-summary.h | 6 | ||||
-rw-r--r-- | ui-tag.h | 6 | ||||
-rw-r--r-- | ui-tree.h | 6 |
15 files changed, 257 insertions, 189 deletions
@@ -208,86 +208,69 @@ extern char *strrpart(char *txt, int maxlen); | |||
208 | 208 | ||
209 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 209 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
210 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 210 | extern 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 | ||
213 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 213 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
214 | 214 | ||
215 | extern int cgit_diff_files(const unsigned char *old_sha1, | 215 | extern 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 | ||
219 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 219 | extern 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 | ||
223 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 223 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
224 | 224 | ||
225 | extern char *fmt(const char *format,...); | 225 | extern char *fmt(const char *format,...); |
226 | 226 | ||
227 | extern int cgit_read_config(const char *filename, configfn fn); | 227 | extern int cgit_read_config(const char *filename, configfn fn); |
228 | extern int cgit_parse_query(char *txt, configfn fn); | 228 | extern int cgit_parse_query(char *txt, configfn fn); |
229 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 229 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
230 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 230 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
231 | extern void cgit_parse_url(const char *url); | 231 | extern void cgit_parse_url(const char *url); |
232 | 232 | ||
233 | extern char *cache_safe_filename(const char *unsafe); | 233 | extern char *cache_safe_filename(const char *unsafe); |
234 | extern int cache_lock(struct cacheitem *item); | 234 | extern int cache_lock(struct cacheitem *item); |
235 | extern int cache_unlock(struct cacheitem *item); | 235 | extern int cache_unlock(struct cacheitem *item); |
236 | extern int cache_cancel_lock(struct cacheitem *item); | 236 | extern int cache_cancel_lock(struct cacheitem *item); |
237 | extern int cache_exist(struct cacheitem *item); | 237 | extern int cache_exist(struct cacheitem *item); |
238 | extern int cache_expired(struct cacheitem *item); | 238 | extern int cache_expired(struct cacheitem *item); |
239 | 239 | ||
240 | extern char *cgit_repourl(const char *reponame); | 240 | extern char *cgit_repourl(const char *reponame); |
241 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 241 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
242 | const char *filename, const char *query); | 242 | const char *filename, const char *query); |
243 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 243 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
244 | const char *query); | 244 | const char *query); |
245 | 245 | ||
246 | extern const char *cgit_repobasename(const char *reponame); | 246 | extern const char *cgit_repobasename(const char *reponame); |
247 | 247 | ||
248 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 248 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
249 | char *rev, char *path); | 249 | char *rev, char *path); |
250 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 250 | extern 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); |
253 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 253 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
254 | char *rev); | 254 | char *rev); |
255 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | 255 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
256 | char *rev, char *path); | 256 | char *rev, char *path); |
257 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 257 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
258 | char *head, char *rev, char *archivename); | 258 | char *head, char *rev, char *archivename); |
259 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 259 | extern 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 | ||
262 | extern void cgit_object_link(struct object *obj); | 262 | extern void cgit_object_link(struct object *obj); |
263 | 263 | ||
264 | extern void cgit_print_error(char *msg); | 264 | extern void cgit_print_error(char *msg); |
265 | extern void cgit_print_date(time_t secs, char *format); | 265 | extern void cgit_print_date(time_t secs, char *format); |
266 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 266 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
267 | extern void cgit_print_http_headers(struct cgit_context *ctx); | 267 | extern void cgit_print_http_headers(struct cgit_context *ctx); |
268 | extern void cgit_print_docstart(struct cgit_context *ctx); | 268 | extern void cgit_print_docstart(struct cgit_context *ctx); |
269 | extern void cgit_print_docend(); | 269 | extern void cgit_print_docend(); |
270 | extern void cgit_print_pageheader(struct cgit_context *ctx); | 270 | extern void cgit_print_pageheader(struct cgit_context *ctx); |
271 | extern void cgit_print_filemode(unsigned short mode); | 271 | extern void cgit_print_filemode(unsigned short mode); |
272 | extern void cgit_print_branches(int maxcount); | ||
273 | extern void cgit_print_tags(int maxcount); | ||
274 | |||
275 | extern void cgit_print_repolist(); | ||
276 | extern void cgit_print_summary(); | ||
277 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, | ||
278 | char *pattern, char *path, int pager); | ||
279 | extern void cgit_print_blob(const char *hex, char *path); | ||
280 | extern void cgit_print_tree(const char *rev, char *path); | ||
281 | extern void cgit_print_commit(char *hex); | ||
282 | extern void cgit_print_refs(); | ||
283 | extern void cgit_print_tag(char *revname); | ||
284 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); | ||
285 | extern void cgit_print_patch(char *hex); | ||
286 | extern void cgit_print_snapshot(const char *head, const char *hex, | ||
287 | const char *prefix, const char *filename, | ||
288 | int snapshot); | ||
289 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 272 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
290 | const char *hex, int snapshots); | 273 | const char *hex, int snapshots); |
291 | extern int cgit_parse_snapshots_mask(const char *str); | 274 | extern int cgit_parse_snapshots_mask(const char *str); |
292 | 275 | ||
293 | #endif /* CGIT_H */ | 276 | #endif /* CGIT_H */ |
@@ -1,74 +1,85 @@ | |||
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 | ||
12 | static void blob_fn(struct cgit_context *ctx) | 23 | static 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 | ||
17 | static void commit_fn(struct cgit_context *ctx) | 28 | static 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 | ||
22 | static void diff_fn(struct cgit_context *ctx) | 33 | static 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 | ||
27 | static void repolist_fn(struct cgit_context *ctx) | 38 | static void repolist_fn(struct cgit_context *ctx) |
28 | { | 39 | { |
29 | cgit_print_repolist(); | 40 | cgit_print_repolist(); |
30 | } | 41 | } |
31 | 42 | ||
32 | static void log_fn(struct cgit_context *ctx) | 43 | static 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 | ||
38 | static void patch_fn(struct cgit_context *ctx) | 49 | static 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 | ||
43 | static void refs_fn(struct cgit_context *ctx) | 54 | static void refs_fn(struct cgit_context *ctx) |
44 | { | 55 | { |
45 | cgit_print_refs(); | 56 | cgit_print_refs(); |
46 | } | 57 | } |
47 | 58 | ||
48 | static void snapshot_fn(struct cgit_context *ctx) | 59 | static 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 | ||
55 | static void summary_fn(struct cgit_context *ctx) | 66 | static void summary_fn(struct cgit_context *ctx) |
56 | { | 67 | { |
57 | cgit_print_summary(); | 68 | cgit_print_summary(); |
58 | } | 69 | } |
59 | 70 | ||
60 | static void tag_fn(struct cgit_context *ctx) | 71 | static 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 | ||
65 | static void tree_fn(struct cgit_context *ctx) | 76 | static 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 | ||
73 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 84 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
74 | { | 85 | { |
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 | |||
4 | extern 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 | |||
4 | extern 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 | |||
4 | extern 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 | |||
4 | extern 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 | |||
4 | extern void cgit_print_patch(char *hex); | ||
5 | |||
6 | #endif /* UI_PATCH_H */ | ||
@@ -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 | ||
12 | static int header; | ||
13 | |||
14 | static 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 | |||
28 | static 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 | |||
36 | static 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 | |||
44 | static 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 | |||
52 | static 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 | |||
77 | static 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 | |||
86 | static 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 | |||
124 | static 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 | |||
131 | void 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 | |||
160 | void 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 | |||
12 | void cgit_print_refs() | 184 | void 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'> </td></tr>"); | 195 | html("<tr class='nohover'><td colspan='4'> </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 | |||
4 | extern void cgit_print_branches(int maxcount); | ||
5 | extern void cgit_print_tags(int maxcount); | ||
6 | extern 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 | |||
4 | extern 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 | |||
4 | extern 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" | |
12 | static int header; | 12 | #include "ui-refs.h" |
13 | |||
14 | static 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 | |||
28 | static 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 | |||
36 | static 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 | |||
44 | static 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 | |||
52 | static 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 | |||
77 | static 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 | |||
86 | static 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 | |||
124 | static 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 | |||
131 | void 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 | |||
160 | void 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 | ||
184 | void cgit_print_summary() | 14 | void 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'> </td></tr>"); | 26 | html("<tr class='nohover'><td colspan='4'> </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'> </td></tr>"); | 28 | html("<tr class='nohover'><td colspan='4'> </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 | |||
4 | extern 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 | |||
4 | extern 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 | |||
4 | extern void cgit_print_tree(const char *rev, char *path); | ||
5 | |||
6 | #endif /* UI_TREE_H */ | ||