|
diff --git a/shared.c b/shared.c index 3d4feea..7eb2b0e 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -35,12 +35,14 @@ int cgit_max_lock_attempts = 5; |
35 | int cgit_cache_root_ttl = 5; |
35 | int cgit_cache_root_ttl = 5; |
36 | int cgit_cache_repo_ttl = 5; |
36 | int cgit_cache_repo_ttl = 5; |
37 | int cgit_cache_dynamic_ttl = 5; |
37 | int cgit_cache_dynamic_ttl = 5; |
38 | int cgit_cache_static_ttl = -1; |
38 | int cgit_cache_static_ttl = -1; |
39 | int cgit_cache_max_create_time = 5; |
39 | int cgit_cache_max_create_time = 5; |
40 | int cgit_summary_log = 0; |
40 | int cgit_summary_log = 0; |
| |
41 | int cgit_summary_tags = 0; |
| |
42 | int cgit_summary_branches = 0; |
41 | int cgit_renamelimit = -1; |
43 | int cgit_renamelimit = -1; |
42 | |
44 | |
43 | int cgit_max_msg_len = 60; |
45 | int cgit_max_msg_len = 60; |
44 | int cgit_max_repodesc_len = 60; |
46 | int cgit_max_repodesc_len = 60; |
45 | int cgit_max_commit_count = 50; |
47 | int cgit_max_commit_count = 50; |
46 | |
48 | |
@@ -61,13 +63,13 @@ int cgit_query_ofs = 0; |
61 | int htmlfd = 0; |
63 | int htmlfd = 0; |
62 | |
64 | |
63 | |
65 | |
64 | int cgit_get_cmd_index(const char *cmd) |
66 | int cgit_get_cmd_index(const char *cmd) |
65 | { |
67 | { |
66 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
68 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
67 | "snapshot", "tag", NULL}; |
69 | "snapshot", "tag", "refs", NULL}; |
68 | int i; |
70 | int i; |
69 | |
71 | |
70 | for(i = 0; cmds[i]; i++) |
72 | for(i = 0; cmds[i]; i++) |
71 | if (!strcmp(cmd, cmds[i])) |
73 | if (!strcmp(cmd, cmds[i])) |
72 | return i + 1; |
74 | return i + 1; |
73 | return 0; |
75 | return 0; |
@@ -178,12 +180,16 @@ void cgit_global_config_cb(const char *name, const char *value) |
178 | else if (!strcmp(name, "max-repodesc-length")) |
180 | else if (!strcmp(name, "max-repodesc-length")) |
179 | cgit_max_repodesc_len = atoi(value); |
181 | cgit_max_repodesc_len = atoi(value); |
180 | else if (!strcmp(name, "max-commit-count")) |
182 | else if (!strcmp(name, "max-commit-count")) |
181 | cgit_max_commit_count = atoi(value); |
183 | cgit_max_commit_count = atoi(value); |
182 | else if (!strcmp(name, "summary-log")) |
184 | else if (!strcmp(name, "summary-log")) |
183 | cgit_summary_log = atoi(value); |
185 | cgit_summary_log = atoi(value); |
| |
186 | else if (!strcmp(name, "summary-branches")) |
| |
187 | cgit_summary_branches = atoi(value); |
| |
188 | else if (!strcmp(name, "summary-tags")) |
| |
189 | cgit_summary_tags = atoi(value); |
184 | else if (!strcmp(name, "agefile")) |
190 | else if (!strcmp(name, "agefile")) |
185 | cgit_agefile = xstrdup(value); |
191 | cgit_agefile = xstrdup(value); |
186 | else if (!strcmp(name, "renamelimit")) |
192 | else if (!strcmp(name, "renamelimit")) |
187 | cgit_renamelimit = atoi(value); |
193 | cgit_renamelimit = atoi(value); |
188 | else if (!strcmp(name, "repo.group")) |
194 | else if (!strcmp(name, "repo.group")) |
189 | cgit_repo_group = xstrdup(value); |
195 | cgit_repo_group = xstrdup(value); |
@@ -288,12 +294,53 @@ char *trim_end(const char *str, char c) |
288 | t[len] = '\0'; |
294 | t[len] = '\0'; |
289 | s = xstrdup(t); |
295 | s = xstrdup(t); |
290 | t[len] = c; |
296 | t[len] = c; |
291 | return s; |
297 | return s; |
292 | } |
298 | } |
293 | |
299 | |
| |
300 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
| |
301 | { |
| |
302 | size_t size; |
| |
303 | |
| |
304 | if (list->count >= list->alloc) { |
| |
305 | list->alloc += (list->alloc ? list->alloc : 4); |
| |
306 | size = list->alloc * sizeof(struct refinfo *); |
| |
307 | list->refs = xrealloc(list->refs, size); |
| |
308 | } |
| |
309 | list->refs[list->count++] = ref; |
| |
310 | } |
| |
311 | |
| |
312 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
| |
313 | { |
| |
314 | struct refinfo *ref; |
| |
315 | |
| |
316 | ref = xmalloc(sizeof (struct refinfo)); |
| |
317 | ref->refname = xstrdup(refname); |
| |
318 | ref->object = parse_object(sha1); |
| |
319 | switch (ref->object->type) { |
| |
320 | case OBJ_TAG: |
| |
321 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
| |
322 | break; |
| |
323 | case OBJ_COMMIT: |
| |
324 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
| |
325 | break; |
| |
326 | } |
| |
327 | return ref; |
| |
328 | } |
| |
329 | |
| |
330 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
| |
331 | void *cb_data) |
| |
332 | { |
| |
333 | struct reflist *list = (struct reflist *)cb_data; |
| |
334 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
| |
335 | |
| |
336 | if (info) |
| |
337 | cgit_add_ref(list, info); |
| |
338 | return 0; |
| |
339 | } |
| |
340 | |
294 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
341 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
295 | struct diff_options *options, void *data) |
342 | struct diff_options *options, void *data) |
296 | { |
343 | { |
297 | int i; |
344 | int i; |
298 | |
345 | |
299 | for (i = 0; i < q->nr; i++) { |
346 | for (i = 0; i < q->nr; i++) { |
|