summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-18 20:48:22 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-18 20:51:18 (UTC)
commit5877c49f68b1e1bef94b4867f22c336f0e1605b6 (patch) (unidiff)
tree4e628096d9f189b7ef5ff9dcda40a07a5f7b21d0
parent08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff)
downloadcgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.zip
cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.tar.gz
cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.tar.bz2
Teach cgit how to group repositories by category
The new parameter 'repo.group' is used to set the repository group for the following repositores. Whenever this parameter changes value, a subheading is generated in the index page (printing the current value of repo.group). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css5
-rw-r--r--cgit.h2
-rw-r--r--shared.c4
-rw-r--r--ui-repolist.c10
4 files changed, 21 insertions, 0 deletions
diff --git a/cgit.css b/cgit.css
index 6c7f9c3..88a0a1d 100644
--- a/cgit.css
+++ b/cgit.css
@@ -260,96 +260,101 @@ table.diffstat th {
260 font-size: 100%; 260 font-size: 100%;
261} 261}
262 262
263table.diffstat td { 263table.diffstat td {
264 padding: 0.2em 0.2em 0.1em 0.1em; 264 padding: 0.2em 0.2em 0.1em 0.1em;
265 font-size: 100%; 265 font-size: 100%;
266 border: none; 266 border: none;
267} 267}
268 268
269table.diffstat td.mode { 269table.diffstat td.mode {
270 white-space: nowrap; 270 white-space: nowrap;
271} 271}
272 272
273table.diffstat td span.modechange { 273table.diffstat td span.modechange {
274 padding-left: 1em; 274 padding-left: 1em;
275 color: red; 275 color: red;
276} 276}
277 277
278table.diffstat td.add a { 278table.diffstat td.add a {
279 color: green; 279 color: green;
280} 280}
281 281
282table.diffstat td.del a { 282table.diffstat td.del a {
283 color: red; 283 color: red;
284} 284}
285 285
286table.diffstat td.upd a { 286table.diffstat td.upd a {
287 color: blue; 287 color: blue;
288} 288}
289 289
290table.diffstat td.graph { 290table.diffstat td.graph {
291 width: 75%; 291 width: 75%;
292 vertical-align: center; 292 vertical-align: center;
293} 293}
294 294
295table.diffstat td.graph table { 295table.diffstat td.graph table {
296 border: none; 296 border: none;
297} 297}
298 298
299table.diffstat td.graph td { 299table.diffstat td.graph td {
300 padding: 0px; 300 padding: 0px;
301 border: 0px; 301 border: 0px;
302 height: 7pt; 302 height: 7pt;
303} 303}
304 304
305table.diffstat td.graph td.add { 305table.diffstat td.graph td.add {
306 background-color: #5c5; 306 background-color: #5c5;
307} 307}
308 308
309table.diffstat td.graph td.rem { 309table.diffstat td.graph td.rem {
310 background-color: #c55; 310 background-color: #c55;
311} 311}
312 312
313table.diffstat td.graph td.none { 313table.diffstat td.graph td.none {
314 background-color: none; 314 background-color: none;
315} 315}
316 316
317div.diffstat-summary { 317div.diffstat-summary {
318 color: #888; 318 color: #888;
319 padding-top: 0.5em; 319 padding-top: 0.5em;
320} 320}
321 321
322table.diff td { 322table.diff td {
323 font-family: monospace; 323 font-family: monospace;
324 white-space: pre; 324 white-space: pre;
325} 325}
326 326
327table.diff td div.head { 327table.diff td div.head {
328 font-weight: bold; 328 font-weight: bold;
329 padding-top: 1em; 329 padding-top: 1em;
330} 330}
331 331
332table.diff td div.hunk { 332table.diff td div.hunk {
333 color: #009; 333 color: #009;
334} 334}
335 335
336table.diff td div.add { 336table.diff td div.add {
337 color: green; 337 color: green;
338} 338}
339 339
340table.diff td div.del { 340table.diff td div.del {
341 color: red; 341 color: red;
342} 342}
343 343
344.sha1 { 344.sha1 {
345 font-family: courier; 345 font-family: courier;
346 font-size: 90%; 346 font-size: 90%;
347} 347}
348 348
349.left { 349.left {
350 text-align: left; 350 text-align: left;
351} 351}
352 352
353.right { 353.right {
354 text-align: right; 354 text-align: right;
355} 355}
356
357table.list td.repogroup {
358 padding-top: 1em;
359 font-weight: bold;
360}
diff --git a/cgit.h b/cgit.h
index f3d783e..8a69a1f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,178 +1,180 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
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 19
20 20
21typedef void (*configfn)(const char *name, const char *value); 21typedef void (*configfn)(const char *name, const char *value);
22typedef void (*filepair_fn)(struct diff_filepair *pair); 22typedef void (*filepair_fn)(struct diff_filepair *pair);
23typedef void (*linediff_fn)(char *line, int len); 23typedef void (*linediff_fn)(char *line, int len);
24 24
25struct cacheitem { 25struct cacheitem {
26 char *name; 26 char *name;
27 struct stat st; 27 struct stat st;
28 int ttl; 28 int ttl;
29 int fd; 29 int fd;
30}; 30};
31 31
32struct repoinfo { 32struct repoinfo {
33 char *url; 33 char *url;
34 char *name; 34 char *name;
35 char *path; 35 char *path;
36 char *desc; 36 char *desc;
37 char *owner; 37 char *owner;
38 char *defbranch; 38 char *defbranch;
39 char *group;
39 char *module_link; 40 char *module_link;
40 int snapshots; 41 int snapshots;
41 int enable_log_filecount; 42 int enable_log_filecount;
42 int enable_log_linecount; 43 int enable_log_linecount;
43}; 44};
44 45
45struct repolist { 46struct repolist {
46 int length; 47 int length;
47 int count; 48 int count;
48 struct repoinfo *repos; 49 struct repoinfo *repos;
49}; 50};
50 51
51struct commitinfo { 52struct commitinfo {
52 struct commit *commit; 53 struct commit *commit;
53 char *author; 54 char *author;
54 char *author_email; 55 char *author_email;
55 unsigned long author_date; 56 unsigned long author_date;
56 char *committer; 57 char *committer;
57 char *committer_email; 58 char *committer_email;
58 unsigned long committer_date; 59 unsigned long committer_date;
59 char *subject; 60 char *subject;
60 char *msg; 61 char *msg;
61}; 62};
62 63
63struct taginfo { 64struct taginfo {
64 char *tagger; 65 char *tagger;
65 char *tagger_email; 66 char *tagger_email;
66 int tagger_date; 67 int tagger_date;
67 char *msg; 68 char *msg;
68}; 69};
69 70
70extern const char cgit_version[]; 71extern const char cgit_version[];
71 72
72extern struct repolist cgit_repolist; 73extern struct repolist cgit_repolist;
73extern struct repoinfo *cgit_repo; 74extern struct repoinfo *cgit_repo;
74 75
75extern char *cgit_root_title; 76extern char *cgit_root_title;
76extern char *cgit_css; 77extern char *cgit_css;
77extern char *cgit_logo; 78extern char *cgit_logo;
78extern char *cgit_logo_link; 79extern char *cgit_logo_link;
79extern char *cgit_module_link; 80extern char *cgit_module_link;
80extern char *cgit_virtual_root; 81extern char *cgit_virtual_root;
81extern char *cgit_script_name; 82extern char *cgit_script_name;
82extern char *cgit_cache_root; 83extern char *cgit_cache_root;
84extern char *cgit_repo_group;
83 85
84extern int cgit_nocache; 86extern int cgit_nocache;
85extern int cgit_snapshots; 87extern int cgit_snapshots;
86extern int cgit_enable_log_filecount; 88extern int cgit_enable_log_filecount;
87extern int cgit_enable_log_linecount; 89extern int cgit_enable_log_linecount;
88extern int cgit_max_lock_attempts; 90extern int cgit_max_lock_attempts;
89extern int cgit_cache_root_ttl; 91extern int cgit_cache_root_ttl;
90extern int cgit_cache_repo_ttl; 92extern int cgit_cache_repo_ttl;
91extern int cgit_cache_dynamic_ttl; 93extern int cgit_cache_dynamic_ttl;
92extern int cgit_cache_static_ttl; 94extern int cgit_cache_static_ttl;
93extern int cgit_cache_max_create_time; 95extern int cgit_cache_max_create_time;
94 96
95extern int cgit_max_msg_len; 97extern int cgit_max_msg_len;
96extern int cgit_max_repodesc_len; 98extern int cgit_max_repodesc_len;
97extern int cgit_max_commit_count; 99extern int cgit_max_commit_count;
98 100
99extern int cgit_query_has_symref; 101extern int cgit_query_has_symref;
100extern int cgit_query_has_sha1; 102extern int cgit_query_has_sha1;
101 103
102extern char *cgit_querystring; 104extern char *cgit_querystring;
103extern char *cgit_query_repo; 105extern char *cgit_query_repo;
104extern char *cgit_query_page; 106extern char *cgit_query_page;
105extern char *cgit_query_search; 107extern char *cgit_query_search;
106extern char *cgit_query_head; 108extern char *cgit_query_head;
107extern char *cgit_query_sha1; 109extern char *cgit_query_sha1;
108extern char *cgit_query_sha2; 110extern char *cgit_query_sha2;
109extern char *cgit_query_path; 111extern char *cgit_query_path;
110extern char *cgit_query_name; 112extern char *cgit_query_name;
111extern int cgit_query_ofs; 113extern int cgit_query_ofs;
112 114
113extern int htmlfd; 115extern int htmlfd;
114 116
115extern void cgit_global_config_cb(const char *name, const char *value); 117extern void cgit_global_config_cb(const char *name, const char *value);
116extern void cgit_repo_config_cb(const char *name, const char *value); 118extern void cgit_repo_config_cb(const char *name, const char *value);
117extern void cgit_querystring_cb(const char *name, const char *value); 119extern void cgit_querystring_cb(const char *name, const char *value);
118 120
119extern int chk_zero(int result, char *msg); 121extern int chk_zero(int result, char *msg);
120extern int chk_positive(int result, char *msg); 122extern int chk_positive(int result, char *msg);
121 123
122extern int hextoint(char c); 124extern int hextoint(char c);
123 125
124extern void *cgit_free_commitinfo(struct commitinfo *info); 126extern void *cgit_free_commitinfo(struct commitinfo *info);
125 127
126extern int cgit_diff_files(const unsigned char *old_sha1, 128extern int cgit_diff_files(const unsigned char *old_sha1,
127 const unsigned char *new_sha1, 129 const unsigned char *new_sha1,
128 linediff_fn fn); 130 linediff_fn fn);
129 131
130extern void cgit_diff_tree(const unsigned char *old_sha1, 132extern void cgit_diff_tree(const unsigned char *old_sha1,
131 const unsigned char *new_sha1, 133 const unsigned char *new_sha1,
132 filepair_fn fn); 134 filepair_fn fn);
133 135
134extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 136extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
135 137
136extern char *fmt(const char *format,...); 138extern char *fmt(const char *format,...);
137 139
138extern void html(const char *txt); 140extern void html(const char *txt);
139extern void htmlf(const char *format,...); 141extern void htmlf(const char *format,...);
140extern void html_txt(char *txt); 142extern void html_txt(char *txt);
141extern void html_ntxt(int len, char *txt); 143extern void html_ntxt(int len, char *txt);
142extern void html_attr(char *txt); 144extern void html_attr(char *txt);
143extern void html_hidden(char *name, char *value); 145extern void html_hidden(char *name, char *value);
144extern void html_link_open(char *url, char *title, char *class); 146extern void html_link_open(char *url, char *title, char *class);
145extern void html_link_close(void); 147extern void html_link_close(void);
146extern void html_filemode(unsigned short mode); 148extern void html_filemode(unsigned short mode);
147 149
148extern int cgit_read_config(const char *filename, configfn fn); 150extern int cgit_read_config(const char *filename, configfn fn);
149extern int cgit_parse_query(char *txt, configfn fn); 151extern int cgit_parse_query(char *txt, configfn fn);
150extern struct commitinfo *cgit_parse_commit(struct commit *commit); 152extern struct commitinfo *cgit_parse_commit(struct commit *commit);
151extern struct taginfo *cgit_parse_tag(struct tag *tag); 153extern struct taginfo *cgit_parse_tag(struct tag *tag);
152 154
153extern char *cache_safe_filename(const char *unsafe); 155extern char *cache_safe_filename(const char *unsafe);
154extern int cache_lock(struct cacheitem *item); 156extern int cache_lock(struct cacheitem *item);
155extern int cache_unlock(struct cacheitem *item); 157extern int cache_unlock(struct cacheitem *item);
156extern int cache_cancel_lock(struct cacheitem *item); 158extern int cache_cancel_lock(struct cacheitem *item);
157extern int cache_exist(struct cacheitem *item); 159extern int cache_exist(struct cacheitem *item);
158extern int cache_expired(struct cacheitem *item); 160extern int cache_expired(struct cacheitem *item);
159 161
160extern char *cgit_repourl(const char *reponame); 162extern char *cgit_repourl(const char *reponame);
161extern char *cgit_pageurl(const char *reponame, const char *pagename, 163extern char *cgit_pageurl(const char *reponame, const char *pagename,
162 const char *query); 164 const char *query);
163 165
164extern void cgit_print_error(char *msg); 166extern void cgit_print_error(char *msg);
165extern void cgit_print_date(unsigned long secs); 167extern void cgit_print_date(unsigned long secs);
166extern void cgit_print_docstart(char *title, struct cacheitem *item); 168extern void cgit_print_docstart(char *title, struct cacheitem *item);
167extern void cgit_print_docend(); 169extern void cgit_print_docend();
168extern void cgit_print_pageheader(char *title, int show_search); 170extern void cgit_print_pageheader(char *title, int show_search);
169extern void cgit_print_snapshot_start(const char *mimetype, 171extern void cgit_print_snapshot_start(const char *mimetype,
170 const char *filename, 172 const char *filename,
171 struct cacheitem *item); 173 struct cacheitem *item);
172 174
173extern void cgit_print_repolist(struct cacheitem *item); 175extern void cgit_print_repolist(struct cacheitem *item);
174extern void cgit_print_summary(); 176extern void cgit_print_summary();
175extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path); 177extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path);
176extern void cgit_print_view(const char *hex, char *path); 178extern void cgit_print_view(const char *hex, char *path);
177extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 179extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
178extern void cgit_print_tree(const char *rev, const char *hex, char *path); 180extern void cgit_print_tree(const char *rev, const char *hex, char *path);
diff --git a/shared.c b/shared.c
index 53cd9b0..4ddba61 100644
--- a/shared.c
+++ b/shared.c
@@ -1,229 +1,233 @@
1/* shared.c: global vars + some callback functions 1/* shared.c: global vars + some callback functions
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 10
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13 13
14char *cgit_root_title = "Git repository browser"; 14char *cgit_root_title = "Git repository browser";
15char *cgit_css = "/cgit.css"; 15char *cgit_css = "/cgit.css";
16char *cgit_logo = "/git-logo.png"; 16char *cgit_logo = "/git-logo.png";
17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
18char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 18char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
19char *cgit_virtual_root = NULL; 19char *cgit_virtual_root = NULL;
20char *cgit_script_name = CGIT_SCRIPT_NAME; 20char *cgit_script_name = CGIT_SCRIPT_NAME;
21char *cgit_cache_root = "/var/cache/cgit"; 21char *cgit_cache_root = "/var/cache/cgit";
22char *cgit_repo_group = NULL;
22 23
23int cgit_nocache = 0; 24int cgit_nocache = 0;
24int cgit_snapshots = 0; 25int cgit_snapshots = 0;
25int cgit_enable_log_filecount = 0; 26int cgit_enable_log_filecount = 0;
26int cgit_enable_log_linecount = 0; 27int cgit_enable_log_linecount = 0;
27int cgit_max_lock_attempts = 5; 28int cgit_max_lock_attempts = 5;
28int cgit_cache_root_ttl = 5; 29int cgit_cache_root_ttl = 5;
29int cgit_cache_repo_ttl = 5; 30int cgit_cache_repo_ttl = 5;
30int cgit_cache_dynamic_ttl = 5; 31int cgit_cache_dynamic_ttl = 5;
31int cgit_cache_static_ttl = -1; 32int cgit_cache_static_ttl = -1;
32int cgit_cache_max_create_time = 5; 33int cgit_cache_max_create_time = 5;
33 34
34int cgit_max_msg_len = 60; 35int cgit_max_msg_len = 60;
35int cgit_max_repodesc_len = 60; 36int cgit_max_repodesc_len = 60;
36int cgit_max_commit_count = 50; 37int cgit_max_commit_count = 50;
37 38
38int cgit_query_has_symref = 0; 39int cgit_query_has_symref = 0;
39int cgit_query_has_sha1 = 0; 40int cgit_query_has_sha1 = 0;
40 41
41char *cgit_querystring = NULL; 42char *cgit_querystring = NULL;
42char *cgit_query_repo = NULL; 43char *cgit_query_repo = NULL;
43char *cgit_query_page = NULL; 44char *cgit_query_page = NULL;
44char *cgit_query_head = NULL; 45char *cgit_query_head = NULL;
45char *cgit_query_search = NULL; 46char *cgit_query_search = NULL;
46char *cgit_query_sha1 = NULL; 47char *cgit_query_sha1 = NULL;
47char *cgit_query_sha2 = NULL; 48char *cgit_query_sha2 = NULL;
48char *cgit_query_path = NULL; 49char *cgit_query_path = NULL;
49char *cgit_query_name = NULL; 50char *cgit_query_name = NULL;
50int cgit_query_ofs = 0; 51int cgit_query_ofs = 0;
51 52
52int htmlfd = 0; 53int htmlfd = 0;
53 54
54int chk_zero(int result, char *msg) 55int chk_zero(int result, char *msg)
55{ 56{
56 if (result != 0) 57 if (result != 0)
57 die("%s: %s", msg, strerror(errno)); 58 die("%s: %s", msg, strerror(errno));
58 return result; 59 return result;
59} 60}
60 61
61int chk_positive(int result, char *msg) 62int chk_positive(int result, char *msg)
62{ 63{
63 if (result <= 0) 64 if (result <= 0)
64 die("%s: %s", msg, strerror(errno)); 65 die("%s: %s", msg, strerror(errno));
65 return result; 66 return result;
66} 67}
67 68
68struct repoinfo *add_repo(const char *url) 69struct repoinfo *add_repo(const char *url)
69{ 70{
70 struct repoinfo *ret; 71 struct repoinfo *ret;
71 72
72 if (++cgit_repolist.count > cgit_repolist.length) { 73 if (++cgit_repolist.count > cgit_repolist.length) {
73 if (cgit_repolist.length == 0) 74 if (cgit_repolist.length == 0)
74 cgit_repolist.length = 8; 75 cgit_repolist.length = 8;
75 else 76 else
76 cgit_repolist.length *= 2; 77 cgit_repolist.length *= 2;
77 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 78 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
78 cgit_repolist.length * 79 cgit_repolist.length *
79 sizeof(struct repoinfo)); 80 sizeof(struct repoinfo));
80 } 81 }
81 82
82 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 83 ret = &cgit_repolist.repos[cgit_repolist.count-1];
83 ret->url = xstrdup(url); 84 ret->url = xstrdup(url);
84 ret->name = ret->url; 85 ret->name = ret->url;
85 ret->path = NULL; 86 ret->path = NULL;
86 ret->desc = NULL; 87 ret->desc = NULL;
87 ret->owner = NULL; 88 ret->owner = NULL;
89 ret->group = cgit_repo_group;
88 ret->defbranch = "master"; 90 ret->defbranch = "master";
89 ret->snapshots = cgit_snapshots; 91 ret->snapshots = cgit_snapshots;
90 ret->enable_log_filecount = cgit_enable_log_filecount; 92 ret->enable_log_filecount = cgit_enable_log_filecount;
91 ret->enable_log_linecount = cgit_enable_log_linecount; 93 ret->enable_log_linecount = cgit_enable_log_linecount;
92 ret->module_link = cgit_module_link; 94 ret->module_link = cgit_module_link;
93 return ret; 95 return ret;
94} 96}
95 97
96void cgit_global_config_cb(const char *name, const char *value) 98void cgit_global_config_cb(const char *name, const char *value)
97{ 99{
98 if (!strcmp(name, "root-title")) 100 if (!strcmp(name, "root-title"))
99 cgit_root_title = xstrdup(value); 101 cgit_root_title = xstrdup(value);
100 else if (!strcmp(name, "css")) 102 else if (!strcmp(name, "css"))
101 cgit_css = xstrdup(value); 103 cgit_css = xstrdup(value);
102 else if (!strcmp(name, "logo")) 104 else if (!strcmp(name, "logo"))
103 cgit_logo = xstrdup(value); 105 cgit_logo = xstrdup(value);
104 else if (!strcmp(name, "logo-link")) 106 else if (!strcmp(name, "logo-link"))
105 cgit_logo_link = xstrdup(value); 107 cgit_logo_link = xstrdup(value);
106 else if (!strcmp(name, "module-link")) 108 else if (!strcmp(name, "module-link"))
107 cgit_module_link = xstrdup(value); 109 cgit_module_link = xstrdup(value);
108 else if (!strcmp(name, "virtual-root")) 110 else if (!strcmp(name, "virtual-root"))
109 cgit_virtual_root = xstrdup(value); 111 cgit_virtual_root = xstrdup(value);
110 else if (!strcmp(name, "nocache")) 112 else if (!strcmp(name, "nocache"))
111 cgit_nocache = atoi(value); 113 cgit_nocache = atoi(value);
112 else if (!strcmp(name, "snapshots")) 114 else if (!strcmp(name, "snapshots"))
113 cgit_snapshots = atoi(value); 115 cgit_snapshots = atoi(value);
114 else if (!strcmp(name, "enable-log-filecount")) 116 else if (!strcmp(name, "enable-log-filecount"))
115 cgit_enable_log_filecount = atoi(value); 117 cgit_enable_log_filecount = atoi(value);
116 else if (!strcmp(name, "enable-log-linecount")) 118 else if (!strcmp(name, "enable-log-linecount"))
117 cgit_enable_log_linecount = atoi(value); 119 cgit_enable_log_linecount = atoi(value);
118 else if (!strcmp(name, "cache-root")) 120 else if (!strcmp(name, "cache-root"))
119 cgit_cache_root = xstrdup(value); 121 cgit_cache_root = xstrdup(value);
120 else if (!strcmp(name, "cache-root-ttl")) 122 else if (!strcmp(name, "cache-root-ttl"))
121 cgit_cache_root_ttl = atoi(value); 123 cgit_cache_root_ttl = atoi(value);
122 else if (!strcmp(name, "cache-repo-ttl")) 124 else if (!strcmp(name, "cache-repo-ttl"))
123 cgit_cache_repo_ttl = atoi(value); 125 cgit_cache_repo_ttl = atoi(value);
124 else if (!strcmp(name, "cache-static-ttl")) 126 else if (!strcmp(name, "cache-static-ttl"))
125 cgit_cache_static_ttl = atoi(value); 127 cgit_cache_static_ttl = atoi(value);
126 else if (!strcmp(name, "cache-dynamic-ttl")) 128 else if (!strcmp(name, "cache-dynamic-ttl"))
127 cgit_cache_dynamic_ttl = atoi(value); 129 cgit_cache_dynamic_ttl = atoi(value);
128 else if (!strcmp(name, "max-message-length")) 130 else if (!strcmp(name, "max-message-length"))
129 cgit_max_msg_len = atoi(value); 131 cgit_max_msg_len = atoi(value);
130 else if (!strcmp(name, "max-repodesc-length")) 132 else if (!strcmp(name, "max-repodesc-length"))
131 cgit_max_repodesc_len = atoi(value); 133 cgit_max_repodesc_len = atoi(value);
132 else if (!strcmp(name, "max-commit-count")) 134 else if (!strcmp(name, "max-commit-count"))
133 cgit_max_commit_count = atoi(value); 135 cgit_max_commit_count = atoi(value);
136 else if (!strcmp(name, "repo.group"))
137 cgit_repo_group = xstrdup(value);
134 else if (!strcmp(name, "repo.url")) 138 else if (!strcmp(name, "repo.url"))
135 cgit_repo = add_repo(value); 139 cgit_repo = add_repo(value);
136 else if (!strcmp(name, "repo.name")) 140 else if (!strcmp(name, "repo.name"))
137 cgit_repo->name = xstrdup(value); 141 cgit_repo->name = xstrdup(value);
138 else if (cgit_repo && !strcmp(name, "repo.path")) 142 else if (cgit_repo && !strcmp(name, "repo.path"))
139 cgit_repo->path = xstrdup(value); 143 cgit_repo->path = xstrdup(value);
140 else if (cgit_repo && !strcmp(name, "repo.desc")) 144 else if (cgit_repo && !strcmp(name, "repo.desc"))
141 cgit_repo->desc = xstrdup(value); 145 cgit_repo->desc = xstrdup(value);
142 else if (cgit_repo && !strcmp(name, "repo.owner")) 146 else if (cgit_repo && !strcmp(name, "repo.owner"))
143 cgit_repo->owner = xstrdup(value); 147 cgit_repo->owner = xstrdup(value);
144 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 148 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
145 cgit_repo->defbranch = xstrdup(value); 149 cgit_repo->defbranch = xstrdup(value);
146 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 150 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
147 cgit_repo->snapshots = cgit_snapshots * atoi(value); 151 cgit_repo->snapshots = cgit_snapshots * atoi(value);
148 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 152 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
149 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); 153 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
150 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 154 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
151 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); 155 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
152 else if (cgit_repo && !strcmp(name, "repo.module-link")) 156 else if (cgit_repo && !strcmp(name, "repo.module-link"))
153 cgit_repo->module_link= xstrdup(value); 157 cgit_repo->module_link= xstrdup(value);
154 else if (!strcmp(name, "include")) 158 else if (!strcmp(name, "include"))
155 cgit_read_config(value, cgit_global_config_cb); 159 cgit_read_config(value, cgit_global_config_cb);
156} 160}
157 161
158void cgit_querystring_cb(const char *name, const char *value) 162void cgit_querystring_cb(const char *name, const char *value)
159{ 163{
160 if (!strcmp(name,"r")) { 164 if (!strcmp(name,"r")) {
161 cgit_query_repo = xstrdup(value); 165 cgit_query_repo = xstrdup(value);
162 } else if (!strcmp(name, "p")) { 166 } else if (!strcmp(name, "p")) {
163 cgit_query_page = xstrdup(value); 167 cgit_query_page = xstrdup(value);
164 } else if (!strcmp(name, "q")) { 168 } else if (!strcmp(name, "q")) {
165 cgit_query_search = xstrdup(value); 169 cgit_query_search = xstrdup(value);
166 } else if (!strcmp(name, "h")) { 170 } else if (!strcmp(name, "h")) {
167 cgit_query_head = xstrdup(value); 171 cgit_query_head = xstrdup(value);
168 cgit_query_has_symref = 1; 172 cgit_query_has_symref = 1;
169 } else if (!strcmp(name, "id")) { 173 } else if (!strcmp(name, "id")) {
170 cgit_query_sha1 = xstrdup(value); 174 cgit_query_sha1 = xstrdup(value);
171 cgit_query_has_sha1 = 1; 175 cgit_query_has_sha1 = 1;
172 } else if (!strcmp(name, "id2")) { 176 } else if (!strcmp(name, "id2")) {
173 cgit_query_sha2 = xstrdup(value); 177 cgit_query_sha2 = xstrdup(value);
174 cgit_query_has_sha1 = 1; 178 cgit_query_has_sha1 = 1;
175 } else if (!strcmp(name, "ofs")) { 179 } else if (!strcmp(name, "ofs")) {
176 cgit_query_ofs = atoi(value); 180 cgit_query_ofs = atoi(value);
177 } else if (!strcmp(name, "path")) { 181 } else if (!strcmp(name, "path")) {
178 cgit_query_path = xstrdup(value); 182 cgit_query_path = xstrdup(value);
179 } else if (!strcmp(name, "name")) { 183 } else if (!strcmp(name, "name")) {
180 cgit_query_name = xstrdup(value); 184 cgit_query_name = xstrdup(value);
181 } 185 }
182} 186}
183 187
184void *cgit_free_commitinfo(struct commitinfo *info) 188void *cgit_free_commitinfo(struct commitinfo *info)
185{ 189{
186 free(info->author); 190 free(info->author);
187 free(info->author_email); 191 free(info->author_email);
188 free(info->committer); 192 free(info->committer);
189 free(info->committer_email); 193 free(info->committer_email);
190 free(info->subject); 194 free(info->subject);
191 free(info); 195 free(info);
192 return NULL; 196 return NULL;
193} 197}
194 198
195int hextoint(char c) 199int hextoint(char c)
196{ 200{
197 if (c >= 'a' && c <= 'f') 201 if (c >= 'a' && c <= 'f')
198 return 10 + c - 'a'; 202 return 10 + c - 'a';
199 else if (c >= 'A' && c <= 'F') 203 else if (c >= 'A' && c <= 'F')
200 return 10 + c - 'A'; 204 return 10 + c - 'A';
201 else if (c >= '0' && c <= '9') 205 else if (c >= '0' && c <= '9')
202 return c - '0'; 206 return c - '0';
203 else 207 else
204 return -1; 208 return -1;
205} 209}
206 210
207void cgit_diff_tree_cb(struct diff_queue_struct *q, 211void cgit_diff_tree_cb(struct diff_queue_struct *q,
208 struct diff_options *options, void *data) 212 struct diff_options *options, void *data)
209{ 213{
210 int i; 214 int i;
211 215
212 for (i = 0; i < q->nr; i++) { 216 for (i = 0; i < q->nr; i++) {
213 if (q->queue[i]->status == 'U') 217 if (q->queue[i]->status == 'U')
214 continue; 218 continue;
215 ((filepair_fn)data)(q->queue[i]); 219 ((filepair_fn)data)(q->queue[i]);
216 } 220 }
217} 221}
218 222
219static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 223static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
220{ 224{
221 enum object_type type; 225 enum object_type type;
222 226
223 if (is_null_sha1(sha1)) { 227 if (is_null_sha1(sha1)) {
224 file->ptr = (char *)""; 228 file->ptr = (char *)"";
225 file->size = 0; 229 file->size = 0;
226 } else { 230 } else {
227 file->ptr = read_sha1_file(sha1, &type, &file->size); 231 file->ptr = read_sha1_file(sha1, &type, &file->size);
228 } 232 }
229 return 1; 233 return 1;
diff --git a/ui-repolist.c b/ui-repolist.c
index d7311e4..a884c20 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,53 +1,63 @@
1/* ui-repolist.c: functions for generating the repolist page 1/* ui-repolist.c: functions for generating the repolist 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 10
11void cgit_print_repolist(struct cacheitem *item) 11void cgit_print_repolist(struct cacheitem *item)
12{ 12{
13 struct repoinfo *repo; 13 struct repoinfo *repo;
14 int i; 14 int i;
15 char *last_group = NULL;
15 16
16 cgit_print_docstart(cgit_root_title, item); 17 cgit_print_docstart(cgit_root_title, item);
17 cgit_print_pageheader(cgit_root_title, 0); 18 cgit_print_pageheader(cgit_root_title, 0);
18 19
19 html("<table class='list nowrap'>"); 20 html("<table class='list nowrap'>");
20 html("<tr class='nohover'>" 21 html("<tr class='nohover'>"
21 "<th class='left'>Name</th>" 22 "<th class='left'>Name</th>"
22 "<th class='left'>Description</th>" 23 "<th class='left'>Description</th>"
23 "<th class='left'>Owner</th>" 24 "<th class='left'>Owner</th>"
24 "<th class='left'>Links</th></tr>\n"); 25 "<th class='left'>Links</th></tr>\n");
25 26
26 for (i=0; i<cgit_repolist.count; i++) { 27 for (i=0; i<cgit_repolist.count; i++) {
27 repo = &cgit_repolist.repos[i]; 28 repo = &cgit_repolist.repos[i];
29 if ((last_group == NULL && repo->group != NULL) ||
30 (last_group != NULL && repo->group == NULL) ||
31 (last_group != NULL && repo->group!= NULL &&
32 strcmp(repo->group, last_group))) {
33 html("<tr><td colspan='4' class='repogroup'>");
34 html_txt(repo->group);
35 html("</td></tr>");
36 last_group = repo->group;
37 }
28 html("<tr><td>"); 38 html("<tr><td>");
29 html_link_open(cgit_repourl(repo->url), NULL, NULL); 39 html_link_open(cgit_repourl(repo->url), NULL, NULL);
30 html_txt(repo->name); 40 html_txt(repo->name);
31 html_link_close(); 41 html_link_close();
32 html("</td><td>"); 42 html("</td><td>");
33 html_ntxt(cgit_max_repodesc_len, repo->desc); 43 html_ntxt(cgit_max_repodesc_len, repo->desc);
34 html("</td><td>"); 44 html("</td><td>");
35 html_txt(repo->owner); 45 html_txt(repo->owner);
36 html("</td><td>"); 46 html("</td><td>");
37 html_link_open(cgit_pageurl(repo->name, "commit", NULL), 47 html_link_open(cgit_pageurl(repo->name, "commit", NULL),
38 "Commit: display last commit", NULL); 48 "Commit: display last commit", NULL);
39 html("C</a> "); 49 html("C</a> ");
40 html_link_open(cgit_pageurl(repo->name, "diff", NULL), 50 html_link_open(cgit_pageurl(repo->name, "diff", NULL),
41 "Diff: see changes introduced by last commit", NULL); 51 "Diff: see changes introduced by last commit", NULL);
42 html("D</a> "); 52 html("D</a> ");
43 html_link_open(cgit_pageurl(repo->name, "log", NULL), 53 html_link_open(cgit_pageurl(repo->name, "log", NULL),
44 "Log: show history of the main branch", NULL); 54 "Log: show history of the main branch", NULL);
45 html("L</a> "); 55 html("L</a> ");
46 html_link_open(cgit_pageurl(repo->name, "tree", NULL), 56 html_link_open(cgit_pageurl(repo->name, "tree", NULL),
47 "Tree: browse the files in the main branch", NULL); 57 "Tree: browse the files in the main branch", NULL);
48 html("T</a>"); 58 html("T</a>");
49 html("</td></tr>\n"); 59 html("</td></tr>\n");
50 } 60 }
51 html("</table>"); 61 html("</table>");
52 cgit_print_docend(); 62 cgit_print_docend();
53} 63}