author | Lars Hjemli <hjemli@gmail.com> | 2009-09-13 20:02:07 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-09-13 20:02:07 (UTC) |
commit | 92f6940975f6771f3a08d497c02575ee5bdc79da (patch) (unidiff) | |
tree | c1c538b24e50be3bf63356acf246cda76b91c519 | |
parent | 5f12e45fe3338095916a444ff106dd9fc9991d84 (diff) | |
parent | ee554849ac7209fa8f7486327ec9f3b370e4c876 (diff) | |
download | cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.zip cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.gz cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.bz2 |
Merge branch 'lh/repo-scan'
-rw-r--r-- | cache.h | 2 | ||||
-rw-r--r-- | cgit.c | 265 | ||||
-rw-r--r-- | cgit.css | 2 | ||||
-rw-r--r-- | cgit.h | 9 | ||||
-rw-r--r-- | cgitrc.5.txt | 48 | ||||
-rw-r--r-- | scan-tree.c | 32 | ||||
-rw-r--r-- | scan-tree.h | 2 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 37 | ||||
-rw-r--r-- | ui-stats.c | 8 | ||||
-rw-r--r-- | ui-stats.h | 1 |
11 files changed, 329 insertions, 80 deletions
@@ -27,9 +27,11 @@ extern int cache_process(int size, const char *path, const char *key, int ttl, | |||
27 | 27 | ||
28 | 28 | ||
29 | /* List info about all cache entries on stdout */ | 29 | /* List info about all cache entries on stdout */ |
30 | extern int cache_ls(const char *path); | 30 | extern int cache_ls(const char *path); |
31 | 31 | ||
32 | /* Print a message to stdout */ | 32 | /* Print a message to stdout */ |
33 | extern void cache_log(const char *format, ...); | 33 | extern void cache_log(const char *format, ...); |
34 | 34 | ||
35 | extern unsigned long hash_str(const char *str); | ||
36 | |||
35 | #endif /* CGIT_CACHE_H */ | 37 | #endif /* CGIT_CACHE_H */ |
@@ -35,19 +35,68 @@ struct cgit_filter *new_filter(const char *cmd, int extra_args) | |||
35 | f = xmalloc(sizeof(struct cgit_filter)); | 35 | f = xmalloc(sizeof(struct cgit_filter)); |
36 | f->cmd = xstrdup(cmd); | 36 | f->cmd = xstrdup(cmd); |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); | 37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
38 | f->argv[0] = f->cmd; | 38 | f->argv[0] = f->cmd; |
39 | f->argv[1] = NULL; | 39 | f->argv[1] = NULL; |
40 | return f; | 40 | return f; |
41 | } | 41 | } |
42 | 42 | ||
43 | static void process_cached_repolist(const char *path); | ||
44 | |||
45 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) | ||
46 | { | ||
47 | if (!strcmp(name, "name")) | ||
48 | repo->name = xstrdup(value); | ||
49 | else if (!strcmp(name, "clone-url")) | ||
50 | repo->clone_url = xstrdup(value); | ||
51 | else if (!strcmp(name, "desc")) | ||
52 | repo->desc = xstrdup(value); | ||
53 | else if (!strcmp(name, "owner")) | ||
54 | repo->owner = xstrdup(value); | ||
55 | else if (!strcmp(name, "defbranch")) | ||
56 | repo->defbranch = xstrdup(value); | ||
57 | else if (!strcmp(name, "snapshots")) | ||
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); | ||
59 | else if (!strcmp(name, "enable-log-filecount")) | ||
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | ||
61 | else if (!strcmp(name, "enable-log-linecount")) | ||
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | ||
63 | else if (!strcmp(name, "max-stats")) | ||
64 | repo->max_stats = cgit_find_stats_period(value, NULL); | ||
65 | else if (!strcmp(name, "module-link")) | ||
66 | repo->module_link= xstrdup(value); | ||
67 | else if (!strcmp(name, "section")) | ||
68 | repo->section = xstrdup(value); | ||
69 | else if (!strcmp(name, "readme") && value != NULL) { | ||
70 | if (*value == '/') | ||
71 | ctx.repo->readme = xstrdup(value); | ||
72 | else | ||
73 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | ||
74 | } else if (ctx.cfg.enable_filter_overrides) { | ||
75 | if (!strcmp(name, "about-filter")) | ||
76 | repo->about_filter = new_filter(value, 0); | ||
77 | else if (!strcmp(name, "commit-filter")) | ||
78 | repo->commit_filter = new_filter(value, 0); | ||
79 | else if (!strcmp(name, "source-filter")) | ||
80 | repo->source_filter = new_filter(value, 1); | ||
81 | } | ||
82 | } | ||
83 | |||
43 | void config_cb(const char *name, const char *value) | 84 | void config_cb(const char *name, const char *value) |
44 | { | 85 | { |
45 | if (!strcmp(name, "root-title")) | 86 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
87 | ctx.cfg.section = xstrdup(value); | ||
88 | else if (!strcmp(name, "repo.url")) | ||
89 | ctx.repo = cgit_add_repo(value); | ||
90 | else if (ctx.repo && !strcmp(name, "repo.path")) | ||
91 | ctx.repo->path = trim_end(value, '/'); | ||
92 | else if (ctx.repo && !prefixcmp(name, "repo.")) | ||
93 | repo_config(ctx.repo, name + 5, value); | ||
94 | else if (!strcmp(name, "root-title")) | ||
46 | ctx.cfg.root_title = xstrdup(value); | 95 | ctx.cfg.root_title = xstrdup(value); |
47 | else if (!strcmp(name, "root-desc")) | 96 | else if (!strcmp(name, "root-desc")) |
48 | ctx.cfg.root_desc = xstrdup(value); | 97 | ctx.cfg.root_desc = xstrdup(value); |
49 | else if (!strcmp(name, "root-readme")) | 98 | else if (!strcmp(name, "root-readme")) |
50 | ctx.cfg.root_readme = xstrdup(value); | 99 | ctx.cfg.root_readme = xstrdup(value); |
51 | else if (!strcmp(name, "css")) | 100 | else if (!strcmp(name, "css")) |
52 | ctx.cfg.css = xstrdup(value); | 101 | ctx.cfg.css = xstrdup(value); |
53 | else if (!strcmp(name, "favicon")) | 102 | else if (!strcmp(name, "favicon")) |
@@ -75,16 +124,18 @@ void config_cb(const char *name, const char *value) | |||
75 | } else if (!strcmp(name, "nocache")) | 124 | } else if (!strcmp(name, "nocache")) |
76 | ctx.cfg.nocache = atoi(value); | 125 | ctx.cfg.nocache = atoi(value); |
77 | else if (!strcmp(name, "noplainemail")) | 126 | else if (!strcmp(name, "noplainemail")) |
78 | ctx.cfg.noplainemail = atoi(value); | 127 | ctx.cfg.noplainemail = atoi(value); |
79 | else if (!strcmp(name, "noheader")) | 128 | else if (!strcmp(name, "noheader")) |
80 | ctx.cfg.noheader = atoi(value); | 129 | ctx.cfg.noheader = atoi(value); |
81 | else if (!strcmp(name, "snapshots")) | 130 | else if (!strcmp(name, "snapshots")) |
82 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 131 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
132 | else if (!strcmp(name, "enable-filter-overrides")) | ||
133 | ctx.cfg.enable_filter_overrides = atoi(value); | ||
83 | else if (!strcmp(name, "enable-index-links")) | 134 | else if (!strcmp(name, "enable-index-links")) |
84 | ctx.cfg.enable_index_links = atoi(value); | 135 | ctx.cfg.enable_index_links = atoi(value); |
85 | else if (!strcmp(name, "enable-log-filecount")) | 136 | else if (!strcmp(name, "enable-log-filecount")) |
86 | ctx.cfg.enable_log_filecount = atoi(value); | 137 | ctx.cfg.enable_log_filecount = atoi(value); |
87 | else if (!strcmp(name, "enable-log-linecount")) | 138 | else if (!strcmp(name, "enable-log-linecount")) |
88 | ctx.cfg.enable_log_linecount = atoi(value); | 139 | ctx.cfg.enable_log_linecount = atoi(value); |
89 | else if (!strcmp(name, "enable-tree-linenumbers")) | 140 | else if (!strcmp(name, "enable-tree-linenumbers")) |
90 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 141 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
@@ -93,16 +144,18 @@ void config_cb(const char *name, const char *value) | |||
93 | else if (!strcmp(name, "cache-size")) | 144 | else if (!strcmp(name, "cache-size")) |
94 | ctx.cfg.cache_size = atoi(value); | 145 | ctx.cfg.cache_size = atoi(value); |
95 | else if (!strcmp(name, "cache-root")) | 146 | else if (!strcmp(name, "cache-root")) |
96 | ctx.cfg.cache_root = xstrdup(value); | 147 | ctx.cfg.cache_root = xstrdup(value); |
97 | else if (!strcmp(name, "cache-root-ttl")) | 148 | else if (!strcmp(name, "cache-root-ttl")) |
98 | ctx.cfg.cache_root_ttl = atoi(value); | 149 | ctx.cfg.cache_root_ttl = atoi(value); |
99 | else if (!strcmp(name, "cache-repo-ttl")) | 150 | else if (!strcmp(name, "cache-repo-ttl")) |
100 | ctx.cfg.cache_repo_ttl = atoi(value); | 151 | ctx.cfg.cache_repo_ttl = atoi(value); |
152 | else if (!strcmp(name, "cache-scanrc-ttl")) | ||
153 | ctx.cfg.cache_scanrc_ttl = atoi(value); | ||
101 | else if (!strcmp(name, "cache-static-ttl")) | 154 | else if (!strcmp(name, "cache-static-ttl")) |
102 | ctx.cfg.cache_static_ttl = atoi(value); | 155 | ctx.cfg.cache_static_ttl = atoi(value); |
103 | else if (!strcmp(name, "cache-dynamic-ttl")) | 156 | else if (!strcmp(name, "cache-dynamic-ttl")) |
104 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 157 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
105 | else if (!strcmp(name, "about-filter")) | 158 | else if (!strcmp(name, "about-filter")) |
106 | ctx.cfg.about_filter = new_filter(value, 0); | 159 | ctx.cfg.about_filter = new_filter(value, 0); |
107 | else if (!strcmp(name, "commit-filter")) | 160 | else if (!strcmp(name, "commit-filter")) |
108 | ctx.cfg.commit_filter = new_filter(value, 0); | 161 | ctx.cfg.commit_filter = new_filter(value, 0); |
@@ -111,16 +164,21 @@ void config_cb(const char *name, const char *value) | |||
111 | else if (!strcmp(name, "max-message-length")) | 164 | else if (!strcmp(name, "max-message-length")) |
112 | ctx.cfg.max_msg_len = atoi(value); | 165 | ctx.cfg.max_msg_len = atoi(value); |
113 | else if (!strcmp(name, "max-repodesc-length")) | 166 | else if (!strcmp(name, "max-repodesc-length")) |
114 | ctx.cfg.max_repodesc_len = atoi(value); | 167 | ctx.cfg.max_repodesc_len = atoi(value); |
115 | else if (!strcmp(name, "max-repo-count")) | 168 | else if (!strcmp(name, "max-repo-count")) |
116 | ctx.cfg.max_repo_count = atoi(value); | 169 | ctx.cfg.max_repo_count = atoi(value); |
117 | else if (!strcmp(name, "max-commit-count")) | 170 | else if (!strcmp(name, "max-commit-count")) |
118 | ctx.cfg.max_commit_count = atoi(value); | 171 | ctx.cfg.max_commit_count = atoi(value); |
172 | else if (!strcmp(name, "scan-path")) | ||
173 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | ||
174 | process_cached_repolist(value); | ||
175 | else | ||
176 | scan_tree(value, repo_config); | ||
119 | else if (!strcmp(name, "source-filter")) | 177 | else if (!strcmp(name, "source-filter")) |
120 | ctx.cfg.source_filter = new_filter(value, 1); | 178 | ctx.cfg.source_filter = new_filter(value, 1); |
121 | else if (!strcmp(name, "summary-log")) | 179 | else if (!strcmp(name, "summary-log")) |
122 | ctx.cfg.summary_log = atoi(value); | 180 | ctx.cfg.summary_log = atoi(value); |
123 | else if (!strcmp(name, "summary-branches")) | 181 | else if (!strcmp(name, "summary-branches")) |
124 | ctx.cfg.summary_branches = atoi(value); | 182 | ctx.cfg.summary_branches = atoi(value); |
125 | else if (!strcmp(name, "summary-tags")) | 183 | else if (!strcmp(name, "summary-tags")) |
126 | ctx.cfg.summary_tags = atoi(value); | 184 | ctx.cfg.summary_tags = atoi(value); |
@@ -131,54 +189,17 @@ void config_cb(const char *name, const char *value) | |||
131 | else if (!strcmp(name, "robots")) | 189 | else if (!strcmp(name, "robots")) |
132 | ctx.cfg.robots = xstrdup(value); | 190 | ctx.cfg.robots = xstrdup(value); |
133 | else if (!strcmp(name, "clone-prefix")) | 191 | else if (!strcmp(name, "clone-prefix")) |
134 | ctx.cfg.clone_prefix = xstrdup(value); | 192 | ctx.cfg.clone_prefix = xstrdup(value); |
135 | else if (!strcmp(name, "local-time")) | 193 | else if (!strcmp(name, "local-time")) |
136 | ctx.cfg.local_time = atoi(value); | 194 | ctx.cfg.local_time = atoi(value); |
137 | else if (!prefixcmp(name, "mimetype.")) | 195 | else if (!prefixcmp(name, "mimetype.")) |
138 | add_mimetype(name + 9, value); | 196 | add_mimetype(name + 9, value); |
139 | else if (!strcmp(name, "repo.group")) | 197 | else if (!strcmp(name, "include")) |
140 | ctx.cfg.repo_group = xstrdup(value); | ||
141 | else if (!strcmp(name, "repo.url")) | ||
142 | ctx.repo = cgit_add_repo(value); | ||
143 | else if (!strcmp(name, "repo.name")) | ||
144 | ctx.repo->name = xstrdup(value); | ||
145 | else if (ctx.repo && !strcmp(name, "repo.path")) | ||
146 | ctx.repo->path = trim_end(value, '/'); | ||
147 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | ||
148 | ctx.repo->clone_url = xstrdup(value); | ||
149 | else if (ctx.repo && !strcmp(name, "repo.desc")) | ||
150 | ctx.repo->desc = xstrdup(value); | ||
151 | else if (ctx.repo && !strcmp(name, "repo.owner")) | ||
152 | ctx.repo->owner = xstrdup(value); | ||
153 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | ||
154 | ctx.repo->defbranch = xstrdup(value); | ||
155 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | ||
156 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | ||
157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | ||
158 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | ||
159 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | ||
160 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | ||
161 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | ||
162 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | ||
163 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | ||
164 | ctx.repo->module_link= xstrdup(value); | ||
165 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | ||
166 | ctx.repo->about_filter = new_filter(value, 0); | ||
167 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | ||
168 | ctx.repo->commit_filter = new_filter(value, 0); | ||
169 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | ||
170 | ctx.repo->source_filter = new_filter(value, 1); | ||
171 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | ||
172 | if (*value == '/') | ||
173 | ctx.repo->readme = xstrdup(value); | ||
174 | else | ||
175 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | ||
176 | } else if (!strcmp(name, "include")) | ||
177 | parse_configfile(value, config_cb); | 198 | parse_configfile(value, config_cb); |
178 | } | 199 | } |
179 | 200 | ||
180 | static void querystring_cb(const char *name, const char *value) | 201 | static void querystring_cb(const char *name, const char *value) |
181 | { | 202 | { |
182 | if (!value) | 203 | if (!value) |
183 | value = ""; | 204 | value = ""; |
184 | 205 | ||
@@ -231,16 +252,17 @@ static void prepare_context(struct cgit_context *ctx) | |||
231 | ctx->cfg.agefile = "info/web/last-modified"; | 252 | ctx->cfg.agefile = "info/web/last-modified"; |
232 | ctx->cfg.nocache = 0; | 253 | ctx->cfg.nocache = 0; |
233 | ctx->cfg.cache_size = 0; | 254 | ctx->cfg.cache_size = 0; |
234 | ctx->cfg.cache_dynamic_ttl = 5; | 255 | ctx->cfg.cache_dynamic_ttl = 5; |
235 | ctx->cfg.cache_max_create_time = 5; | 256 | ctx->cfg.cache_max_create_time = 5; |
236 | ctx->cfg.cache_repo_ttl = 5; | 257 | ctx->cfg.cache_repo_ttl = 5; |
237 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 258 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
238 | ctx->cfg.cache_root_ttl = 5; | 259 | ctx->cfg.cache_root_ttl = 5; |
260 | ctx->cfg.cache_scanrc_ttl = 15; | ||
239 | ctx->cfg.cache_static_ttl = -1; | 261 | ctx->cfg.cache_static_ttl = -1; |
240 | ctx->cfg.css = "/cgit.css"; | 262 | ctx->cfg.css = "/cgit.css"; |
241 | ctx->cfg.logo = "/cgit.png"; | 263 | ctx->cfg.logo = "/cgit.png"; |
242 | ctx->cfg.local_time = 0; | 264 | ctx->cfg.local_time = 0; |
243 | ctx->cfg.enable_tree_linenumbers = 1; | 265 | ctx->cfg.enable_tree_linenumbers = 1; |
244 | ctx->cfg.max_repo_count = 50; | 266 | ctx->cfg.max_repo_count = 50; |
245 | ctx->cfg.max_commit_count = 50; | 267 | ctx->cfg.max_commit_count = 50; |
246 | ctx->cfg.max_lock_attempts = 5; | 268 | ctx->cfg.max_lock_attempts = 5; |
@@ -248,16 +270,17 @@ static void prepare_context(struct cgit_context *ctx) | |||
248 | ctx->cfg.max_repodesc_len = 80; | 270 | ctx->cfg.max_repodesc_len = 80; |
249 | ctx->cfg.max_stats = 0; | 271 | ctx->cfg.max_stats = 0; |
250 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 272 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
251 | ctx->cfg.renamelimit = -1; | 273 | ctx->cfg.renamelimit = -1; |
252 | ctx->cfg.robots = "index, nofollow"; | 274 | ctx->cfg.robots = "index, nofollow"; |
253 | ctx->cfg.root_title = "Git repository browser"; | 275 | ctx->cfg.root_title = "Git repository browser"; |
254 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 276 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
255 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 277 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
278 | ctx->cfg.section = ""; | ||
256 | ctx->cfg.summary_branches = 10; | 279 | ctx->cfg.summary_branches = 10; |
257 | ctx->cfg.summary_log = 10; | 280 | ctx->cfg.summary_log = 10; |
258 | ctx->cfg.summary_tags = 10; | 281 | ctx->cfg.summary_tags = 10; |
259 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
260 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 283 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
261 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 284 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
262 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 285 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
263 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 286 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
@@ -412,38 +435,161 @@ static void process_request(void *cbdata) | |||
412 | } | 435 | } |
413 | 436 | ||
414 | int cmp_repos(const void *a, const void *b) | 437 | int cmp_repos(const void *a, const void *b) |
415 | { | 438 | { |
416 | const struct cgit_repo *ra = a, *rb = b; | 439 | const struct cgit_repo *ra = a, *rb = b; |
417 | return strcmp(ra->url, rb->url); | 440 | return strcmp(ra->url, rb->url); |
418 | } | 441 | } |
419 | 442 | ||
420 | void print_repo(struct cgit_repo *repo) | 443 | char *build_snapshot_setting(int bitmap) |
444 | { | ||
445 | const struct cgit_snapshot_format *f; | ||
446 | char *result = xstrdup(""); | ||
447 | char *tmp; | ||
448 | int len; | ||
449 | |||
450 | for (f = cgit_snapshot_formats; f->suffix; f++) { | ||
451 | if (f->bit & bitmap) { | ||
452 | tmp = result; | ||
453 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); | ||
454 | free(tmp); | ||
455 | } | ||
456 | } | ||
457 | len = strlen(result); | ||
458 | if (len) | ||
459 | result[len - 1] = '\0'; | ||
460 | return result; | ||
461 | } | ||
462 | |||
463 | char *get_first_line(char *txt) | ||
464 | { | ||
465 | char *t = xstrdup(txt); | ||
466 | char *p = strchr(t, '\n'); | ||
467 | if (p) | ||
468 | *p = '\0'; | ||
469 | return t; | ||
470 | } | ||
471 | |||
472 | void print_repo(FILE *f, struct cgit_repo *repo) | ||
421 | { | 473 | { |
422 | printf("repo.url=%s\n", repo->url); | 474 | fprintf(f, "repo.url=%s\n", repo->url); |
423 | printf("repo.name=%s\n", repo->name); | 475 | fprintf(f, "repo.name=%s\n", repo->name); |
424 | printf("repo.path=%s\n", repo->path); | 476 | fprintf(f, "repo.path=%s\n", repo->path); |
425 | if (repo->owner) | 477 | if (repo->owner) |
426 | printf("repo.owner=%s\n", repo->owner); | 478 | fprintf(f, "repo.owner=%s\n", repo->owner); |
427 | if (repo->desc) | 479 | if (repo->desc) { |
428 | printf("repo.desc=%s\n", repo->desc); | 480 | char *tmp = get_first_line(repo->desc); |
481 | fprintf(f, "repo.desc=%s\n", tmp); | ||
482 | free(tmp); | ||
483 | } | ||
429 | if (repo->readme) | 484 | if (repo->readme) |
430 | printf("repo.readme=%s\n", repo->readme); | 485 | fprintf(f, "repo.readme=%s\n", repo->readme); |
431 | printf("\n"); | 486 | if (repo->defbranch) |
487 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); | ||
488 | if (repo->module_link) | ||
489 | fprintf(f, "repo.module-link=%s\n", repo->module_link); | ||
490 | if (repo->section) | ||
491 | fprintf(f, "repo.section=%s\n", repo->section); | ||
492 | if (repo->clone_url) | ||
493 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); | ||
494 | fprintf(f, "repo.enable-log-filecount=%d\n", | ||
495 | repo->enable_log_filecount); | ||
496 | fprintf(f, "repo.enable-log-linecount=%d\n", | ||
497 | repo->enable_log_linecount); | ||
498 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) | ||
499 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); | ||
500 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) | ||
501 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); | ||
502 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) | ||
503 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); | ||
504 | if (repo->snapshots != ctx.cfg.snapshots) { | ||
505 | char *tmp = build_snapshot_setting(repo->snapshots); | ||
506 | fprintf(f, "repo.snapshots=%s\n", tmp); | ||
507 | free(tmp); | ||
508 | } | ||
509 | if (repo->max_stats != ctx.cfg.max_stats) | ||
510 | fprintf(f, "repo.max-stats=%s\n", | ||
511 | cgit_find_stats_periodname(repo->max_stats)); | ||
512 | fprintf(f, "\n"); | ||
432 | } | 513 | } |
433 | 514 | ||
434 | void print_repolist(struct cgit_repolist *list) | 515 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
435 | { | 516 | { |
436 | int i; | 517 | int i; |
437 | 518 | ||
438 | for(i = 0; i < list->count; i++) | 519 | for(i = start; i < list->count; i++) |
439 | print_repo(&list->repos[i]); | 520 | print_repo(f, &list->repos[i]); |
521 | } | ||
522 | |||
523 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' | ||
524 | * and return 0 on success. | ||
525 | */ | ||
526 | static int generate_cached_repolist(const char *path, const char *cached_rc) | ||
527 | { | ||
528 | char *locked_rc; | ||
529 | int idx; | ||
530 | FILE *f; | ||
531 | |||
532 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); | ||
533 | f = fopen(locked_rc, "wx"); | ||
534 | if (!f) { | ||
535 | /* Inform about the error unless the lockfile already existed, | ||
536 | * since that only means we've got concurrent requests. | ||
537 | */ | ||
538 | if (errno != EEXIST) | ||
539 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", | ||
540 | locked_rc, strerror(errno), errno); | ||
541 | return errno; | ||
542 | } | ||
543 | idx = cgit_repolist.count; | ||
544 | scan_tree(path, repo_config); | ||
545 | print_repolist(f, &cgit_repolist, idx); | ||
546 | if (rename(locked_rc, cached_rc)) | ||
547 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", | ||
548 | locked_rc, cached_rc, strerror(errno), errno); | ||
549 | fclose(f); | ||
550 | return 0; | ||
440 | } | 551 | } |
441 | 552 | ||
553 | static void process_cached_repolist(const char *path) | ||
554 | { | ||
555 | struct stat st; | ||
556 | char *cached_rc; | ||
557 | time_t age; | ||
558 | |||
559 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, | ||
560 | hash_str(path))); | ||
561 | |||
562 | if (stat(cached_rc, &st)) { | ||
563 | /* Nothing is cached, we need to scan without forking. And | ||
564 | * if we fail to generate a cached repolist, we need to | ||
565 | * invoke scan_tree manually. | ||
566 | */ | ||
567 | if (generate_cached_repolist(path, cached_rc)) | ||
568 | scan_tree(path, repo_config); | ||
569 | return; | ||
570 | } | ||
571 | |||
572 | parse_configfile(cached_rc, config_cb); | ||
573 | |||
574 | /* If the cached configfile hasn't expired, lets exit now */ | ||
575 | age = time(NULL) - st.st_mtime; | ||
576 | if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) | ||
577 | return; | ||
578 | |||
579 | /* The cached repolist has been parsed, but it was old. So lets | ||
580 | * rescan the specified path and generate a new cached repolist | ||
581 | * in a child-process to avoid latency for the current request. | ||
582 | */ | ||
583 | if (fork()) | ||
584 | return; | ||
585 | |||
586 | exit(generate_cached_repolist(path, cached_rc)); | ||
587 | } | ||
442 | 588 | ||
443 | static void cgit_parse_args(int argc, const char **argv) | 589 | static void cgit_parse_args(int argc, const char **argv) |
444 | { | 590 | { |
445 | int i; | 591 | int i; |
446 | int scan = 0; | 592 | int scan = 0; |
447 | 593 | ||
448 | for (i = 1; i < argc; i++) { | 594 | for (i = 1; i < argc; i++) { |
449 | if (!strncmp(argv[i], "--cache=", 8)) { | 595 | if (!strncmp(argv[i], "--cache=", 8)) { |
@@ -470,25 +616,36 @@ static void cgit_parse_args(int argc, const char **argv) | |||
470 | } | 616 | } |
471 | if (!strncmp(argv[i], "--sha1=", 7)) { | 617 | if (!strncmp(argv[i], "--sha1=", 7)) { |
472 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 618 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
473 | ctx.qry.has_sha1 = 1; | 619 | ctx.qry.has_sha1 = 1; |
474 | } | 620 | } |
475 | if (!strncmp(argv[i], "--ofs=", 6)) { | 621 | if (!strncmp(argv[i], "--ofs=", 6)) { |
476 | ctx.qry.ofs = atoi(argv[i]+6); | 622 | ctx.qry.ofs = atoi(argv[i]+6); |
477 | } | 623 | } |
478 | if (!strncmp(argv[i], "--scan-tree=", 12)) { | 624 | if (!strncmp(argv[i], "--scan-tree=", 12) || |
625 | !strncmp(argv[i], "--scan-path=", 12)) { | ||
626 | /* HACK: the global snapshot bitmask defines the | ||
627 | * set of allowed snapshot formats, but the config | ||
628 | * file hasn't been parsed yet so the mask is | ||
629 | * currently 0. By setting all bits high before | ||
630 | * scanning we make sure that any in-repo cgitrc | ||
631 | * snapshot setting is respected by scan_tree(). | ||
632 | * BTW: we assume that there'll never be more than | ||
633 | * 255 different snapshot formats supported by cgit... | ||
634 | */ | ||
635 | ctx.cfg.snapshots = 0xFF; | ||
479 | scan++; | 636 | scan++; |
480 | scan_tree(argv[i] + 12); | 637 | scan_tree(argv[i] + 12, repo_config); |
481 | } | 638 | } |
482 | } | 639 | } |
483 | if (scan) { | 640 | if (scan) { |
484 | qsort(cgit_repolist.repos, cgit_repolist.count, | 641 | qsort(cgit_repolist.repos, cgit_repolist.count, |
485 | sizeof(struct cgit_repo), cmp_repos); | 642 | sizeof(struct cgit_repo), cmp_repos); |
486 | print_repolist(&cgit_repolist); | 643 | print_repolist(stdout, &cgit_repolist, 0); |
487 | exit(0); | 644 | exit(0); |
488 | } | 645 | } |
489 | } | 646 | } |
490 | 647 | ||
491 | static int calc_ttl() | 648 | static int calc_ttl() |
492 | { | 649 | { |
493 | if (!ctx.repo) | 650 | if (!ctx.repo) |
494 | return ctx.cfg.cache_root_ttl; | 651 | return ctx.cfg.cache_root_ttl; |
@@ -424,17 +424,17 @@ table.diff td div.del { | |||
424 | .left { | 424 | .left { |
425 | text-align: left; | 425 | text-align: left; |
426 | } | 426 | } |
427 | 427 | ||
428 | .right { | 428 | .right { |
429 | text-align: right; | 429 | text-align: right; |
430 | } | 430 | } |
431 | 431 | ||
432 | table.list td.repogroup { | 432 | table.list td.reposection { |
433 | font-style: italic; | 433 | font-style: italic; |
434 | color: #888; | 434 | color: #888; |
435 | } | 435 | } |
436 | 436 | ||
437 | a.button { | 437 | a.button { |
438 | font-size: 80%; | 438 | font-size: 80%; |
439 | padding: 0em 0.5em; | 439 | padding: 0em 0.5em; |
440 | } | 440 | } |
@@ -60,30 +60,33 @@ struct cgit_filter { | |||
60 | 60 | ||
61 | struct cgit_repo { | 61 | struct cgit_repo { |
62 | char *url; | 62 | char *url; |
63 | char *name; | 63 | char *name; |
64 | char *path; | 64 | char *path; |
65 | char *desc; | 65 | char *desc; |
66 | char *owner; | 66 | char *owner; |
67 | char *defbranch; | 67 | char *defbranch; |
68 | char *group; | ||
69 | char *module_link; | 68 | char *module_link; |
70 | char *readme; | 69 | char *readme; |
70 | char *section; | ||
71 | char *clone_url; | 71 | char *clone_url; |
72 | int snapshots; | 72 | int snapshots; |
73 | int enable_log_filecount; | 73 | int enable_log_filecount; |
74 | int enable_log_linecount; | 74 | int enable_log_linecount; |
75 | int max_stats; | 75 | int max_stats; |
76 | time_t mtime; | 76 | time_t mtime; |
77 | struct cgit_filter *about_filter; | 77 | struct cgit_filter *about_filter; |
78 | struct cgit_filter *commit_filter; | 78 | struct cgit_filter *commit_filter; |
79 | struct cgit_filter *source_filter; | 79 | struct cgit_filter *source_filter; |
80 | }; | 80 | }; |
81 | 81 | ||
82 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | ||
83 | const char *value); | ||
84 | |||
82 | struct cgit_repolist { | 85 | struct cgit_repolist { |
83 | int length; | 86 | int length; |
84 | int count; | 87 | int count; |
85 | struct cgit_repo *repos; | 88 | struct cgit_repo *repos; |
86 | }; | 89 | }; |
87 | 90 | ||
88 | struct commitinfo { | 91 | struct commitinfo { |
89 | struct commit *commit; | 92 | struct commit *commit; |
@@ -151,30 +154,32 @@ struct cgit_config { | |||
151 | char *footer; | 154 | char *footer; |
152 | char *head_include; | 155 | char *head_include; |
153 | char *header; | 156 | char *header; |
154 | char *index_header; | 157 | char *index_header; |
155 | char *index_info; | 158 | char *index_info; |
156 | char *logo; | 159 | char *logo; |
157 | char *logo_link; | 160 | char *logo_link; |
158 | char *module_link; | 161 | char *module_link; |
159 | char *repo_group; | ||
160 | char *robots; | 162 | char *robots; |
161 | char *root_title; | 163 | char *root_title; |
162 | char *root_desc; | 164 | char *root_desc; |
163 | char *root_readme; | 165 | char *root_readme; |
164 | char *script_name; | 166 | char *script_name; |
167 | char *section; | ||
165 | char *virtual_root; | 168 | char *virtual_root; |
166 | int cache_size; | 169 | int cache_size; |
167 | int cache_dynamic_ttl; | 170 | int cache_dynamic_ttl; |
168 | int cache_max_create_time; | 171 | int cache_max_create_time; |
169 | int cache_repo_ttl; | 172 | int cache_repo_ttl; |
170 | int cache_root_ttl; | 173 | int cache_root_ttl; |
174 | int cache_scanrc_ttl; | ||
171 | int cache_static_ttl; | 175 | int cache_static_ttl; |
172 | int embedded; | 176 | int embedded; |
177 | int enable_filter_overrides; | ||
173 | int enable_index_links; | 178 | int enable_index_links; |
174 | int enable_log_filecount; | 179 | int enable_log_filecount; |
175 | int enable_log_linecount; | 180 | int enable_log_linecount; |
176 | int enable_tree_linenumbers; | 181 | int enable_tree_linenumbers; |
177 | int local_time; | 182 | int local_time; |
178 | int max_repo_count; | 183 | int max_repo_count; |
179 | int max_commit_count; | 184 | int max_commit_count; |
180 | int max_lock_attempts; | 185 | int max_lock_attempts; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 3b16db9..4dc383d 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -49,16 +49,20 @@ cache-dynamic-ttl:: | |||
49 | cache-repo-ttl:: | 49 | cache-repo-ttl:: |
50 | Number which specifies the time-to-live, in minutes, for the cached | 50 | Number which specifies the time-to-live, in minutes, for the cached |
51 | version of the repository summary page. Default value: "5". | 51 | version of the repository summary page. Default value: "5". |
52 | 52 | ||
53 | cache-root-ttl:: | 53 | cache-root-ttl:: |
54 | Number which specifies the time-to-live, in minutes, for the cached | 54 | Number which specifies the time-to-live, in minutes, for the cached |
55 | version of the repository index page. Default value: "5". | 55 | version of the repository index page. Default value: "5". |
56 | 56 | ||
57 | cache-scanrc-ttl:: | ||
58 | Number which specifies the time-to-live, in minutes, for the result | ||
59 | of scanning a path for git repositories. Default value: "15". | ||
60 | |||
57 | cache-size:: | 61 | cache-size:: |
58 | The maximum number of entries in the cgit cache. Default value: "0" | 62 | The maximum number of entries in the cgit cache. Default value: "0" |
59 | (i.e. caching is disabled). | 63 | (i.e. caching is disabled). |
60 | 64 | ||
61 | cache-static-ttl:: | 65 | cache-static-ttl:: |
62 | Number which specifies the time-to-live, in minutes, for the cached | 66 | Number which specifies the time-to-live, in minutes, for the cached |
63 | version of repository pages accessed with a fixed SHA1. Default value: | 67 | version of repository pages accessed with a fixed SHA1. Default value: |
64 | "5". | 68 | "5". |
@@ -79,16 +83,20 @@ css:: | |||
79 | Url which specifies the css document to include in all cgit pages. | 83 | Url which specifies the css document to include in all cgit pages. |
80 | Default value: "/cgit.css". | 84 | Default value: "/cgit.css". |
81 | 85 | ||
82 | embedded:: | 86 | embedded:: |
83 | Flag which, when set to "1", will make cgit generate a html fragment | 87 | Flag which, when set to "1", will make cgit generate a html fragment |
84 | suitable for embedding in other html pages. Default value: none. See | 88 | suitable for embedding in other html pages. Default value: none. See |
85 | also: "noheader". | 89 | also: "noheader". |
86 | 90 | ||
91 | enable-filter-overrides:: | ||
92 | Flag which, when set to "1", allows all filter settings to be | ||
93 | overridden in repository-specific cgitrc files. Default value: none. | ||
94 | |||
87 | enable-index-links:: | 95 | enable-index-links:: |
88 | Flag which, when set to "1", will make cgit generate extra links for | 96 | Flag which, when set to "1", will make cgit generate extra links for |
89 | each repo in the repository index (specifically, to the "summary", | 97 | each repo in the repository index (specifically, to the "summary", |
90 | "commit" and "tree" pages). Default value: "0". | 98 | "commit" and "tree" pages). Default value: "0". |
91 | 99 | ||
92 | enable-log-filecount:: | 100 | enable-log-filecount:: |
93 | Flag which, when set to "1", will make cgit print the number of | 101 | Flag which, when set to "1", will make cgit print the number of |
94 | modified files for each commit on the repository log page. Default | 102 | modified files for each commit on the repository log page. Default |
@@ -195,18 +203,18 @@ noheader:: | |||
195 | on all pages. Default value: none. See also: "embedded". | 203 | on all pages. Default value: none. See also: "embedded". |
196 | 204 | ||
197 | renamelimit:: | 205 | renamelimit:: |
198 | Maximum number of files to consider when detecting renames. The value | 206 | Maximum number of files to consider when detecting renames. The value |
199 | "-1" uses the compiletime value in git (for further info, look at | 207 | "-1" uses the compiletime value in git (for further info, look at |
200 | `man git-diff`). Default value: "-1". | 208 | `man git-diff`). Default value: "-1". |
201 | 209 | ||
202 | repo.group:: | 210 | repo.group:: |
203 | A value for the current repository group, which all repositories | 211 | Legacy alias for "section". This option is deprecated and will not be |
204 | specified after this setting will inherit. Default value: none. | 212 | supported in cgit-1.0. |
205 | 213 | ||
206 | robots:: | 214 | robots:: |
207 | Text used as content for the "robots" meta-tag. Default value: | 215 | Text used as content for the "robots" meta-tag. Default value: |
208 | "index, nofollow". | 216 | "index, nofollow". |
209 | 217 | ||
210 | root-desc:: | 218 | root-desc:: |
211 | Text printed below the heading on the repository index page. Default | 219 | Text printed below the heading on the repository index page. Default |
212 | value: "a fast webinterface for the git dscm". | 220 | value: "a fast webinterface for the git dscm". |
@@ -215,16 +223,26 @@ root-readme:: | |||
215 | The content of the file specified with this option will be included | 223 | The content of the file specified with this option will be included |
216 | verbatim below the "about" link on the repository index page. Default | 224 | verbatim below the "about" link on the repository index page. Default |
217 | value: none. | 225 | value: none. |
218 | 226 | ||
219 | root-title:: | 227 | root-title:: |
220 | Text printed as heading on the repository index page. Default value: | 228 | Text printed as heading on the repository index page. Default value: |
221 | "Git Repository Browser". | 229 | "Git Repository Browser". |
222 | 230 | ||
231 | scan-path:: | ||
232 | A path which will be scanned for repositories. If caching is enabled, | ||
233 | the result will be cached as a cgitrc include-file in the cache | ||
234 | directory. Default value: none. See also: cache-scanrc-ttl. | ||
235 | |||
236 | section:: | ||
237 | The name of the current repository section - all repositories defined | ||
238 | after this option will inherit the current section name. Default value: | ||
239 | none. | ||
240 | |||
223 | snapshots:: | 241 | snapshots:: |
224 | Text which specifies the default set of snapshot formats generated by | 242 | Text which specifies the default set of snapshot formats generated by |
225 | cgit. The value is a space-separated list of zero or more of the | 243 | cgit. The value is a space-separated list of zero or more of the |
226 | values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. | 244 | values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. |
227 | 245 | ||
228 | source-filter:: | 246 | source-filter:: |
229 | Specifies a command which will be invoked to format plaintext blobs | 247 | Specifies a command which will be invoked to format plaintext blobs |
230 | in the tree view. The command will get the blob content on its STDIN | 248 | in the tree view. The command will get the blob content on its STDIN |
@@ -251,24 +269,26 @@ virtual-root:: | |||
251 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default | 269 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default |
252 | value: none. | 270 | value: none. |
253 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the | 271 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the |
254 | same kind of virtual urls, so this option will probably be deprecated. | 272 | same kind of virtual urls, so this option will probably be deprecated. |
255 | 273 | ||
256 | REPOSITORY SETTINGS | 274 | REPOSITORY SETTINGS |
257 | ------------------- | 275 | ------------------- |
258 | repo.about-filter:: | 276 | repo.about-filter:: |
259 | Override the default about-filter. Default value: <about-filter>. | 277 | Override the default about-filter. Default value: none. See also: |
278 | "enable-filter-overrides". | ||
260 | 279 | ||
261 | repo.clone-url:: | 280 | repo.clone-url:: |
262 | A list of space-separated urls which can be used to clone this repo. | 281 | A list of space-separated urls which can be used to clone this repo. |
263 | Default value: none. | 282 | Default value: none. |
264 | 283 | ||
265 | repo.commit-filter:: | 284 | repo.commit-filter:: |
266 | Override the default commit-filter. Default value: <commit-filter>. | 285 | Override the default commit-filter. Default value: none. See also: |
286 | "enable-filter-overrides". | ||
267 | 287 | ||
268 | repo.defbranch:: | 288 | repo.defbranch:: |
269 | The name of the default branch for this repository. If no such branch | 289 | The name of the default branch for this repository. If no such branch |
270 | exists in the repository, the first branch name (when sorted) is used | 290 | exists in the repository, the first branch name (when sorted) is used |
271 | as default instead. Default value: "master". | 291 | as default instead. Default value: "master". |
272 | 292 | ||
273 | repo.desc:: | 293 | repo.desc:: |
274 | The value to show as repository description. Default value: none. | 294 | The value to show as repository description. Default value: none. |
@@ -300,24 +320,42 @@ repo.path:: | |||
300 | repo.readme:: | 320 | repo.readme:: |
301 | A path (relative to <repo.path>) which specifies a file to include | 321 | A path (relative to <repo.path>) which specifies a file to include |
302 | verbatim as the "About" page for this repo. Default value: none. | 322 | verbatim as the "About" page for this repo. Default value: none. |
303 | 323 | ||
304 | repo.snapshots:: | 324 | repo.snapshots:: |
305 | A mask of allowed snapshot-formats for this repo, restricted by the | 325 | A mask of allowed snapshot-formats for this repo, restricted by the |
306 | "snapshots" global setting. Default value: <snapshots>. | 326 | "snapshots" global setting. Default value: <snapshots>. |
307 | 327 | ||
328 | repo.section:: | ||
329 | Override the current section name for this repository. Default value: | ||
330 | none. | ||
331 | |||
308 | repo.source-filter:: | 332 | repo.source-filter:: |
309 | Override the default source-filter. Default value: <source-filter>. | 333 | Override the default source-filter. Default value: none. See also: |
334 | "enable-filter-overrides". | ||
310 | 335 | ||
311 | repo.url:: | 336 | repo.url:: |
312 | The relative url used to access the repository. This must be the first | 337 | The relative url used to access the repository. This must be the first |
313 | setting specified for each repo. Default value: none. | 338 | setting specified for each repo. Default value: none. |
314 | 339 | ||
315 | 340 | ||
341 | REPOSITORY-SPECIFIC CGITRC FILE | ||
342 | ------------------------------- | ||
343 | When the option "scan-path" is used to auto-discover git repositories, cgit | ||
344 | will try to parse the file "cgitrc" within any found repository. Such a | ||
345 | repo-specific config file may contain any of the repo-specific options | ||
346 | described above, except "repo.url" and "repo.path". Additionally, the "filter" | ||
347 | options are only acknowledged in repo-specific config files when | ||
348 | "enable-filter-overrides" is set to "1". | ||
349 | |||
350 | Note: the "repo." prefix is dropped from the option names in repo-specific | ||
351 | config files, e.g. "repo.desc" becomes "desc". | ||
352 | |||
353 | |||
316 | EXAMPLE CGITRC FILE | 354 | EXAMPLE CGITRC FILE |
317 | ------------------- | 355 | ------------------- |
318 | 356 | ||
319 | .... | 357 | .... |
320 | # Enable caching of up to 1000 output entriess | 358 | # Enable caching of up to 1000 output entriess |
321 | cache-size=1000 | 359 | cache-size=1000 |
322 | 360 | ||
323 | 361 | ||
diff --git a/scan-tree.c b/scan-tree.c index 4da21a4..dbca797 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -1,9 +1,10 @@ | |||
1 | #include "cgit.h" | 1 | #include "cgit.h" |
2 | #include "configfile.h" | ||
2 | #include "html.h" | 3 | #include "html.h" |
3 | 4 | ||
4 | #define MAX_PATH 4096 | 5 | #define MAX_PATH 4096 |
5 | 6 | ||
6 | /* return 1 if path contains a objects/ directory and a HEAD file */ | 7 | /* return 1 if path contains a objects/ directory and a HEAD file */ |
7 | static int is_git_dir(const char *path) | 8 | static int is_git_dir(const char *path) |
8 | { | 9 | { |
9 | struct stat st; | 10 | struct stat st; |
@@ -30,19 +31,26 @@ static int is_git_dir(const char *path) | |||
30 | return 0; | 31 | return 0; |
31 | } | 32 | } |
32 | if (!S_ISREG(st.st_mode)) | 33 | if (!S_ISREG(st.st_mode)) |
33 | return 0; | 34 | return 0; |
34 | 35 | ||
35 | return 1; | 36 | return 1; |
36 | } | 37 | } |
37 | 38 | ||
38 | static void add_repo(const char *base, const char *path) | 39 | struct cgit_repo *repo; |
40 | repo_config_fn config_fn; | ||
41 | |||
42 | static void repo_config(const char *name, const char *value) | ||
43 | { | ||
44 | config_fn(repo, name, value); | ||
45 | } | ||
46 | |||
47 | static void add_repo(const char *base, const char *path, repo_config_fn fn) | ||
39 | { | 48 | { |
40 | struct cgit_repo *repo; | ||
41 | struct stat st; | 49 | struct stat st; |
42 | struct passwd *pwd; | 50 | struct passwd *pwd; |
43 | char *p; | 51 | char *p; |
44 | size_t size; | 52 | size_t size; |
45 | 53 | ||
46 | if (stat(path, &st)) { | 54 | if (stat(path, &st)) { |
47 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | 55 | fprintf(stderr, "Error accessing %s: %s (%d)\n", |
48 | path, strerror(errno), errno); | 56 | path, strerror(errno), errno); |
@@ -71,27 +79,37 @@ static void add_repo(const char *base, const char *path) | |||
71 | 79 | ||
72 | p = fmt("%s/description", path); | 80 | p = fmt("%s/description", path); |
73 | if (!stat(p, &st)) | 81 | if (!stat(p, &st)) |
74 | readfile(p, &repo->desc, &size); | 82 | readfile(p, &repo->desc, &size); |
75 | 83 | ||
76 | p = fmt("%s/README.html", path); | 84 | p = fmt("%s/README.html", path); |
77 | if (!stat(p, &st)) | 85 | if (!stat(p, &st)) |
78 | repo->readme = "README.html"; | 86 | repo->readme = "README.html"; |
87 | |||
88 | p = fmt("%s/cgitrc", path); | ||
89 | if (!stat(p, &st)) { | ||
90 | config_fn = fn; | ||
91 | parse_configfile(xstrdup(p), &repo_config); | ||
92 | } | ||
79 | } | 93 | } |
80 | 94 | ||
81 | static void scan_path(const char *base, const char *path) | 95 | static void scan_path(const char *base, const char *path, repo_config_fn fn) |
82 | { | 96 | { |
83 | DIR *dir; | 97 | DIR *dir; |
84 | struct dirent *ent; | 98 | struct dirent *ent; |
85 | char *buf; | 99 | char *buf; |
86 | struct stat st; | 100 | struct stat st; |
87 | 101 | ||
88 | if (is_git_dir(path)) { | 102 | if (is_git_dir(path)) { |
89 | add_repo(base, path); | 103 | add_repo(base, path, fn); |
104 | return; | ||
105 | } | ||
106 | if (is_git_dir(fmt("%s/.git", path))) { | ||
107 | add_repo(base, fmt("%s/.git", path), fn); | ||
90 | return; | 108 | return; |
91 | } | 109 | } |
92 | dir = opendir(path); | 110 | dir = opendir(path); |
93 | if (!dir) { | 111 | if (!dir) { |
94 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | 112 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", |
95 | path, strerror(errno), errno); | 113 | path, strerror(errno), errno); |
96 | return; | 114 | return; |
97 | } | 115 | } |
@@ -111,18 +129,18 @@ static void scan_path(const char *base, const char *path) | |||
111 | sprintf(buf, "%s/%s", path, ent->d_name); | 129 | sprintf(buf, "%s/%s", path, ent->d_name); |
112 | if (stat(buf, &st)) { | 130 | if (stat(buf, &st)) { |
113 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 131 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
114 | buf, strerror(errno), errno); | 132 | buf, strerror(errno), errno); |
115 | free(buf); | 133 | free(buf); |
116 | continue; | 134 | continue; |
117 | } | 135 | } |
118 | if (S_ISDIR(st.st_mode)) | 136 | if (S_ISDIR(st.st_mode)) |
119 | scan_path(base, buf); | 137 | scan_path(base, buf, fn); |
120 | free(buf); | 138 | free(buf); |
121 | } | 139 | } |
122 | closedir(dir); | 140 | closedir(dir); |
123 | } | 141 | } |
124 | 142 | ||
125 | void scan_tree(const char *path) | 143 | void scan_tree(const char *path, repo_config_fn fn) |
126 | { | 144 | { |
127 | scan_path(path, path); | 145 | scan_path(path, path, fn); |
128 | } | 146 | } |
diff --git a/scan-tree.h b/scan-tree.h index b103b16..11539f4 100644 --- a/scan-tree.h +++ b/scan-tree.h | |||
@@ -1,3 +1,3 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | extern void scan_tree(const char *path); | 3 | extern void scan_tree(const char *path, repo_config_fn fn); |
@@ -43,22 +43,23 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
43 | else | 43 | else |
44 | cgit_repolist.length *= 2; | 44 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * | 46 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); | 47 | sizeof(struct cgit_repo)); |
48 | } | 48 | } |
49 | 49 | ||
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | memset(ret, 0, sizeof(struct cgit_repo)); | ||
51 | ret->url = trim_end(url, '/'); | 52 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 53 | ret->name = ret->url; |
53 | ret->path = NULL; | 54 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 55 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 56 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; | 57 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; | 58 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 59 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->max_stats = ctx.cfg.max_stats; | 62 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->module_link = ctx.cfg.module_link; | 63 | ret->module_link = ctx.cfg.module_link; |
63 | ret->readme = NULL; | 64 | ret->readme = NULL; |
64 | ret->mtime = -1; | 65 | ret->mtime = -1; |
diff --git a/ui-repolist.c b/ui-repolist.c index 7c7aa9b..3ef2e99 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -131,16 +131,28 @@ static int cmp(const char *s1, const char *s2) | |||
131 | return strcmp(s1, s2); | 131 | return strcmp(s1, s2); |
132 | if (s1 && !s2) | 132 | if (s1 && !s2) |
133 | return -1; | 133 | return -1; |
134 | if (s2 && !s1) | 134 | if (s2 && !s1) |
135 | return 1; | 135 | return 1; |
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | static int sort_section(const void *a, const void *b) | ||
140 | { | ||
141 | const struct cgit_repo *r1 = a; | ||
142 | const struct cgit_repo *r2 = b; | ||
143 | int result; | ||
144 | |||
145 | result = cmp(r1->section, r2->section); | ||
146 | if (!result) | ||
147 | result = cmp(r1->name, r2->name); | ||
148 | return result; | ||
149 | } | ||
150 | |||
139 | static int sort_name(const void *a, const void *b) | 151 | static int sort_name(const void *a, const void *b) |
140 | { | 152 | { |
141 | const struct cgit_repo *r1 = a; | 153 | const struct cgit_repo *r1 = a; |
142 | const struct cgit_repo *r2 = b; | 154 | const struct cgit_repo *r2 = b; |
143 | 155 | ||
144 | return cmp(r1->name, r2->name); | 156 | return cmp(r1->name, r2->name); |
145 | } | 157 | } |
146 | 158 | ||
@@ -173,16 +185,17 @@ static int sort_idle(const void *a, const void *b) | |||
173 | } | 185 | } |
174 | 186 | ||
175 | struct sortcolumn { | 187 | struct sortcolumn { |
176 | const char *name; | 188 | const char *name; |
177 | int (*fn)(const void *a, const void *b); | 189 | int (*fn)(const void *a, const void *b); |
178 | }; | 190 | }; |
179 | 191 | ||
180 | struct sortcolumn sortcolumn[] = { | 192 | struct sortcolumn sortcolumn[] = { |
193 | {"section", sort_section}, | ||
181 | {"name", sort_name}, | 194 | {"name", sort_name}, |
182 | {"desc", sort_desc}, | 195 | {"desc", sort_desc}, |
183 | {"owner", sort_owner}, | 196 | {"owner", sort_owner}, |
184 | {"idle", sort_idle}, | 197 | {"idle", sort_idle}, |
185 | {NULL, NULL} | 198 | {NULL, NULL} |
186 | }; | 199 | }; |
187 | 200 | ||
188 | int sort_repolist(char *field) | 201 | int sort_repolist(char *field) |
@@ -198,58 +211,64 @@ int sort_repolist(char *field) | |||
198 | } | 211 | } |
199 | return 0; | 212 | return 0; |
200 | } | 213 | } |
201 | 214 | ||
202 | 215 | ||
203 | void cgit_print_repolist() | 216 | void cgit_print_repolist() |
204 | { | 217 | { |
205 | int i, columns = 4, hits = 0, header = 0; | 218 | int i, columns = 4, hits = 0, header = 0; |
206 | char *last_group = NULL; | 219 | char *last_section = NULL; |
220 | char *section; | ||
207 | int sorted = 0; | 221 | int sorted = 0; |
208 | 222 | ||
209 | if (ctx.cfg.enable_index_links) | 223 | if (ctx.cfg.enable_index_links) |
210 | columns++; | 224 | columns++; |
211 | 225 | ||
212 | ctx.page.title = ctx.cfg.root_title; | 226 | ctx.page.title = ctx.cfg.root_title; |
213 | cgit_print_http_headers(&ctx); | 227 | cgit_print_http_headers(&ctx); |
214 | cgit_print_docstart(&ctx); | 228 | cgit_print_docstart(&ctx); |
215 | cgit_print_pageheader(&ctx); | 229 | cgit_print_pageheader(&ctx); |
216 | 230 | ||
217 | if (ctx.cfg.index_header) | 231 | if (ctx.cfg.index_header) |
218 | html_include(ctx.cfg.index_header); | 232 | html_include(ctx.cfg.index_header); |
219 | 233 | ||
220 | if(ctx.qry.sort) | 234 | if(ctx.qry.sort) |
221 | sorted = sort_repolist(ctx.qry.sort); | 235 | sorted = sort_repolist(ctx.qry.sort); |
236 | else | ||
237 | sort_repolist("section"); | ||
222 | 238 | ||
223 | html("<table summary='repository list' class='list nowrap'>"); | 239 | html("<table summary='repository list' class='list nowrap'>"); |
224 | for (i=0; i<cgit_repolist.count; i++) { | 240 | for (i=0; i<cgit_repolist.count; i++) { |
225 | ctx.repo = &cgit_repolist.repos[i]; | 241 | ctx.repo = &cgit_repolist.repos[i]; |
226 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) | 242 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) |
227 | continue; | 243 | continue; |
228 | hits++; | 244 | hits++; |
229 | if (hits <= ctx.qry.ofs) | 245 | if (hits <= ctx.qry.ofs) |
230 | continue; | 246 | continue; |
231 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) | 247 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) |
232 | continue; | 248 | continue; |
233 | if (!header++) | 249 | if (!header++) |
234 | print_header(columns); | 250 | print_header(columns); |
251 | section = ctx.repo->section; | ||
252 | if (section && !strcmp(section, "")) | ||
253 | section = NULL; | ||
235 | if (!sorted && | 254 | if (!sorted && |
236 | ((last_group == NULL && ctx.repo->group != NULL) || | 255 | ((last_section == NULL && section != NULL) || |
237 | (last_group != NULL && ctx.repo->group == NULL) || | 256 | (last_section != NULL && section == NULL) || |
238 | (last_group != NULL && ctx.repo->group != NULL && | 257 | (last_section != NULL && section != NULL && |
239 | strcmp(ctx.repo->group, last_group)))) { | 258 | strcmp(section, last_section)))) { |
240 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", | 259 | htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>", |
241 | columns); | 260 | columns); |
242 | html_txt(ctx.repo->group); | 261 | html_txt(section); |
243 | html("</td></tr>"); | 262 | html("</td></tr>"); |
244 | last_group = ctx.repo->group; | 263 | last_section = section; |
245 | } | 264 | } |
246 | htmlf("<tr><td class='%s'>", | 265 | htmlf("<tr><td class='%s'>", |
247 | !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); | 266 | !sorted && section ? "sublevel-repo" : "toplevel-repo"); |
248 | cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); | 267 | cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); |
249 | html("</td><td>"); | 268 | html("</td><td>"); |
250 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); | 269 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); |
251 | html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); | 270 | html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); |
252 | html_link_close(); | 271 | html_link_close(); |
253 | html("</td><td>"); | 272 | html("</td><td>"); |
254 | html_txt(ctx.repo->owner); | 273 | html_txt(ctx.repo->owner); |
255 | html("</td><td>"); | 274 | html("</td><td>"); |
@@ -149,16 +149,24 @@ int cgit_find_stats_period(const char *expr, struct cgit_period **period) | |||
149 | if (periods[i].code == code || !strcmp(periods[i].name, expr)) { | 149 | if (periods[i].code == code || !strcmp(periods[i].name, expr)) { |
150 | if (period) | 150 | if (period) |
151 | *period = &periods[i]; | 151 | *period = &periods[i]; |
152 | return i+1; | 152 | return i+1; |
153 | } | 153 | } |
154 | return 0; | 154 | return 0; |
155 | } | 155 | } |
156 | 156 | ||
157 | const char *cgit_find_stats_periodname(int idx) | ||
158 | { | ||
159 | if (idx > 0 && idx < 4) | ||
160 | return periods[idx - 1].name; | ||
161 | else | ||
162 | return ""; | ||
163 | } | ||
164 | |||
157 | static void add_commit(struct string_list *authors, struct commit *commit, | 165 | static void add_commit(struct string_list *authors, struct commit *commit, |
158 | struct cgit_period *period) | 166 | struct cgit_period *period) |
159 | { | 167 | { |
160 | struct commitinfo *info; | 168 | struct commitinfo *info; |
161 | struct string_list_item *author, *item; | 169 | struct string_list_item *author, *item; |
162 | struct authorstat *authorstat; | 170 | struct authorstat *authorstat; |
163 | struct string_list *items; | 171 | struct string_list *items; |
164 | char *tmp; | 172 | char *tmp; |
@@ -16,12 +16,13 @@ struct cgit_period { | |||
16 | void (*dec)(struct tm *tm); | 16 | void (*dec)(struct tm *tm); |
17 | void (*inc)(struct tm *tm); | 17 | void (*inc)(struct tm *tm); |
18 | 18 | ||
19 | /* Pretty-print a tm value */ | 19 | /* Pretty-print a tm value */ |
20 | char *(*pretty)(struct tm *tm); | 20 | char *(*pretty)(struct tm *tm); |
21 | }; | 21 | }; |
22 | 22 | ||
23 | extern int cgit_find_stats_period(const char *expr, struct cgit_period **period); | 23 | extern int cgit_find_stats_period(const char *expr, struct cgit_period **period); |
24 | extern const char *cgit_find_stats_periodname(int idx); | ||
24 | 25 | ||
25 | extern void cgit_show_stats(struct cgit_context *ctx); | 26 | extern void cgit_show_stats(struct cgit_context *ctx); |
26 | 27 | ||
27 | #endif /* UI_STATS_H */ | 28 | #endif /* UI_STATS_H */ |