|
diff --git a/cgit.c b/cgit.c index 28bab8d..aee7ba3 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -98,26 +98,26 @@ static void cgit_print_repo_page(struct cacheitem *item) |
98 | |
98 | |
99 | |
99 | |
100 | if (!cgit_query_page) { |
100 | if (!cgit_query_page) { |
101 | cgit_print_pageheader("summary", show_search); |
101 | cgit_print_pageheader("summary", show_search); |
102 | cgit_print_summary(); |
102 | cgit_print_summary(); |
103 | cgit_print_docend(); |
103 | cgit_print_docend(); |
104 | return; |
104 | return; |
105 | } |
105 | } |
106 | |
106 | |
107 | cgit_print_pageheader(cgit_query_page, show_search); |
107 | cgit_print_pageheader(cgit_query_page, show_search); |
108 | |
108 | |
109 | if (!strcmp(cgit_query_page, "log")) { |
109 | if (!strcmp(cgit_query_page, "log")) { |
110 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100, |
110 | cgit_print_log(cgit_query_head, cgit_query_ofs, |
111 | cgit_query_search); |
111 | cgit_max_commit_count, cgit_query_search); |
112 | } else if (!strcmp(cgit_query_page, "tree")) { |
112 | } else if (!strcmp(cgit_query_page, "tree")) { |
113 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
113 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
114 | } else if (!strcmp(cgit_query_page, "commit")) { |
114 | } else if (!strcmp(cgit_query_page, "commit")) { |
115 | cgit_print_commit(cgit_query_sha1); |
115 | cgit_print_commit(cgit_query_sha1); |
116 | } else if (!strcmp(cgit_query_page, "view")) { |
116 | } else if (!strcmp(cgit_query_page, "view")) { |
117 | cgit_print_view(cgit_query_sha1, cgit_query_path); |
117 | cgit_print_view(cgit_query_sha1, cgit_query_path); |
118 | } else if (!strcmp(cgit_query_page, "diff")) { |
118 | } else if (!strcmp(cgit_query_page, "diff")) { |
119 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
119 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
120 | } else { |
120 | } else { |
121 | cgit_print_error("Invalid request"); |
121 | cgit_print_error("Invalid request"); |
122 | } |
122 | } |
123 | cgit_print_docend(); |
123 | cgit_print_docend(); |
|
|
diff --git a/cgit.h b/cgit.h index 43de375..46f3173 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -78,24 +78,25 @@ extern char *cgit_virtual_root; |
78 | extern char *cgit_cache_root; |
78 | extern char *cgit_cache_root; |
79 | |
79 | |
80 | extern int cgit_nocache; |
80 | extern int cgit_nocache; |
81 | extern int cgit_snapshots; |
81 | extern int cgit_snapshots; |
82 | extern int cgit_max_lock_attempts; |
82 | extern int cgit_max_lock_attempts; |
83 | extern int cgit_cache_root_ttl; |
83 | extern int cgit_cache_root_ttl; |
84 | extern int cgit_cache_repo_ttl; |
84 | extern int cgit_cache_repo_ttl; |
85 | extern int cgit_cache_dynamic_ttl; |
85 | extern int cgit_cache_dynamic_ttl; |
86 | extern int cgit_cache_static_ttl; |
86 | extern int cgit_cache_static_ttl; |
87 | extern int cgit_cache_max_create_time; |
87 | extern int cgit_cache_max_create_time; |
88 | |
88 | |
89 | extern int cgit_max_msg_len; |
89 | extern int cgit_max_msg_len; |
| |
90 | extern int cgit_max_commit_count; |
90 | |
91 | |
91 | extern char *cgit_repo_name; |
92 | extern char *cgit_repo_name; |
92 | extern char *cgit_repo_desc; |
93 | extern char *cgit_repo_desc; |
93 | extern char *cgit_repo_owner; |
94 | extern char *cgit_repo_owner; |
94 | |
95 | |
95 | extern int cgit_query_has_symref; |
96 | extern int cgit_query_has_symref; |
96 | extern int cgit_query_has_sha1; |
97 | extern int cgit_query_has_sha1; |
97 | |
98 | |
98 | extern char *cgit_querystring; |
99 | extern char *cgit_querystring; |
99 | extern char *cgit_query_repo; |
100 | extern char *cgit_query_repo; |
100 | extern char *cgit_query_page; |
101 | extern char *cgit_query_page; |
101 | extern char *cgit_query_search; |
102 | extern char *cgit_query_search; |
|
|
diff --git a/cgitrc b/cgitrc index f217b39..019781e 100644 --- a/ cgitrc+++ b/ cgitrc |
|
@@ -46,24 +46,28 @@ |
46 | ## Url loaded when clicking the logo |
46 | ## Url loaded when clicking the logo |
47 | #logo-link=http://www.kernel.org/pub/software/scm/git/docs/ |
47 | #logo-link=http://www.kernel.org/pub/software/scm/git/docs/ |
48 | |
48 | |
49 | |
49 | |
50 | ## Url loaded when clicking a submodule link |
50 | ## Url loaded when clicking a submodule link |
51 | #module-link=./?repo=%s&page=commit&id=%s |
51 | #module-link=./?repo=%s&page=commit&id=%s |
52 | |
52 | |
53 | |
53 | |
54 | ## Number of chars shown of commit subject message (in log view) |
54 | ## Number of chars shown of commit subject message (in log view) |
55 | #max-message-length=60 |
55 | #max-message-length=60 |
56 | |
56 | |
57 | |
57 | |
| |
58 | ## Number of commits per page in log view |
| |
59 | #max-commit-count=50 |
| |
60 | |
| |
61 | |
58 | ## Root of cached output |
62 | ## Root of cached output |
59 | #cache-root=/var/cache/cgit |
63 | #cache-root=/var/cache/cgit |
60 | |
64 | |
61 | |
65 | |
62 | ## |
66 | ## |
63 | ## Time-To-Live settings: specifies how long (in minutes) different pages |
67 | ## Time-To-Live settings: specifies how long (in minutes) different pages |
64 | ## should be cached (0 for instant expiration, -1 for immortal pages) |
68 | ## should be cached (0 for instant expiration, -1 for immortal pages) |
65 | ## |
69 | ## |
66 | |
70 | |
67 | ## ttl for root page |
71 | ## ttl for root page |
68 | #cache-root-ttl=5 |
72 | #cache-root-ttl=5 |
69 | |
73 | |
|
|
diff --git a/shared.c b/shared.c index 801f68d..ffecac8 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -21,24 +21,25 @@ char *cgit_virtual_root = NULL; |
21 | char *cgit_cache_root = "/var/cache/cgit"; |
21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | |
22 | |
23 | int cgit_nocache = 0; |
23 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; |
24 | int cgit_snapshots = 0; |
25 | int cgit_max_lock_attempts = 5; |
25 | int cgit_max_lock_attempts = 5; |
26 | int cgit_cache_root_ttl = 5; |
26 | int cgit_cache_root_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; |
29 | int cgit_cache_static_ttl = -1; |
29 | int cgit_cache_static_ttl = -1; |
30 | int cgit_cache_max_create_time = 5; |
30 | int cgit_cache_max_create_time = 5; |
31 | |
31 | |
32 | int cgit_max_msg_len = 60; |
32 | int cgit_max_msg_len = 60; |
| |
33 | int cgit_max_commit_count = 50; |
33 | |
34 | |
34 | char *cgit_repo_name = NULL; |
35 | char *cgit_repo_name = NULL; |
35 | char *cgit_repo_desc = NULL; |
36 | char *cgit_repo_desc = NULL; |
36 | char *cgit_repo_owner = NULL; |
37 | char *cgit_repo_owner = NULL; |
37 | |
38 | |
38 | int cgit_query_has_symref = 0; |
39 | int cgit_query_has_symref = 0; |
39 | int cgit_query_has_sha1 = 0; |
40 | int cgit_query_has_sha1 = 0; |
40 | |
41 | |
41 | char *cgit_querystring = NULL; |
42 | char *cgit_querystring = NULL; |
42 | char *cgit_query_repo = NULL; |
43 | char *cgit_query_repo = NULL; |
43 | char *cgit_query_page = NULL; |
44 | char *cgit_query_page = NULL; |
44 | char *cgit_query_head = NULL; |
45 | char *cgit_query_head = NULL; |
@@ -111,24 +112,26 @@ void cgit_global_config_cb(const char *name, const char *value) |
111 | else if (!strcmp(name, "cache-root")) |
112 | else if (!strcmp(name, "cache-root")) |
112 | cgit_cache_root = xstrdup(value); |
113 | cgit_cache_root = xstrdup(value); |
113 | else if (!strcmp(name, "cache-root-ttl")) |
114 | else if (!strcmp(name, "cache-root-ttl")) |
114 | cgit_cache_root_ttl = atoi(value); |
115 | cgit_cache_root_ttl = atoi(value); |
115 | else if (!strcmp(name, "cache-repo-ttl")) |
116 | else if (!strcmp(name, "cache-repo-ttl")) |
116 | cgit_cache_repo_ttl = atoi(value); |
117 | cgit_cache_repo_ttl = atoi(value); |
117 | else if (!strcmp(name, "cache-static-ttl")) |
118 | else if (!strcmp(name, "cache-static-ttl")) |
118 | cgit_cache_static_ttl = atoi(value); |
119 | cgit_cache_static_ttl = atoi(value); |
119 | else if (!strcmp(name, "cache-dynamic-ttl")) |
120 | else if (!strcmp(name, "cache-dynamic-ttl")) |
120 | cgit_cache_dynamic_ttl = atoi(value); |
121 | cgit_cache_dynamic_ttl = atoi(value); |
121 | else if (!strcmp(name, "max-message-length")) |
122 | else if (!strcmp(name, "max-message-length")) |
122 | cgit_max_msg_len = atoi(value); |
123 | cgit_max_msg_len = atoi(value); |
| |
124 | else if (!strcmp(name, "max-commit-count")) |
| |
125 | cgit_max_commit_count = atoi(value); |
123 | else if (!strcmp(name, "repo.url")) |
126 | else if (!strcmp(name, "repo.url")) |
124 | cgit_repo = add_repo(value); |
127 | cgit_repo = add_repo(value); |
125 | else if (!strcmp(name, "repo.name")) |
128 | else if (!strcmp(name, "repo.name")) |
126 | cgit_repo->name = xstrdup(value); |
129 | cgit_repo->name = xstrdup(value); |
127 | else if (cgit_repo && !strcmp(name, "repo.path")) |
130 | else if (cgit_repo && !strcmp(name, "repo.path")) |
128 | cgit_repo->path = xstrdup(value); |
131 | cgit_repo->path = xstrdup(value); |
129 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
132 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
130 | cgit_repo->desc = xstrdup(value); |
133 | cgit_repo->desc = xstrdup(value); |
131 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
134 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
132 | cgit_repo->owner = xstrdup(value); |
135 | cgit_repo->owner = xstrdup(value); |
133 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
136 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
134 | cgit_repo->snapshots = atoi(value); |
137 | cgit_repo->snapshots = atoi(value); |
|