author | Lars Hjemli <hjemli@gmail.com> | 2009-07-31 15:42:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-31 15:42:57 (UTC) |
commit | f35db1cd2b75aac6952aa07713e44ca01fd89727 (patch) (unidiff) | |
tree | affc8325bf67ae51044c809c0b693cbe55dd097a | |
parent | 46b7abed99e957008c01c02cf612aa526ba92f04 (diff) | |
download | cgit-f35db1cd2b75aac6952aa07713e44ca01fd89727.zip cgit-f35db1cd2b75aac6952aa07713e44ca01fd89727.tar.gz cgit-f35db1cd2b75aac6952aa07713e44ca01fd89727.tar.bz2 |
ui-commit: add support for 'commit-filter' option
This new option specifies a filter which is executed on the commit
message, i.e. the commit message is written to the filters STDIN and
the filters STDOUT is included verbatim as the commit message.
This can be used to implement commit linking by creating a simple
shell script in e.g. /usr/bin/cgit-commit-filter.sh like this:
#/bin/sh
sed -re 's|\b([0-9a-fA-F]{6,40})\b|<a href="./?id=\1">\1</a>|g'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc.5.txt | 6 | ||||
-rw-r--r-- | ui-commit.c | 8 |
4 files changed, 17 insertions, 0 deletions
@@ -29,128 +29,130 @@ struct cgit_filter *new_filter(const char *cmd, int extra_args) | |||
29 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); | 29 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
30 | f->argv[0] = f->cmd; | 30 | f->argv[0] = f->cmd; |
31 | f->argv[1] = NULL; | 31 | f->argv[1] = NULL; |
32 | return f; | 32 | return f; |
33 | } | 33 | } |
34 | 34 | ||
35 | void config_cb(const char *name, const char *value) | 35 | void config_cb(const char *name, const char *value) |
36 | { | 36 | { |
37 | if (!strcmp(name, "root-title")) | 37 | if (!strcmp(name, "root-title")) |
38 | ctx.cfg.root_title = xstrdup(value); | 38 | ctx.cfg.root_title = xstrdup(value); |
39 | else if (!strcmp(name, "root-desc")) | 39 | else if (!strcmp(name, "root-desc")) |
40 | ctx.cfg.root_desc = xstrdup(value); | 40 | ctx.cfg.root_desc = xstrdup(value); |
41 | else if (!strcmp(name, "root-readme")) | 41 | else if (!strcmp(name, "root-readme")) |
42 | ctx.cfg.root_readme = xstrdup(value); | 42 | ctx.cfg.root_readme = xstrdup(value); |
43 | else if (!strcmp(name, "css")) | 43 | else if (!strcmp(name, "css")) |
44 | ctx.cfg.css = xstrdup(value); | 44 | ctx.cfg.css = xstrdup(value); |
45 | else if (!strcmp(name, "favicon")) | 45 | else if (!strcmp(name, "favicon")) |
46 | ctx.cfg.favicon = xstrdup(value); | 46 | ctx.cfg.favicon = xstrdup(value); |
47 | else if (!strcmp(name, "footer")) | 47 | else if (!strcmp(name, "footer")) |
48 | ctx.cfg.footer = xstrdup(value); | 48 | ctx.cfg.footer = xstrdup(value); |
49 | else if (!strcmp(name, "head-include")) | 49 | else if (!strcmp(name, "head-include")) |
50 | ctx.cfg.head_include = xstrdup(value); | 50 | ctx.cfg.head_include = xstrdup(value); |
51 | else if (!strcmp(name, "header")) | 51 | else if (!strcmp(name, "header")) |
52 | ctx.cfg.header = xstrdup(value); | 52 | ctx.cfg.header = xstrdup(value); |
53 | else if (!strcmp(name, "logo")) | 53 | else if (!strcmp(name, "logo")) |
54 | ctx.cfg.logo = xstrdup(value); | 54 | ctx.cfg.logo = xstrdup(value); |
55 | else if (!strcmp(name, "index-header")) | 55 | else if (!strcmp(name, "index-header")) |
56 | ctx.cfg.index_header = xstrdup(value); | 56 | ctx.cfg.index_header = xstrdup(value); |
57 | else if (!strcmp(name, "index-info")) | 57 | else if (!strcmp(name, "index-info")) |
58 | ctx.cfg.index_info = xstrdup(value); | 58 | ctx.cfg.index_info = xstrdup(value); |
59 | else if (!strcmp(name, "logo-link")) | 59 | else if (!strcmp(name, "logo-link")) |
60 | ctx.cfg.logo_link = xstrdup(value); | 60 | ctx.cfg.logo_link = xstrdup(value); |
61 | else if (!strcmp(name, "module-link")) | 61 | else if (!strcmp(name, "module-link")) |
62 | ctx.cfg.module_link = xstrdup(value); | 62 | ctx.cfg.module_link = xstrdup(value); |
63 | else if (!strcmp(name, "virtual-root")) { | 63 | else if (!strcmp(name, "virtual-root")) { |
64 | ctx.cfg.virtual_root = trim_end(value, '/'); | 64 | ctx.cfg.virtual_root = trim_end(value, '/'); |
65 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 65 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
66 | ctx.cfg.virtual_root = ""; | 66 | ctx.cfg.virtual_root = ""; |
67 | } else if (!strcmp(name, "nocache")) | 67 | } else if (!strcmp(name, "nocache")) |
68 | ctx.cfg.nocache = atoi(value); | 68 | ctx.cfg.nocache = atoi(value); |
69 | else if (!strcmp(name, "noheader")) | 69 | else if (!strcmp(name, "noheader")) |
70 | ctx.cfg.noheader = atoi(value); | 70 | ctx.cfg.noheader = atoi(value); |
71 | else if (!strcmp(name, "snapshots")) | 71 | else if (!strcmp(name, "snapshots")) |
72 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 72 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
73 | else if (!strcmp(name, "enable-index-links")) | 73 | else if (!strcmp(name, "enable-index-links")) |
74 | ctx.cfg.enable_index_links = atoi(value); | 74 | ctx.cfg.enable_index_links = atoi(value); |
75 | else if (!strcmp(name, "enable-log-filecount")) | 75 | else if (!strcmp(name, "enable-log-filecount")) |
76 | ctx.cfg.enable_log_filecount = atoi(value); | 76 | ctx.cfg.enable_log_filecount = atoi(value); |
77 | else if (!strcmp(name, "enable-log-linecount")) | 77 | else if (!strcmp(name, "enable-log-linecount")) |
78 | ctx.cfg.enable_log_linecount = atoi(value); | 78 | ctx.cfg.enable_log_linecount = atoi(value); |
79 | else if (!strcmp(name, "max-stats")) | 79 | else if (!strcmp(name, "max-stats")) |
80 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 80 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
81 | else if (!strcmp(name, "cache-size")) | 81 | else if (!strcmp(name, "cache-size")) |
82 | ctx.cfg.cache_size = atoi(value); | 82 | ctx.cfg.cache_size = atoi(value); |
83 | else if (!strcmp(name, "cache-root")) | 83 | else if (!strcmp(name, "cache-root")) |
84 | ctx.cfg.cache_root = xstrdup(value); | 84 | ctx.cfg.cache_root = xstrdup(value); |
85 | else if (!strcmp(name, "cache-root-ttl")) | 85 | else if (!strcmp(name, "cache-root-ttl")) |
86 | ctx.cfg.cache_root_ttl = atoi(value); | 86 | ctx.cfg.cache_root_ttl = atoi(value); |
87 | else if (!strcmp(name, "cache-repo-ttl")) | 87 | else if (!strcmp(name, "cache-repo-ttl")) |
88 | ctx.cfg.cache_repo_ttl = atoi(value); | 88 | ctx.cfg.cache_repo_ttl = atoi(value); |
89 | else if (!strcmp(name, "cache-static-ttl")) | 89 | else if (!strcmp(name, "cache-static-ttl")) |
90 | ctx.cfg.cache_static_ttl = atoi(value); | 90 | ctx.cfg.cache_static_ttl = atoi(value); |
91 | else if (!strcmp(name, "cache-dynamic-ttl")) | 91 | else if (!strcmp(name, "cache-dynamic-ttl")) |
92 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 92 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
93 | else if (!strcmp(name, "commit-filter")) | ||
94 | ctx.cfg.commit_filter = new_filter(value, 0); | ||
93 | else if (!strcmp(name, "embedded")) | 95 | else if (!strcmp(name, "embedded")) |
94 | ctx.cfg.embedded = atoi(value); | 96 | ctx.cfg.embedded = atoi(value); |
95 | else if (!strcmp(name, "max-message-length")) | 97 | else if (!strcmp(name, "max-message-length")) |
96 | ctx.cfg.max_msg_len = atoi(value); | 98 | ctx.cfg.max_msg_len = atoi(value); |
97 | else if (!strcmp(name, "max-repodesc-length")) | 99 | else if (!strcmp(name, "max-repodesc-length")) |
98 | ctx.cfg.max_repodesc_len = atoi(value); | 100 | ctx.cfg.max_repodesc_len = atoi(value); |
99 | else if (!strcmp(name, "max-repo-count")) | 101 | else if (!strcmp(name, "max-repo-count")) |
100 | ctx.cfg.max_repo_count = atoi(value); | 102 | ctx.cfg.max_repo_count = atoi(value); |
101 | else if (!strcmp(name, "max-commit-count")) | 103 | else if (!strcmp(name, "max-commit-count")) |
102 | ctx.cfg.max_commit_count = atoi(value); | 104 | ctx.cfg.max_commit_count = atoi(value); |
103 | else if (!strcmp(name, "source-filter")) | 105 | else if (!strcmp(name, "source-filter")) |
104 | ctx.cfg.source_filter = new_filter(value, 1); | 106 | ctx.cfg.source_filter = new_filter(value, 1); |
105 | else if (!strcmp(name, "summary-log")) | 107 | else if (!strcmp(name, "summary-log")) |
106 | ctx.cfg.summary_log = atoi(value); | 108 | ctx.cfg.summary_log = atoi(value); |
107 | else if (!strcmp(name, "summary-branches")) | 109 | else if (!strcmp(name, "summary-branches")) |
108 | ctx.cfg.summary_branches = atoi(value); | 110 | ctx.cfg.summary_branches = atoi(value); |
109 | else if (!strcmp(name, "summary-tags")) | 111 | else if (!strcmp(name, "summary-tags")) |
110 | ctx.cfg.summary_tags = atoi(value); | 112 | ctx.cfg.summary_tags = atoi(value); |
111 | else if (!strcmp(name, "agefile")) | 113 | else if (!strcmp(name, "agefile")) |
112 | ctx.cfg.agefile = xstrdup(value); | 114 | ctx.cfg.agefile = xstrdup(value); |
113 | else if (!strcmp(name, "renamelimit")) | 115 | else if (!strcmp(name, "renamelimit")) |
114 | ctx.cfg.renamelimit = atoi(value); | 116 | ctx.cfg.renamelimit = atoi(value); |
115 | else if (!strcmp(name, "robots")) | 117 | else if (!strcmp(name, "robots")) |
116 | ctx.cfg.robots = xstrdup(value); | 118 | ctx.cfg.robots = xstrdup(value); |
117 | else if (!strcmp(name, "clone-prefix")) | 119 | else if (!strcmp(name, "clone-prefix")) |
118 | ctx.cfg.clone_prefix = xstrdup(value); | 120 | ctx.cfg.clone_prefix = xstrdup(value); |
119 | else if (!strcmp(name, "local-time")) | 121 | else if (!strcmp(name, "local-time")) |
120 | ctx.cfg.local_time = atoi(value); | 122 | ctx.cfg.local_time = atoi(value); |
121 | else if (!strcmp(name, "repo.group")) | 123 | else if (!strcmp(name, "repo.group")) |
122 | ctx.cfg.repo_group = xstrdup(value); | 124 | ctx.cfg.repo_group = xstrdup(value); |
123 | else if (!strcmp(name, "repo.url")) | 125 | else if (!strcmp(name, "repo.url")) |
124 | ctx.repo = cgit_add_repo(value); | 126 | ctx.repo = cgit_add_repo(value); |
125 | else if (!strcmp(name, "repo.name")) | 127 | else if (!strcmp(name, "repo.name")) |
126 | ctx.repo->name = xstrdup(value); | 128 | ctx.repo->name = xstrdup(value); |
127 | else if (ctx.repo && !strcmp(name, "repo.path")) | 129 | else if (ctx.repo && !strcmp(name, "repo.path")) |
128 | ctx.repo->path = trim_end(value, '/'); | 130 | ctx.repo->path = trim_end(value, '/'); |
129 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 131 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
130 | ctx.repo->clone_url = xstrdup(value); | 132 | ctx.repo->clone_url = xstrdup(value); |
131 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 133 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
132 | ctx.repo->desc = xstrdup(value); | 134 | ctx.repo->desc = xstrdup(value); |
133 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 135 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
134 | ctx.repo->owner = xstrdup(value); | 136 | ctx.repo->owner = xstrdup(value); |
135 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 137 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
136 | ctx.repo->defbranch = xstrdup(value); | 138 | ctx.repo->defbranch = xstrdup(value); |
137 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 139 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
138 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 140 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
139 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 141 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
140 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 142 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
141 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 143 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
142 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 144 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
143 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 145 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
144 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 146 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
145 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 147 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
146 | ctx.repo->module_link= xstrdup(value); | 148 | ctx.repo->module_link= xstrdup(value); |
147 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 149 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
148 | if (*value == '/') | 150 | if (*value == '/') |
149 | ctx.repo->readme = xstrdup(value); | 151 | ctx.repo->readme = xstrdup(value); |
150 | else | 152 | else |
151 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 153 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
152 | } else if (!strcmp(name, "include")) | 154 | } else if (!strcmp(name, "include")) |
153 | parse_configfile(value, config_cb); | 155 | parse_configfile(value, config_cb); |
154 | } | 156 | } |
155 | 157 | ||
156 | static void querystring_cb(const char *name, const char *value) | 158 | static void querystring_cb(const char *name, const char *value) |
@@ -122,128 +122,129 @@ struct cgit_query { | |||
122 | char *name; | 122 | char *name; |
123 | char *mimetype; | 123 | char *mimetype; |
124 | char *url; | 124 | char *url; |
125 | char *period; | 125 | char *period; |
126 | int ofs; | 126 | int ofs; |
127 | int nohead; | 127 | int nohead; |
128 | char *sort; | 128 | char *sort; |
129 | int showmsg; | 129 | int showmsg; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | struct cgit_filter { | 132 | struct cgit_filter { |
133 | char *cmd; | 133 | char *cmd; |
134 | char **argv; | 134 | char **argv; |
135 | int old_stdout; | 135 | int old_stdout; |
136 | int pipe_fh[2]; | 136 | int pipe_fh[2]; |
137 | int pid; | 137 | int pid; |
138 | int exitstatus; | 138 | int exitstatus; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | struct cgit_config { | 141 | struct cgit_config { |
142 | char *agefile; | 142 | char *agefile; |
143 | char *cache_root; | 143 | char *cache_root; |
144 | char *clone_prefix; | 144 | char *clone_prefix; |
145 | char *css; | 145 | char *css; |
146 | char *favicon; | 146 | char *favicon; |
147 | char *footer; | 147 | char *footer; |
148 | char *head_include; | 148 | char *head_include; |
149 | char *header; | 149 | char *header; |
150 | char *index_header; | 150 | char *index_header; |
151 | char *index_info; | 151 | char *index_info; |
152 | char *logo; | 152 | char *logo; |
153 | char *logo_link; | 153 | char *logo_link; |
154 | char *module_link; | 154 | char *module_link; |
155 | char *repo_group; | 155 | char *repo_group; |
156 | char *robots; | 156 | char *robots; |
157 | char *root_title; | 157 | char *root_title; |
158 | char *root_desc; | 158 | char *root_desc; |
159 | char *root_readme; | 159 | char *root_readme; |
160 | char *script_name; | 160 | char *script_name; |
161 | char *virtual_root; | 161 | char *virtual_root; |
162 | int cache_size; | 162 | int cache_size; |
163 | int cache_dynamic_ttl; | 163 | int cache_dynamic_ttl; |
164 | int cache_max_create_time; | 164 | int cache_max_create_time; |
165 | int cache_repo_ttl; | 165 | int cache_repo_ttl; |
166 | int cache_root_ttl; | 166 | int cache_root_ttl; |
167 | int cache_static_ttl; | 167 | int cache_static_ttl; |
168 | int embedded; | 168 | int embedded; |
169 | int enable_index_links; | 169 | int enable_index_links; |
170 | int enable_log_filecount; | 170 | int enable_log_filecount; |
171 | int enable_log_linecount; | 171 | int enable_log_linecount; |
172 | int local_time; | 172 | int local_time; |
173 | int max_repo_count; | 173 | int max_repo_count; |
174 | int max_commit_count; | 174 | int max_commit_count; |
175 | int max_lock_attempts; | 175 | int max_lock_attempts; |
176 | int max_msg_len; | 176 | int max_msg_len; |
177 | int max_repodesc_len; | 177 | int max_repodesc_len; |
178 | int max_stats; | 178 | int max_stats; |
179 | int nocache; | 179 | int nocache; |
180 | int noheader; | 180 | int noheader; |
181 | int renamelimit; | 181 | int renamelimit; |
182 | int snapshots; | 182 | int snapshots; |
183 | int summary_branches; | 183 | int summary_branches; |
184 | int summary_log; | 184 | int summary_log; |
185 | int summary_tags; | 185 | int summary_tags; |
186 | struct cgit_filter *commit_filter; | ||
186 | struct cgit_filter *source_filter; | 187 | struct cgit_filter *source_filter; |
187 | }; | 188 | }; |
188 | 189 | ||
189 | struct cgit_page { | 190 | struct cgit_page { |
190 | time_t modified; | 191 | time_t modified; |
191 | time_t expires; | 192 | time_t expires; |
192 | size_t size; | 193 | size_t size; |
193 | char *mimetype; | 194 | char *mimetype; |
194 | char *charset; | 195 | char *charset; |
195 | char *filename; | 196 | char *filename; |
196 | char *etag; | 197 | char *etag; |
197 | char *title; | 198 | char *title; |
198 | int status; | 199 | int status; |
199 | char *statusmsg; | 200 | char *statusmsg; |
200 | }; | 201 | }; |
201 | 202 | ||
202 | struct cgit_context { | 203 | struct cgit_context { |
203 | struct cgit_query qry; | 204 | struct cgit_query qry; |
204 | struct cgit_config cfg; | 205 | struct cgit_config cfg; |
205 | struct cgit_repo *repo; | 206 | struct cgit_repo *repo; |
206 | struct cgit_page page; | 207 | struct cgit_page page; |
207 | }; | 208 | }; |
208 | 209 | ||
209 | struct cgit_snapshot_format { | 210 | struct cgit_snapshot_format { |
210 | const char *suffix; | 211 | const char *suffix; |
211 | const char *mimetype; | 212 | const char *mimetype; |
212 | write_archive_fn_t write_func; | 213 | write_archive_fn_t write_func; |
213 | int bit; | 214 | int bit; |
214 | }; | 215 | }; |
215 | 216 | ||
216 | extern const char *cgit_version; | 217 | extern const char *cgit_version; |
217 | 218 | ||
218 | extern struct cgit_repolist cgit_repolist; | 219 | extern struct cgit_repolist cgit_repolist; |
219 | extern struct cgit_context ctx; | 220 | extern struct cgit_context ctx; |
220 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 221 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
221 | 222 | ||
222 | extern struct cgit_repo *cgit_add_repo(const char *url); | 223 | extern struct cgit_repo *cgit_add_repo(const char *url); |
223 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 224 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
224 | extern void cgit_repo_config_cb(const char *name, const char *value); | 225 | extern void cgit_repo_config_cb(const char *name, const char *value); |
225 | 226 | ||
226 | extern int chk_zero(int result, char *msg); | 227 | extern int chk_zero(int result, char *msg); |
227 | extern int chk_positive(int result, char *msg); | 228 | extern int chk_positive(int result, char *msg); |
228 | extern int chk_non_negative(int result, char *msg); | 229 | extern int chk_non_negative(int result, char *msg); |
229 | 230 | ||
230 | extern char *trim_end(const char *str, char c); | 231 | extern char *trim_end(const char *str, char c); |
231 | extern char *strlpart(char *txt, int maxlen); | 232 | extern char *strlpart(char *txt, int maxlen); |
232 | extern char *strrpart(char *txt, int maxlen); | 233 | extern char *strrpart(char *txt, int maxlen); |
233 | 234 | ||
234 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 235 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
235 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 236 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
236 | int flags, void *cb_data); | 237 | int flags, void *cb_data); |
237 | 238 | ||
238 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 239 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
239 | 240 | ||
240 | extern int cgit_diff_files(const unsigned char *old_sha1, | 241 | extern int cgit_diff_files(const unsigned char *old_sha1, |
241 | const unsigned char *new_sha1, | 242 | const unsigned char *new_sha1, |
242 | unsigned long *old_size, unsigned long *new_size, | 243 | unsigned long *old_size, unsigned long *new_size, |
243 | int *binary, linediff_fn fn); | 244 | int *binary, linediff_fn fn); |
244 | 245 | ||
245 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 246 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
246 | const unsigned char *new_sha1, | 247 | const unsigned char *new_sha1, |
247 | filepair_fn fn, const char *prefix); | 248 | filepair_fn fn, const char *prefix); |
248 | 249 | ||
249 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 250 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index d420ad4..2efd6aa 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -1,121 +1,127 @@ | |||
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 | agefile:: | 19 | agefile:: |
20 | Specifies a path, relative to each repository path, which can be used | 20 | 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. | 21 | 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" | 22 | 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 | 23 | function in libgit. Recommended timestamp-format is "yyyy-mm-dd |
24 | hh:mm:ss". Default value: "info/web/last-modified". | 24 | hh:mm:ss". Default value: "info/web/last-modified". |
25 | 25 | ||
26 | cache-root:: | 26 | cache-root:: |
27 | Path used to store the cgit cache entries. Default value: | 27 | Path used to store the cgit cache entries. Default value: |
28 | "/var/cache/cgit". | 28 | "/var/cache/cgit". |
29 | 29 | ||
30 | cache-dynamic-ttl:: | 30 | cache-dynamic-ttl:: |
31 | Number which specifies the time-to-live, in minutes, for the cached | 31 | Number which specifies the time-to-live, in minutes, for the cached |
32 | version of repository pages accessed without a fixed SHA1. Default | 32 | version of repository pages accessed without a fixed SHA1. Default |
33 | value: "5". | 33 | value: "5". |
34 | 34 | ||
35 | cache-repo-ttl:: | 35 | cache-repo-ttl:: |
36 | Number which specifies the time-to-live, in minutes, for the cached | 36 | Number which specifies the time-to-live, in minutes, for the cached |
37 | version of the repository summary page. Default value: "5". | 37 | version of the repository summary page. Default value: "5". |
38 | 38 | ||
39 | cache-root-ttl:: | 39 | cache-root-ttl:: |
40 | Number which specifies the time-to-live, in minutes, for the cached | 40 | Number which specifies the time-to-live, in minutes, for the cached |
41 | version of the repository index page. Default value: "5". | 41 | version of the repository index page. Default value: "5". |
42 | 42 | ||
43 | cache-size:: | 43 | cache-size:: |
44 | The maximum number of entries in the cgit cache. Default value: "0" | 44 | The maximum number of entries in the cgit cache. Default value: "0" |
45 | (i.e. caching is disabled). | 45 | (i.e. caching is disabled). |
46 | 46 | ||
47 | cache-static-ttl:: | 47 | cache-static-ttl:: |
48 | Number which specifies the time-to-live, in minutes, for the cached | 48 | Number which specifies the time-to-live, in minutes, for the cached |
49 | version of repository pages accessed with a fixed SHA1. Default value: | 49 | version of repository pages accessed with a fixed SHA1. Default value: |
50 | "5". | 50 | "5". |
51 | 51 | ||
52 | clone-prefix:: | 52 | clone-prefix:: |
53 | Space-separated list of common prefixes which, when combined with a | 53 | Space-separated list of common prefixes which, when combined with a |
54 | repository url, generates valid clone urls for the repository. This | 54 | repository url, generates valid clone urls for the repository. This |
55 | setting is only used if `repo.clone-url` is unspecified. Default value: | 55 | setting is only used if `repo.clone-url` is unspecified. Default value: |
56 | none. | 56 | none. |
57 | 57 | ||
58 | commit-filter:: | ||
59 | Specifies a command which will be invoked to format commit messages. | ||
60 | The command will get the message on its STDIN, and the STDOUT from the | ||
61 | command will be included verbatim as the commit message, i.e. this can | ||
62 | be used to implement bugtracker integration. Default value: none. | ||
63 | |||
58 | css:: | 64 | css:: |
59 | Url which specifies the css document to include in all cgit pages. | 65 | Url which specifies the css document to include in all cgit pages. |
60 | Default value: "/cgit.css". | 66 | Default value: "/cgit.css". |
61 | 67 | ||
62 | embedded:: | 68 | embedded:: |
63 | Flag which, when set to "1", will make cgit generate a html fragment | 69 | Flag which, when set to "1", will make cgit generate a html fragment |
64 | suitable for embedding in other html pages. Default value: none. See | 70 | suitable for embedding in other html pages. Default value: none. See |
65 | also: "noheader". | 71 | also: "noheader". |
66 | 72 | ||
67 | enable-index-links:: | 73 | enable-index-links:: |
68 | Flag which, when set to "1", will make cgit generate extra links for | 74 | Flag which, when set to "1", will make cgit generate extra links for |
69 | each repo in the repository index (specifically, to the "summary", | 75 | each repo in the repository index (specifically, to the "summary", |
70 | "commit" and "tree" pages). Default value: "0". | 76 | "commit" and "tree" pages). Default value: "0". |
71 | 77 | ||
72 | enable-log-filecount:: | 78 | enable-log-filecount:: |
73 | Flag which, when set to "1", will make cgit print the number of | 79 | Flag which, when set to "1", will make cgit print the number of |
74 | modified files for each commit on the repository log page. Default | 80 | modified files for each commit on the repository log page. Default |
75 | value: "0". | 81 | value: "0". |
76 | 82 | ||
77 | enable-log-linecount:: | 83 | enable-log-linecount:: |
78 | Flag which, when set to "1", will make cgit print the number of added | 84 | Flag which, when set to "1", will make cgit print the number of added |
79 | and removed lines for each commit on the repository log page. Default | 85 | and removed lines for each commit on the repository log page. Default |
80 | value: "0". | 86 | value: "0". |
81 | 87 | ||
82 | favicon:: | 88 | favicon:: |
83 | Url used as link to a shortcut icon for cgit. If specified, it is | 89 | Url used as link to a shortcut icon for cgit. If specified, it is |
84 | suggested to use the value "/favicon.ico" since certain browsers will | 90 | suggested to use the value "/favicon.ico" since certain browsers will |
85 | ignore other values. Default value: none. | 91 | ignore other values. Default value: none. |
86 | 92 | ||
87 | footer:: | 93 | footer:: |
88 | The content of the file specified with this option will be included | 94 | The content of the file specified with this option will be included |
89 | verbatim at the bottom of all pages (i.e. it replaces the standard | 95 | verbatim at the bottom of all pages (i.e. it replaces the standard |
90 | "generated by..." message. Default value: none. | 96 | "generated by..." message. Default value: none. |
91 | 97 | ||
92 | head-include:: | 98 | head-include:: |
93 | The content of the file specified with this option will be included | 99 | The content of the file specified with this option will be included |
94 | verbatim in the html HEAD section on all pages. Default value: none. | 100 | verbatim in the html HEAD section on all pages. Default value: none. |
95 | 101 | ||
96 | header:: | 102 | header:: |
97 | The content of the file specified with this option will be included | 103 | The content of the file specified with this option will be included |
98 | verbatim at the top of all pages. Default value: none. | 104 | verbatim at the top of all pages. Default value: none. |
99 | 105 | ||
100 | include:: | 106 | include:: |
101 | Name of a configfile to include before the rest of the current config- | 107 | Name of a configfile to include before the rest of the current config- |
102 | file is parsed. Default value: none. | 108 | file is parsed. Default value: none. |
103 | 109 | ||
104 | index-header:: | 110 | index-header:: |
105 | The content of the file specified with this option will be included | 111 | The content of the file specified with this option will be included |
106 | verbatim above the repository index. This setting is deprecated, and | 112 | verbatim above the repository index. This setting is deprecated, and |
107 | will not be supported by cgit-1.0 (use root-readme instead). Default | 113 | will not be supported by cgit-1.0 (use root-readme instead). Default |
108 | value: none. | 114 | value: none. |
109 | 115 | ||
110 | index-info:: | 116 | index-info:: |
111 | The content of the file specified with this option will be included | 117 | The content of the file specified with this option will be included |
112 | verbatim below the heading on the repository index page. This setting | 118 | verbatim below the heading on the repository index page. This setting |
113 | is deprecated, and will not be supported by cgit-1.0 (use root-desc | 119 | is deprecated, and will not be supported by cgit-1.0 (use root-desc |
114 | instead). Default value: none. | 120 | instead). Default value: none. |
115 | 121 | ||
116 | local-time:: | 122 | local-time:: |
117 | Flag which, if set to "1", makes cgit print commit and tag times in the | 123 | Flag which, if set to "1", makes cgit print commit and tag times in the |
118 | servers timezone. Default value: "0". | 124 | servers timezone. Default value: "0". |
119 | 125 | ||
120 | logo:: | 126 | logo:: |
121 | Url which specifies the source of an image which will be used as a logo | 127 | Url which specifies the source of an image which will be used as a logo |
diff --git a/ui-commit.c b/ui-commit.c index 41ce70e..ee0e139 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -28,79 +28,87 @@ void cgit_print_commit(char *hex) | |||
28 | cgit_print_error(fmt("Bad object id: %s", hex)); | 28 | cgit_print_error(fmt("Bad object id: %s", hex)); |
29 | return; | 29 | return; |
30 | } | 30 | } |
31 | commit = lookup_commit_reference(sha1); | 31 | commit = lookup_commit_reference(sha1); |
32 | if (!commit) { | 32 | if (!commit) { |
33 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 33 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
34 | return; | 34 | return; |
35 | } | 35 | } |
36 | info = cgit_parse_commit(commit); | 36 | info = cgit_parse_commit(commit); |
37 | 37 | ||
38 | load_ref_decorations(); | 38 | load_ref_decorations(); |
39 | 39 | ||
40 | html("<table summary='commit info' class='commit-info'>\n"); | 40 | html("<table summary='commit info' class='commit-info'>\n"); |
41 | html("<tr><th>author</th><td>"); | 41 | html("<tr><th>author</th><td>"); |
42 | html_txt(info->author); | 42 | html_txt(info->author); |
43 | html(" "); | 43 | html(" "); |
44 | html_txt(info->author_email); | 44 | html_txt(info->author_email); |
45 | html("</td><td class='right'>"); | 45 | html("</td><td class='right'>"); |
46 | cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); | 46 | cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); |
47 | html("</td></tr>\n"); | 47 | html("</td></tr>\n"); |
48 | html("<tr><th>committer</th><td>"); | 48 | html("<tr><th>committer</th><td>"); |
49 | html_txt(info->committer); | 49 | html_txt(info->committer); |
50 | html(" "); | 50 | html(" "); |
51 | html_txt(info->committer_email); | 51 | html_txt(info->committer_email); |
52 | html("</td><td class='right'>"); | 52 | html("</td><td class='right'>"); |
53 | cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time); | 53 | cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time); |
54 | html("</td></tr>\n"); | 54 | html("</td></tr>\n"); |
55 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); | 55 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); |
56 | tmp = sha1_to_hex(commit->object.sha1); | 56 | tmp = sha1_to_hex(commit->object.sha1); |
57 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); | 57 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); |
58 | html(" ("); | 58 | html(" ("); |
59 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); | 59 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); |
60 | html(")</td></tr>\n"); | 60 | html(")</td></tr>\n"); |
61 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 61 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
62 | tmp = xstrdup(hex); | 62 | tmp = xstrdup(hex); |
63 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 63 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
64 | ctx.qry.head, tmp, NULL); | 64 | ctx.qry.head, tmp, NULL); |
65 | html("</td></tr>\n"); | 65 | html("</td></tr>\n"); |
66 | for (p = commit->parents; p ; p = p->next) { | 66 | for (p = commit->parents; p ; p = p->next) { |
67 | parent = lookup_commit_reference(p->item->object.sha1); | 67 | parent = lookup_commit_reference(p->item->object.sha1); |
68 | if (!parent) { | 68 | if (!parent) { |
69 | html("<tr><td colspan='3'>"); | 69 | html("<tr><td colspan='3'>"); |
70 | cgit_print_error("Error reading parent commit"); | 70 | cgit_print_error("Error reading parent commit"); |
71 | html("</td></tr>"); | 71 | html("</td></tr>"); |
72 | continue; | 72 | continue; |
73 | } | 73 | } |
74 | html("<tr><th>parent</th>" | 74 | html("<tr><th>parent</th>" |
75 | "<td colspan='2' class='sha1'>"); | 75 | "<td colspan='2' class='sha1'>"); |
76 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 76 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
77 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); | 77 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); |
78 | html(" ("); | 78 | html(" ("); |
79 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 79 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
80 | sha1_to_hex(p->item->object.sha1), NULL); | 80 | sha1_to_hex(p->item->object.sha1), NULL); |
81 | html(")</td></tr>"); | 81 | html(")</td></tr>"); |
82 | parents++; | 82 | parents++; |
83 | } | 83 | } |
84 | if (ctx.repo->snapshots) { | 84 | if (ctx.repo->snapshots) { |
85 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 85 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
86 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, | 86 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
87 | hex, ctx.repo->snapshots); | 87 | hex, ctx.repo->snapshots); |
88 | html("</td></tr>"); | 88 | html("</td></tr>"); |
89 | } | 89 | } |
90 | html("</table>\n"); | 90 | html("</table>\n"); |
91 | html("<div class='commit-subject'>"); | 91 | html("<div class='commit-subject'>"); |
92 | if (ctx.cfg.commit_filter) | ||
93 | cgit_open_filter(ctx.cfg.commit_filter); | ||
92 | html_txt(info->subject); | 94 | html_txt(info->subject); |
95 | if (ctx.cfg.commit_filter) | ||
96 | cgit_close_filter(ctx.cfg.commit_filter); | ||
93 | show_commit_decorations(commit); | 97 | show_commit_decorations(commit); |
94 | html("</div>"); | 98 | html("</div>"); |
95 | html("<div class='commit-msg'>"); | 99 | html("<div class='commit-msg'>"); |
100 | if (ctx.cfg.commit_filter) | ||
101 | cgit_open_filter(ctx.cfg.commit_filter); | ||
96 | html_txt(info->msg); | 102 | html_txt(info->msg); |
103 | if (ctx.cfg.commit_filter) | ||
104 | cgit_close_filter(ctx.cfg.commit_filter); | ||
97 | html("</div>"); | 105 | html("</div>"); |
98 | if (parents < 3) { | 106 | if (parents < 3) { |
99 | if (parents) | 107 | if (parents) |
100 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 108 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
101 | else | 109 | else |
102 | tmp = NULL; | 110 | tmp = NULL; |
103 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); | 111 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); |
104 | } | 112 | } |
105 | cgit_free_commitinfo(info); | 113 | cgit_free_commitinfo(info); |
106 | } | 114 | } |