-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 10 | ||||
-rw-r--r-- | cmd.c | 2 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-repolist.c | 9 | ||||
-rw-r--r-- | ui-summary.c | 28 | ||||
-rw-r--r-- | ui-summary.h | 2 |
8 files changed, 48 insertions, 10 deletions
@@ -79,48 +79,50 @@ void config_cb(const char *name, const char *value) | |||
79 | else if (!strcmp(name, "noheader")) | 79 | else if (!strcmp(name, "noheader")) |
80 | ctx.cfg.noheader = atoi(value); | 80 | ctx.cfg.noheader = atoi(value); |
81 | else if (!strcmp(name, "snapshots")) | 81 | else if (!strcmp(name, "snapshots")) |
82 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 82 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
83 | else if (!strcmp(name, "enable-index-links")) | 83 | else if (!strcmp(name, "enable-index-links")) |
84 | ctx.cfg.enable_index_links = atoi(value); | 84 | ctx.cfg.enable_index_links = atoi(value); |
85 | else if (!strcmp(name, "enable-log-filecount")) | 85 | else if (!strcmp(name, "enable-log-filecount")) |
86 | ctx.cfg.enable_log_filecount = atoi(value); | 86 | ctx.cfg.enable_log_filecount = atoi(value); |
87 | else if (!strcmp(name, "enable-log-linecount")) | 87 | else if (!strcmp(name, "enable-log-linecount")) |
88 | ctx.cfg.enable_log_linecount = atoi(value); | 88 | ctx.cfg.enable_log_linecount = atoi(value); |
89 | else if (!strcmp(name, "max-stats")) | 89 | else if (!strcmp(name, "max-stats")) |
90 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 90 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
91 | else if (!strcmp(name, "cache-size")) | 91 | else if (!strcmp(name, "cache-size")) |
92 | ctx.cfg.cache_size = atoi(value); | 92 | ctx.cfg.cache_size = atoi(value); |
93 | else if (!strcmp(name, "cache-root")) | 93 | else if (!strcmp(name, "cache-root")) |
94 | ctx.cfg.cache_root = xstrdup(value); | 94 | ctx.cfg.cache_root = xstrdup(value); |
95 | else if (!strcmp(name, "cache-root-ttl")) | 95 | else if (!strcmp(name, "cache-root-ttl")) |
96 | ctx.cfg.cache_root_ttl = atoi(value); | 96 | ctx.cfg.cache_root_ttl = atoi(value); |
97 | else if (!strcmp(name, "cache-repo-ttl")) | 97 | else if (!strcmp(name, "cache-repo-ttl")) |
98 | ctx.cfg.cache_repo_ttl = atoi(value); | 98 | ctx.cfg.cache_repo_ttl = atoi(value); |
99 | else if (!strcmp(name, "cache-static-ttl")) | 99 | else if (!strcmp(name, "cache-static-ttl")) |
100 | ctx.cfg.cache_static_ttl = atoi(value); | 100 | ctx.cfg.cache_static_ttl = atoi(value); |
101 | else if (!strcmp(name, "cache-dynamic-ttl")) | 101 | else if (!strcmp(name, "cache-dynamic-ttl")) |
102 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 102 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
103 | else if (!strcmp(name, "about-filter")) | ||
104 | ctx.cfg.about_filter = new_filter(value, 0); | ||
103 | else if (!strcmp(name, "commit-filter")) | 105 | else if (!strcmp(name, "commit-filter")) |
104 | ctx.cfg.commit_filter = new_filter(value, 0); | 106 | ctx.cfg.commit_filter = new_filter(value, 0); |
105 | else if (!strcmp(name, "embedded")) | 107 | else if (!strcmp(name, "embedded")) |
106 | ctx.cfg.embedded = atoi(value); | 108 | ctx.cfg.embedded = atoi(value); |
107 | else if (!strcmp(name, "max-message-length")) | 109 | else if (!strcmp(name, "max-message-length")) |
108 | ctx.cfg.max_msg_len = atoi(value); | 110 | ctx.cfg.max_msg_len = atoi(value); |
109 | else if (!strcmp(name, "max-repodesc-length")) | 111 | else if (!strcmp(name, "max-repodesc-length")) |
110 | ctx.cfg.max_repodesc_len = atoi(value); | 112 | ctx.cfg.max_repodesc_len = atoi(value); |
111 | else if (!strcmp(name, "max-repo-count")) | 113 | else if (!strcmp(name, "max-repo-count")) |
112 | ctx.cfg.max_repo_count = atoi(value); | 114 | ctx.cfg.max_repo_count = atoi(value); |
113 | else if (!strcmp(name, "max-commit-count")) | 115 | else if (!strcmp(name, "max-commit-count")) |
114 | ctx.cfg.max_commit_count = atoi(value); | 116 | ctx.cfg.max_commit_count = atoi(value); |
115 | else if (!strcmp(name, "source-filter")) | 117 | else if (!strcmp(name, "source-filter")) |
116 | ctx.cfg.source_filter = new_filter(value, 1); | 118 | ctx.cfg.source_filter = new_filter(value, 1); |
117 | else if (!strcmp(name, "summary-log")) | 119 | else if (!strcmp(name, "summary-log")) |
118 | ctx.cfg.summary_log = atoi(value); | 120 | ctx.cfg.summary_log = atoi(value); |
119 | else if (!strcmp(name, "summary-branches")) | 121 | else if (!strcmp(name, "summary-branches")) |
120 | ctx.cfg.summary_branches = atoi(value); | 122 | ctx.cfg.summary_branches = atoi(value); |
121 | else if (!strcmp(name, "summary-tags")) | 123 | else if (!strcmp(name, "summary-tags")) |
122 | ctx.cfg.summary_tags = atoi(value); | 124 | ctx.cfg.summary_tags = atoi(value); |
123 | else if (!strcmp(name, "agefile")) | 125 | else if (!strcmp(name, "agefile")) |
124 | ctx.cfg.agefile = xstrdup(value); | 126 | ctx.cfg.agefile = xstrdup(value); |
125 | else if (!strcmp(name, "renamelimit")) | 127 | else if (!strcmp(name, "renamelimit")) |
126 | ctx.cfg.renamelimit = atoi(value); | 128 | ctx.cfg.renamelimit = atoi(value); |
@@ -137,48 +139,50 @@ void config_cb(const char *name, const char *value) | |||
137 | else if (!strcmp(name, "repo.url")) | 139 | else if (!strcmp(name, "repo.url")) |
138 | ctx.repo = cgit_add_repo(value); | 140 | ctx.repo = cgit_add_repo(value); |
139 | else if (!strcmp(name, "repo.name")) | 141 | else if (!strcmp(name, "repo.name")) |
140 | ctx.repo->name = xstrdup(value); | 142 | ctx.repo->name = xstrdup(value); |
141 | else if (ctx.repo && !strcmp(name, "repo.path")) | 143 | else if (ctx.repo && !strcmp(name, "repo.path")) |
142 | ctx.repo->path = trim_end(value, '/'); | 144 | ctx.repo->path = trim_end(value, '/'); |
143 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 145 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
144 | ctx.repo->clone_url = xstrdup(value); | 146 | ctx.repo->clone_url = xstrdup(value); |
145 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 147 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
146 | ctx.repo->desc = xstrdup(value); | 148 | ctx.repo->desc = xstrdup(value); |
147 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 149 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
148 | ctx.repo->owner = xstrdup(value); | 150 | ctx.repo->owner = xstrdup(value); |
149 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 151 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
150 | ctx.repo->defbranch = xstrdup(value); | 152 | ctx.repo->defbranch = xstrdup(value); |
151 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 153 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
152 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 154 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
153 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 155 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
154 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 156 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
155 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
156 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 158 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
157 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 159 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
158 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
159 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
160 | ctx.repo->module_link= xstrdup(value); | 162 | ctx.repo->module_link= xstrdup(value); |
163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | ||
164 | ctx.repo->about_filter = new_filter(value, 0); | ||
161 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | 165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
162 | ctx.repo->commit_filter = new_filter(value, 0); | 166 | ctx.repo->commit_filter = new_filter(value, 0); |
163 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | 167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
164 | ctx.repo->source_filter = new_filter(value, 1); | 168 | ctx.repo->source_filter = new_filter(value, 1); |
165 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 169 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
166 | if (*value == '/') | 170 | if (*value == '/') |
167 | ctx.repo->readme = xstrdup(value); | 171 | ctx.repo->readme = xstrdup(value); |
168 | else | 172 | else |
169 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 173 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
170 | } else if (!strcmp(name, "include")) | 174 | } else if (!strcmp(name, "include")) |
171 | parse_configfile(value, config_cb); | 175 | parse_configfile(value, config_cb); |
172 | } | 176 | } |
173 | 177 | ||
174 | static void querystring_cb(const char *name, const char *value) | 178 | static void querystring_cb(const char *name, const char *value) |
175 | { | 179 | { |
176 | if (!strcmp(name,"r")) { | 180 | if (!strcmp(name,"r")) { |
177 | ctx.qry.repo = xstrdup(value); | 181 | ctx.qry.repo = xstrdup(value); |
178 | ctx.repo = cgit_get_repoinfo(value); | 182 | ctx.repo = cgit_get_repoinfo(value); |
179 | } else if (!strcmp(name, "p")) { | 183 | } else if (!strcmp(name, "p")) { |
180 | ctx.qry.page = xstrdup(value); | 184 | ctx.qry.page = xstrdup(value); |
181 | } else if (!strcmp(name, "url")) { | 185 | } else if (!strcmp(name, "url")) { |
182 | ctx.qry.url = xstrdup(value); | 186 | ctx.qry.url = xstrdup(value); |
183 | cgit_parse_url(value); | 187 | cgit_parse_url(value); |
184 | } else if (!strcmp(name, "qt")) { | 188 | } else if (!strcmp(name, "qt")) { |
@@ -53,48 +53,49 @@ struct cgit_filter { | |||
53 | char *cmd; | 53 | char *cmd; |
54 | char **argv; | 54 | char **argv; |
55 | int old_stdout; | 55 | int old_stdout; |
56 | int pipe_fh[2]; | 56 | int pipe_fh[2]; |
57 | int pid; | 57 | int pid; |
58 | int exitstatus; | 58 | int exitstatus; |
59 | }; | 59 | }; |
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; | 68 | char *group; |
69 | char *module_link; | 69 | char *module_link; |
70 | char *readme; | 70 | char *readme; |
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 *commit_filter; | 78 | struct cgit_filter *commit_filter; |
78 | struct cgit_filter *source_filter; | 79 | struct cgit_filter *source_filter; |
79 | }; | 80 | }; |
80 | 81 | ||
81 | struct cgit_repolist { | 82 | struct cgit_repolist { |
82 | int length; | 83 | int length; |
83 | int count; | 84 | int count; |
84 | struct cgit_repo *repos; | 85 | struct cgit_repo *repos; |
85 | }; | 86 | }; |
86 | 87 | ||
87 | struct commitinfo { | 88 | struct commitinfo { |
88 | struct commit *commit; | 89 | struct commit *commit; |
89 | char *author; | 90 | char *author; |
90 | char *author_email; | 91 | char *author_email; |
91 | unsigned long author_date; | 92 | unsigned long author_date; |
92 | char *committer; | 93 | char *committer; |
93 | char *committer_email; | 94 | char *committer_email; |
94 | unsigned long committer_date; | 95 | unsigned long committer_date; |
95 | char *subject; | 96 | char *subject; |
96 | char *msg; | 97 | char *msg; |
97 | char *msg_encoding; | 98 | char *msg_encoding; |
98 | }; | 99 | }; |
99 | 100 | ||
100 | struct taginfo { | 101 | struct taginfo { |
@@ -167,48 +168,49 @@ struct cgit_config { | |||
167 | int cache_max_create_time; | 168 | int cache_max_create_time; |
168 | int cache_repo_ttl; | 169 | int cache_repo_ttl; |
169 | int cache_root_ttl; | 170 | int cache_root_ttl; |
170 | int cache_static_ttl; | 171 | int cache_static_ttl; |
171 | int embedded; | 172 | int embedded; |
172 | int enable_index_links; | 173 | int enable_index_links; |
173 | int enable_log_filecount; | 174 | int enable_log_filecount; |
174 | int enable_log_linecount; | 175 | int enable_log_linecount; |
175 | int local_time; | 176 | int local_time; |
176 | int max_repo_count; | 177 | int max_repo_count; |
177 | int max_commit_count; | 178 | int max_commit_count; |
178 | int max_lock_attempts; | 179 | int max_lock_attempts; |
179 | int max_msg_len; | 180 | int max_msg_len; |
180 | int max_repodesc_len; | 181 | int max_repodesc_len; |
181 | int max_stats; | 182 | int max_stats; |
182 | int nocache; | 183 | int nocache; |
183 | int noplainemail; | 184 | int noplainemail; |
184 | int noheader; | 185 | int noheader; |
185 | int renamelimit; | 186 | int renamelimit; |
186 | int snapshots; | 187 | int snapshots; |
187 | int summary_branches; | 188 | int summary_branches; |
188 | int summary_log; | 189 | int summary_log; |
189 | int summary_tags; | 190 | int summary_tags; |
190 | struct string_list mimetypes; | 191 | struct string_list mimetypes; |
192 | struct cgit_filter *about_filter; | ||
191 | struct cgit_filter *commit_filter; | 193 | struct cgit_filter *commit_filter; |
192 | struct cgit_filter *source_filter; | 194 | struct cgit_filter *source_filter; |
193 | }; | 195 | }; |
194 | 196 | ||
195 | struct cgit_page { | 197 | struct cgit_page { |
196 | time_t modified; | 198 | time_t modified; |
197 | time_t expires; | 199 | time_t expires; |
198 | size_t size; | 200 | size_t size; |
199 | char *mimetype; | 201 | char *mimetype; |
200 | char *charset; | 202 | char *charset; |
201 | char *filename; | 203 | char *filename; |
202 | char *etag; | 204 | char *etag; |
203 | char *title; | 205 | char *title; |
204 | int status; | 206 | int status; |
205 | char *statusmsg; | 207 | char *statusmsg; |
206 | }; | 208 | }; |
207 | 209 | ||
208 | struct cgit_context { | 210 | struct cgit_context { |
209 | struct cgit_query qry; | 211 | struct cgit_query qry; |
210 | struct cgit_config cfg; | 212 | struct cgit_config cfg; |
211 | struct cgit_repo *repo; | 213 | struct cgit_repo *repo; |
212 | struct cgit_page page; | 214 | struct cgit_page page; |
213 | }; | 215 | }; |
214 | 216 | ||
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index dc63637..4d656fe 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -1,42 +1,49 @@ | |||
1 | CGITRC(5) | 1 | CGITRC(5) |
2 | ======== | 2 | ======== |
3 | 3 | ||
4 | 4 | ||
5 | NAME | 5 | NAME |
6 | ---- | 6 | ---- |
7 | cgitrc - runtime configuration for cgit | 7 | cgitrc - runtime configuration for cgit |
8 | 8 | ||
9 | 9 | ||
10 | SYNOPSIS | 10 | SYNOPSIS |
11 | -------- | 11 | -------- |
12 | Cgitrc contains all runtime settings for cgit, including the list of git | 12 | Cgitrc contains all runtime settings for cgit, including the list of git |
13 | repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank | 13 | repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank |
14 | lines, and lines starting with '#', are ignored. | 14 | lines, and lines starting with '#', are ignored. |
15 | 15 | ||
16 | 16 | ||
17 | GLOBAL SETTINGS | 17 | GLOBAL SETTINGS |
18 | --------------- | 18 | --------------- |
19 | about-filter:: | ||
20 | Specifies a command which will be invoked to format the content of | ||
21 | about pages (both top-level and for each repository). The command will | ||
22 | get the content of the about-file on its STDIN, and the STDOUT from the | ||
23 | command will be included verbatim on the about page. Default value: | ||
24 | none. | ||
25 | |||
19 | agefile:: | 26 | agefile:: |
20 | Specifies a path, relative to each repository path, which can be used | 27 | Specifies a path, relative to each repository path, which can be used |
21 | to specify the date and time of the youngest commit in the repository. | 28 | to specify the date and time of the youngest commit in the repository. |
22 | The first line in the file is used as input to the "parse_date" | 29 | The first line in the file is used as input to the "parse_date" |
23 | function in libgit. Recommended timestamp-format is "yyyy-mm-dd | 30 | function in libgit. Recommended timestamp-format is "yyyy-mm-dd |
24 | hh:mm:ss". Default value: "info/web/last-modified". | 31 | hh:mm:ss". Default value: "info/web/last-modified". |
25 | 32 | ||
26 | cache-root:: | 33 | cache-root:: |
27 | Path used to store the cgit cache entries. Default value: | 34 | Path used to store the cgit cache entries. Default value: |
28 | "/var/cache/cgit". | 35 | "/var/cache/cgit". |
29 | 36 | ||
30 | cache-dynamic-ttl:: | 37 | cache-dynamic-ttl:: |
31 | Number which specifies the time-to-live, in minutes, for the cached | 38 | Number which specifies the time-to-live, in minutes, for the cached |
32 | version of repository pages accessed without a fixed SHA1. Default | 39 | version of repository pages accessed without a fixed SHA1. Default |
33 | value: "5". | 40 | value: "5". |
34 | 41 | ||
35 | cache-repo-ttl:: | 42 | cache-repo-ttl:: |
36 | Number which specifies the time-to-live, in minutes, for the cached | 43 | Number which specifies the time-to-live, in minutes, for the cached |
37 | version of the repository summary page. Default value: "5". | 44 | version of the repository summary page. Default value: "5". |
38 | 45 | ||
39 | cache-root-ttl:: | 46 | cache-root-ttl:: |
40 | Number which specifies the time-to-live, in minutes, for the cached | 47 | Number which specifies the time-to-live, in minutes, for the cached |
41 | version of the repository index page. Default value: "5". | 48 | version of the repository index page. Default value: "5". |
42 | 49 | ||
@@ -221,48 +228,51 @@ source-filter:: | |||
221 | none. | 228 | none. |
222 | 229 | ||
223 | summary-branches:: | 230 | summary-branches:: |
224 | Specifies the number of branches to display in the repository "summary" | 231 | Specifies the number of branches to display in the repository "summary" |
225 | view. Default value: "10". | 232 | view. Default value: "10". |
226 | 233 | ||
227 | summary-log:: | 234 | summary-log:: |
228 | Specifies the number of log entries to display in the repository | 235 | Specifies the number of log entries to display in the repository |
229 | "summary" view. Default value: "10". | 236 | "summary" view. Default value: "10". |
230 | 237 | ||
231 | summary-tags:: | 238 | summary-tags:: |
232 | Specifies the number of tags to display in the repository "summary" | 239 | Specifies the number of tags to display in the repository "summary" |
233 | view. Default value: "10". | 240 | view. Default value: "10". |
234 | 241 | ||
235 | virtual-root:: | 242 | virtual-root:: |
236 | Url which, if specified, will be used as root for all cgit links. It | 243 | Url which, if specified, will be used as root for all cgit links. It |
237 | will also cause cgit to generate 'virtual urls', i.e. urls like | 244 | will also cause cgit to generate 'virtual urls', i.e. urls like |
238 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default | 245 | '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default |
239 | value: none. | 246 | value: none. |
240 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the | 247 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the |
241 | same kind of virtual urls, so this option will probably be deprecated. | 248 | same kind of virtual urls, so this option will probably be deprecated. |
242 | 249 | ||
243 | REPOSITORY SETTINGS | 250 | REPOSITORY SETTINGS |
244 | ------------------- | 251 | ------------------- |
252 | repo.about-filter:: | ||
253 | Override the default about-filter. Default value: <about-filter>. | ||
254 | |||
245 | repo.clone-url:: | 255 | repo.clone-url:: |
246 | A list of space-separated urls which can be used to clone this repo. | 256 | A list of space-separated urls which can be used to clone this repo. |
247 | Default value: none. | 257 | Default value: none. |
248 | 258 | ||
249 | repo.commit-filter:: | 259 | repo.commit-filter:: |
250 | Override the default commit-filter. Default value: <commit-filter>. | 260 | Override the default commit-filter. Default value: <commit-filter>. |
251 | 261 | ||
252 | repo.defbranch:: | 262 | repo.defbranch:: |
253 | The name of the default branch for this repository. If no such branch | 263 | The name of the default branch for this repository. If no such branch |
254 | exists in the repository, the first branch name (when sorted) is used | 264 | exists in the repository, the first branch name (when sorted) is used |
255 | as default instead. Default value: "master". | 265 | as default instead. Default value: "master". |
256 | 266 | ||
257 | repo.desc:: | 267 | repo.desc:: |
258 | The value to show as repository description. Default value: none. | 268 | The value to show as repository description. Default value: none. |
259 | 269 | ||
260 | repo.enable-log-filecount:: | 270 | repo.enable-log-filecount:: |
261 | A flag which can be used to disable the global setting | 271 | A flag which can be used to disable the global setting |
262 | `enable-log-filecount'. Default value: none. | 272 | `enable-log-filecount'. Default value: none. |
263 | 273 | ||
264 | repo.enable-log-linecount:: | 274 | repo.enable-log-linecount:: |
265 | A flag which can be used to disable the global setting | 275 | A flag which can be used to disable the global setting |
266 | `enable-log-linecount'. Default value: none. | 276 | `enable-log-linecount'. Default value: none. |
267 | 277 | ||
268 | repo.max-stats:: | 278 | repo.max-stats:: |
@@ -18,49 +18,49 @@ | |||
18 | #include "ui-log.h" | 18 | #include "ui-log.h" |
19 | #include "ui-patch.h" | 19 | #include "ui-patch.h" |
20 | #include "ui-plain.h" | 20 | #include "ui-plain.h" |
21 | #include "ui-refs.h" | 21 | #include "ui-refs.h" |
22 | #include "ui-repolist.h" | 22 | #include "ui-repolist.h" |
23 | #include "ui-snapshot.h" | 23 | #include "ui-snapshot.h" |
24 | #include "ui-stats.h" | 24 | #include "ui-stats.h" |
25 | #include "ui-summary.h" | 25 | #include "ui-summary.h" |
26 | #include "ui-tag.h" | 26 | #include "ui-tag.h" |
27 | #include "ui-tree.h" | 27 | #include "ui-tree.h" |
28 | 28 | ||
29 | static void HEAD_fn(struct cgit_context *ctx) | 29 | static void HEAD_fn(struct cgit_context *ctx) |
30 | { | 30 | { |
31 | cgit_clone_head(ctx); | 31 | cgit_clone_head(ctx); |
32 | } | 32 | } |
33 | 33 | ||
34 | static void atom_fn(struct cgit_context *ctx) | 34 | static void atom_fn(struct cgit_context *ctx) |
35 | { | 35 | { |
36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | 36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void about_fn(struct cgit_context *ctx) | 39 | static void about_fn(struct cgit_context *ctx) |
40 | { | 40 | { |
41 | if (ctx->repo) | 41 | if (ctx->repo) |
42 | cgit_print_repo_readme(); | 42 | cgit_print_repo_readme(ctx->qry.path); |
43 | else | 43 | else |
44 | cgit_print_site_readme(); | 44 | cgit_print_site_readme(); |
45 | } | 45 | } |
46 | 46 | ||
47 | static void blob_fn(struct cgit_context *ctx) | 47 | static void blob_fn(struct cgit_context *ctx) |
48 | { | 48 | { |
49 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); | 49 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); |
50 | } | 50 | } |
51 | 51 | ||
52 | static void commit_fn(struct cgit_context *ctx) | 52 | static void commit_fn(struct cgit_context *ctx) |
53 | { | 53 | { |
54 | cgit_print_commit(ctx->qry.sha1); | 54 | cgit_print_commit(ctx->qry.sha1); |
55 | } | 55 | } |
56 | 56 | ||
57 | static void diff_fn(struct cgit_context *ctx) | 57 | static void diff_fn(struct cgit_context *ctx) |
58 | { | 58 | { |
59 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 59 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
60 | } | 60 | } |
61 | 61 | ||
62 | static void info_fn(struct cgit_context *ctx) | 62 | static void info_fn(struct cgit_context *ctx) |
63 | { | 63 | { |
64 | cgit_clone_info(ctx); | 64 | cgit_clone_info(ctx); |
65 | } | 65 | } |
66 | 66 | ||
@@ -41,48 +41,49 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
41 | if (cgit_repolist.length == 0) | 41 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; | 42 | cgit_repolist.length = 8; |
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 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 52 | ret->name = ret->url; |
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; | 56 | ret->group = ctx.cfg.repo_group; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->max_stats = ctx.cfg.max_stats; | 61 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->module_link = ctx.cfg.module_link; | 62 | ret->module_link = ctx.cfg.module_link; |
63 | ret->readme = NULL; | 63 | ret->readme = NULL; |
64 | ret->mtime = -1; | 64 | ret->mtime = -1; |
65 | ret->about_filter = ctx.cfg.about_filter; | ||
65 | ret->commit_filter = ctx.cfg.commit_filter; | 66 | ret->commit_filter = ctx.cfg.commit_filter; |
66 | ret->source_filter = ctx.cfg.source_filter; | 67 | ret->source_filter = ctx.cfg.source_filter; |
67 | return ret; | 68 | return ret; |
68 | } | 69 | } |
69 | 70 | ||
70 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 71 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
71 | { | 72 | { |
72 | int i; | 73 | int i; |
73 | struct cgit_repo *repo; | 74 | struct cgit_repo *repo; |
74 | 75 | ||
75 | for (i=0; i<cgit_repolist.count; i++) { | 76 | for (i=0; i<cgit_repolist.count; i++) { |
76 | repo = &cgit_repolist.repos[i]; | 77 | repo = &cgit_repolist.repos[i]; |
77 | if (!strcmp(repo->url, url)) | 78 | if (!strcmp(repo->url, url)) |
78 | return repo; | 79 | return repo; |
79 | } | 80 | } |
80 | return NULL; | 81 | return NULL; |
81 | } | 82 | } |
82 | 83 | ||
83 | void *cgit_free_commitinfo(struct commitinfo *info) | 84 | void *cgit_free_commitinfo(struct commitinfo *info) |
84 | { | 85 | { |
85 | free(info->author); | 86 | free(info->author); |
86 | free(info->author_email); | 87 | free(info->author_email); |
87 | free(info->committer); | 88 | free(info->committer); |
88 | free(info->committer_email); | 89 | free(info->committer_email); |
diff --git a/ui-repolist.c b/ui-repolist.c index 2c13d50..25f076f 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -252,27 +252,32 @@ void cgit_print_repolist() | |||
252 | html_txt(ctx.repo->owner); | 252 | html_txt(ctx.repo->owner); |
253 | html("</td><td>"); | 253 | html("</td><td>"); |
254 | print_modtime(ctx.repo); | 254 | print_modtime(ctx.repo); |
255 | html("</td>"); | 255 | html("</td>"); |
256 | if (ctx.cfg.enable_index_links) { | 256 | if (ctx.cfg.enable_index_links) { |
257 | html("<td>"); | 257 | html("<td>"); |
258 | cgit_summary_link("summary", NULL, "button", NULL); | 258 | cgit_summary_link("summary", NULL, "button", NULL); |
259 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, | 259 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, |
260 | 0, NULL, NULL, ctx.qry.showmsg); | 260 | 0, NULL, NULL, ctx.qry.showmsg); |
261 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); | 261 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); |
262 | html("</td>"); | 262 | html("</td>"); |
263 | } | 263 | } |
264 | html("</tr>\n"); | 264 | html("</tr>\n"); |
265 | } | 265 | } |
266 | html("</table>"); | 266 | html("</table>"); |
267 | if (!hits) | 267 | if (!hits) |
268 | cgit_print_error("No repositories found"); | 268 | cgit_print_error("No repositories found"); |
269 | else if (hits > ctx.cfg.max_repo_count) | 269 | else if (hits > ctx.cfg.max_repo_count) |
270 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); | 270 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); |
271 | cgit_print_docend(); | 271 | cgit_print_docend(); |
272 | } | 272 | } |
273 | 273 | ||
274 | void cgit_print_site_readme() | 274 | void cgit_print_site_readme() |
275 | { | 275 | { |
276 | if (ctx.cfg.root_readme) | 276 | if (!ctx.cfg.root_readme) |
277 | html_include(ctx.cfg.root_readme); | 277 | return; |
278 | if (ctx.cfg.about_filter) | ||
279 | cgit_open_filter(ctx.cfg.about_filter); | ||
280 | html_include(ctx.cfg.root_readme); | ||
281 | if (ctx.cfg.about_filter) | ||
282 | cgit_close_filter(ctx.cfg.about_filter); | ||
278 | } | 283 | } |
diff --git a/ui-summary.c b/ui-summary.c index ede4a62..a2c018e 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -45,32 +45,48 @@ static void print_urls(char *txt, char *suffix) | |||
45 | print_url(h, suffix); | 45 | print_url(h, suffix); |
46 | *t = c; | 46 | *t = c; |
47 | h = t; | 47 | h = t; |
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | void cgit_print_summary() | 51 | void cgit_print_summary() |
52 | { | 52 | { |
53 | html("<table summary='repository info' class='list nowrap'>"); | 53 | html("<table summary='repository info' class='list nowrap'>"); |
54 | cgit_print_branches(ctx.cfg.summary_branches); | 54 | cgit_print_branches(ctx.cfg.summary_branches); |
55 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 55 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
56 | cgit_print_tags(ctx.cfg.summary_tags); | 56 | cgit_print_tags(ctx.cfg.summary_tags); |
57 | if (ctx.cfg.summary_log > 0) { | 57 | if (ctx.cfg.summary_log > 0) { |
58 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 58 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
59 | cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, | 59 | cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, |
60 | NULL, NULL, 0); | 60 | NULL, NULL, 0); |
61 | } | 61 | } |
62 | if (ctx.repo->clone_url) | 62 | if (ctx.repo->clone_url) |
63 | print_urls(ctx.repo->clone_url, NULL); | 63 | print_urls(ctx.repo->clone_url, NULL); |
64 | else if (ctx.cfg.clone_prefix) | 64 | else if (ctx.cfg.clone_prefix) |
65 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); | 65 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); |
66 | html("</table>"); | 66 | html("</table>"); |
67 | } | 67 | } |
68 | 68 | ||
69 | void cgit_print_repo_readme() | 69 | void cgit_print_repo_readme(char *path) |
70 | { | 70 | { |
71 | if (ctx.repo->readme) { | 71 | char *slash, *tmp; |
72 | html("<div id='summary'>"); | 72 | |
73 | html_include(ctx.repo->readme); | 73 | if (!ctx.repo->readme) |
74 | html("</div>"); | 74 | return; |
75 | } | 75 | |
76 | if (path) { | ||
77 | slash = strrchr(ctx.repo->readme, '/'); | ||
78 | if (!slash) | ||
79 | return; | ||
80 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); | ||
81 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); | ||
82 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); | ||
83 | } else | ||
84 | tmp = ctx.repo->readme; | ||
85 | html("<div id='summary'>"); | ||
86 | if (ctx.repo->about_filter) | ||
87 | cgit_open_filter(ctx.repo->about_filter); | ||
88 | html_include(tmp); | ||
89 | if (ctx.repo->about_filter) | ||
90 | cgit_close_filter(ctx.repo->about_filter); | ||
91 | html("</div>"); | ||
76 | } | 92 | } |
diff --git a/ui-summary.h b/ui-summary.h index 3e13039..c01f560 100644 --- a/ui-summary.h +++ b/ui-summary.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef UI_SUMMARY_H | 1 | #ifndef UI_SUMMARY_H |
2 | #define UI_SUMMARY_H | 2 | #define UI_SUMMARY_H |
3 | 3 | ||
4 | extern void cgit_print_summary(); | 4 | extern void cgit_print_summary(); |
5 | extern void cgit_print_repo_readme(); | 5 | extern void cgit_print_repo_readme(char *path); |
6 | 6 | ||
7 | #endif /* UI_SUMMARY_H */ | 7 | #endif /* UI_SUMMARY_H */ |