summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorJohan Herland <johan@herland.net>2010-11-15 17:39:50 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-11-16 07:18:36 (UTC)
commit9a8d39c668b98464bac97d4e5442966de63f97b2 (patch) (unidiff)
treeee1a7766d6d9365ae45f694939c20cab811abd84 /cgit.c
parent5a36c2a291a00b59b8ec2f112453e117797c2fe5 (diff)
downloadcgit-9a8d39c668b98464bac97d4e5442966de63f97b2.zip
cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.gz
cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.bz2
ui-log: Implement support for commit graphs
Teach CGit to print an ASCII art commit graph to the left of the commit message, similar to 'git log --graph'. The graph adds extra lines (table rows) to the log when needed to add/remove/shuffle edges in the graph. When 'showmsg' is enabled, the graph is automatically padded to account for the extra lines added by the commit message/notes. This feature is controlled by a new config variable: "enable-commit-graph" (disabled by default), and individual repos can control it by setting "repo.enable-commit-graph". Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 412fbf0..53ab68d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,239 +1,243 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> 4 * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
5 * 5 *
6 * Licensed under GNU General Public License v2 6 * Licensed under GNU General Public License v2
7 * (see COPYING for full license text) 7 * (see COPYING for full license text)
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "cache.h" 11#include "cache.h"
12#include "cmd.h" 12#include "cmd.h"
13#include "configfile.h" 13#include "configfile.h"
14#include "html.h" 14#include "html.h"
15#include "ui-shared.h" 15#include "ui-shared.h"
16#include "ui-stats.h" 16#include "ui-stats.h"
17#include "scan-tree.h" 17#include "scan-tree.h"
18 18
19const char *cgit_version = CGIT_VERSION; 19const char *cgit_version = CGIT_VERSION;
20 20
21void add_mimetype(const char *name, const char *value) 21void add_mimetype(const char *name, const char *value)
22{ 22{
23 struct string_list_item *item; 23 struct string_list_item *item;
24 24
25 item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); 25 item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name));
26 item->util = xstrdup(value); 26 item->util = xstrdup(value);
27} 27}
28 28
29struct cgit_filter *new_filter(const char *cmd, int extra_args) 29struct cgit_filter *new_filter(const char *cmd, int extra_args)
30{ 30{
31 struct cgit_filter *f; 31 struct cgit_filter *f;
32 32
33 if (!cmd || !cmd[0]) 33 if (!cmd || !cmd[0])
34 return NULL; 34 return NULL;
35 35
36 f = xmalloc(sizeof(struct cgit_filter)); 36 f = xmalloc(sizeof(struct cgit_filter));
37 f->cmd = xstrdup(cmd); 37 f->cmd = xstrdup(cmd);
38 f->argv = xmalloc((2 + extra_args) * sizeof(char *)); 38 f->argv = xmalloc((2 + extra_args) * sizeof(char *));
39 f->argv[0] = f->cmd; 39 f->argv[0] = f->cmd;
40 f->argv[1] = NULL; 40 f->argv[1] = NULL;
41 return f; 41 return f;
42} 42}
43 43
44static void process_cached_repolist(const char *path); 44static void process_cached_repolist(const char *path);
45 45
46void repo_config(struct cgit_repo *repo, const char *name, const char *value) 46void repo_config(struct cgit_repo *repo, const char *name, const char *value)
47{ 47{
48 if (!strcmp(name, "name")) 48 if (!strcmp(name, "name"))
49 repo->name = xstrdup(value); 49 repo->name = xstrdup(value);
50 else if (!strcmp(name, "clone-url")) 50 else if (!strcmp(name, "clone-url"))
51 repo->clone_url = xstrdup(value); 51 repo->clone_url = xstrdup(value);
52 else if (!strcmp(name, "desc")) 52 else if (!strcmp(name, "desc"))
53 repo->desc = xstrdup(value); 53 repo->desc = xstrdup(value);
54 else if (!strcmp(name, "owner")) 54 else if (!strcmp(name, "owner"))
55 repo->owner = xstrdup(value); 55 repo->owner = xstrdup(value);
56 else if (!strcmp(name, "defbranch")) 56 else if (!strcmp(name, "defbranch"))
57 repo->defbranch = xstrdup(value); 57 repo->defbranch = xstrdup(value);
58 else if (!strcmp(name, "snapshots")) 58 else if (!strcmp(name, "snapshots"))
59 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); 59 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
60 else if (!strcmp(name, "enable-commit-graph"))
61 repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
60 else if (!strcmp(name, "enable-log-filecount")) 62 else if (!strcmp(name, "enable-log-filecount"))
61 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 63 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
62 else if (!strcmp(name, "enable-log-linecount")) 64 else if (!strcmp(name, "enable-log-linecount"))
63 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 65 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
64 else if (!strcmp(name, "enable-remote-branches")) 66 else if (!strcmp(name, "enable-remote-branches"))
65 repo->enable_remote_branches = atoi(value); 67 repo->enable_remote_branches = atoi(value);
66 else if (!strcmp(name, "enable-subject-links")) 68 else if (!strcmp(name, "enable-subject-links"))
67 repo->enable_subject_links = atoi(value); 69 repo->enable_subject_links = atoi(value);
68 else if (!strcmp(name, "max-stats")) 70 else if (!strcmp(name, "max-stats"))
69 repo->max_stats = cgit_find_stats_period(value, NULL); 71 repo->max_stats = cgit_find_stats_period(value, NULL);
70 else if (!strcmp(name, "module-link")) 72 else if (!strcmp(name, "module-link"))
71 repo->module_link= xstrdup(value); 73 repo->module_link= xstrdup(value);
72 else if (!strcmp(name, "section")) 74 else if (!strcmp(name, "section"))
73 repo->section = xstrdup(value); 75 repo->section = xstrdup(value);
74 else if (!strcmp(name, "readme") && value != NULL) { 76 else if (!strcmp(name, "readme") && value != NULL) {
75 repo->readme = xstrdup(value); 77 repo->readme = xstrdup(value);
76 } else if (ctx.cfg.enable_filter_overrides) { 78 } else if (ctx.cfg.enable_filter_overrides) {
77 if (!strcmp(name, "about-filter")) 79 if (!strcmp(name, "about-filter"))
78 repo->about_filter = new_filter(value, 0); 80 repo->about_filter = new_filter(value, 0);
79 else if (!strcmp(name, "commit-filter")) 81 else if (!strcmp(name, "commit-filter"))
80 repo->commit_filter = new_filter(value, 0); 82 repo->commit_filter = new_filter(value, 0);
81 else if (!strcmp(name, "source-filter")) 83 else if (!strcmp(name, "source-filter"))
82 repo->source_filter = new_filter(value, 1); 84 repo->source_filter = new_filter(value, 1);
83 } 85 }
84} 86}
85 87
86void config_cb(const char *name, const char *value) 88void config_cb(const char *name, const char *value)
87{ 89{
88 if (!strcmp(name, "section") || !strcmp(name, "repo.group")) 90 if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
89 ctx.cfg.section = xstrdup(value); 91 ctx.cfg.section = xstrdup(value);
90 else if (!strcmp(name, "repo.url")) 92 else if (!strcmp(name, "repo.url"))
91 ctx.repo = cgit_add_repo(value); 93 ctx.repo = cgit_add_repo(value);
92 else if (ctx.repo && !strcmp(name, "repo.path")) 94 else if (ctx.repo && !strcmp(name, "repo.path"))
93 ctx.repo->path = trim_end(value, '/'); 95 ctx.repo->path = trim_end(value, '/');
94 else if (ctx.repo && !prefixcmp(name, "repo.")) 96 else if (ctx.repo && !prefixcmp(name, "repo."))
95 repo_config(ctx.repo, name + 5, value); 97 repo_config(ctx.repo, name + 5, value);
96 else if (!strcmp(name, "readme")) 98 else if (!strcmp(name, "readme"))
97 ctx.cfg.readme = xstrdup(value); 99 ctx.cfg.readme = xstrdup(value);
98 else if (!strcmp(name, "root-title")) 100 else if (!strcmp(name, "root-title"))
99 ctx.cfg.root_title = xstrdup(value); 101 ctx.cfg.root_title = xstrdup(value);
100 else if (!strcmp(name, "root-desc")) 102 else if (!strcmp(name, "root-desc"))
101 ctx.cfg.root_desc = xstrdup(value); 103 ctx.cfg.root_desc = xstrdup(value);
102 else if (!strcmp(name, "root-readme")) 104 else if (!strcmp(name, "root-readme"))
103 ctx.cfg.root_readme = xstrdup(value); 105 ctx.cfg.root_readme = xstrdup(value);
104 else if (!strcmp(name, "css")) 106 else if (!strcmp(name, "css"))
105 ctx.cfg.css = xstrdup(value); 107 ctx.cfg.css = xstrdup(value);
106 else if (!strcmp(name, "favicon")) 108 else if (!strcmp(name, "favicon"))
107 ctx.cfg.favicon = xstrdup(value); 109 ctx.cfg.favicon = xstrdup(value);
108 else if (!strcmp(name, "footer")) 110 else if (!strcmp(name, "footer"))
109 ctx.cfg.footer = xstrdup(value); 111 ctx.cfg.footer = xstrdup(value);
110 else if (!strcmp(name, "head-include")) 112 else if (!strcmp(name, "head-include"))
111 ctx.cfg.head_include = xstrdup(value); 113 ctx.cfg.head_include = xstrdup(value);
112 else if (!strcmp(name, "header")) 114 else if (!strcmp(name, "header"))
113 ctx.cfg.header = xstrdup(value); 115 ctx.cfg.header = xstrdup(value);
114 else if (!strcmp(name, "logo")) 116 else if (!strcmp(name, "logo"))
115 ctx.cfg.logo = xstrdup(value); 117 ctx.cfg.logo = xstrdup(value);
116 else if (!strcmp(name, "index-header")) 118 else if (!strcmp(name, "index-header"))
117 ctx.cfg.index_header = xstrdup(value); 119 ctx.cfg.index_header = xstrdup(value);
118 else if (!strcmp(name, "index-info")) 120 else if (!strcmp(name, "index-info"))
119 ctx.cfg.index_info = xstrdup(value); 121 ctx.cfg.index_info = xstrdup(value);
120 else if (!strcmp(name, "logo-link")) 122 else if (!strcmp(name, "logo-link"))
121 ctx.cfg.logo_link = xstrdup(value); 123 ctx.cfg.logo_link = xstrdup(value);
122 else if (!strcmp(name, "module-link")) 124 else if (!strcmp(name, "module-link"))
123 ctx.cfg.module_link = xstrdup(value); 125 ctx.cfg.module_link = xstrdup(value);
124 else if (!strcmp(name, "strict-export")) 126 else if (!strcmp(name, "strict-export"))
125 ctx.cfg.strict_export = xstrdup(value); 127 ctx.cfg.strict_export = xstrdup(value);
126 else if (!strcmp(name, "virtual-root")) { 128 else if (!strcmp(name, "virtual-root")) {
127 ctx.cfg.virtual_root = trim_end(value, '/'); 129 ctx.cfg.virtual_root = trim_end(value, '/');
128 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 130 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
129 ctx.cfg.virtual_root = ""; 131 ctx.cfg.virtual_root = "";
130 } else if (!strcmp(name, "nocache")) 132 } else if (!strcmp(name, "nocache"))
131 ctx.cfg.nocache = atoi(value); 133 ctx.cfg.nocache = atoi(value);
132 else if (!strcmp(name, "noplainemail")) 134 else if (!strcmp(name, "noplainemail"))
133 ctx.cfg.noplainemail = atoi(value); 135 ctx.cfg.noplainemail = atoi(value);
134 else if (!strcmp(name, "noheader")) 136 else if (!strcmp(name, "noheader"))
135 ctx.cfg.noheader = atoi(value); 137 ctx.cfg.noheader = atoi(value);
136 else if (!strcmp(name, "snapshots")) 138 else if (!strcmp(name, "snapshots"))
137 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 139 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
138 else if (!strcmp(name, "enable-filter-overrides")) 140 else if (!strcmp(name, "enable-filter-overrides"))
139 ctx.cfg.enable_filter_overrides = atoi(value); 141 ctx.cfg.enable_filter_overrides = atoi(value);
140 else if (!strcmp(name, "enable-gitweb-owner")) 142 else if (!strcmp(name, "enable-gitweb-owner"))
141 ctx.cfg.enable_gitweb_owner = atoi(value); 143 ctx.cfg.enable_gitweb_owner = atoi(value);
142 else if (!strcmp(name, "enable-index-links")) 144 else if (!strcmp(name, "enable-index-links"))
143 ctx.cfg.enable_index_links = atoi(value); 145 ctx.cfg.enable_index_links = atoi(value);
146 else if (!strcmp(name, "enable-commit-graph"))
147 ctx.cfg.enable_commit_graph = atoi(value);
144 else if (!strcmp(name, "enable-log-filecount")) 148 else if (!strcmp(name, "enable-log-filecount"))
145 ctx.cfg.enable_log_filecount = atoi(value); 149 ctx.cfg.enable_log_filecount = atoi(value);
146 else if (!strcmp(name, "enable-log-linecount")) 150 else if (!strcmp(name, "enable-log-linecount"))
147 ctx.cfg.enable_log_linecount = atoi(value); 151 ctx.cfg.enable_log_linecount = atoi(value);
148 else if (!strcmp(name, "enable-remote-branches")) 152 else if (!strcmp(name, "enable-remote-branches"))
149 ctx.cfg.enable_remote_branches = atoi(value); 153 ctx.cfg.enable_remote_branches = atoi(value);
150 else if (!strcmp(name, "enable-subject-links")) 154 else if (!strcmp(name, "enable-subject-links"))
151 ctx.cfg.enable_subject_links = atoi(value); 155 ctx.cfg.enable_subject_links = atoi(value);
152 else if (!strcmp(name, "enable-tree-linenumbers")) 156 else if (!strcmp(name, "enable-tree-linenumbers"))
153 ctx.cfg.enable_tree_linenumbers = atoi(value); 157 ctx.cfg.enable_tree_linenumbers = atoi(value);
154 else if (!strcmp(name, "max-stats")) 158 else if (!strcmp(name, "max-stats"))
155 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); 159 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
156 else if (!strcmp(name, "cache-size")) 160 else if (!strcmp(name, "cache-size"))
157 ctx.cfg.cache_size = atoi(value); 161 ctx.cfg.cache_size = atoi(value);
158 else if (!strcmp(name, "cache-root")) 162 else if (!strcmp(name, "cache-root"))
159 ctx.cfg.cache_root = xstrdup(expand_macros(value)); 163 ctx.cfg.cache_root = xstrdup(expand_macros(value));
160 else if (!strcmp(name, "cache-root-ttl")) 164 else if (!strcmp(name, "cache-root-ttl"))
161 ctx.cfg.cache_root_ttl = atoi(value); 165 ctx.cfg.cache_root_ttl = atoi(value);
162 else if (!strcmp(name, "cache-repo-ttl")) 166 else if (!strcmp(name, "cache-repo-ttl"))
163 ctx.cfg.cache_repo_ttl = atoi(value); 167 ctx.cfg.cache_repo_ttl = atoi(value);
164 else if (!strcmp(name, "cache-scanrc-ttl")) 168 else if (!strcmp(name, "cache-scanrc-ttl"))
165 ctx.cfg.cache_scanrc_ttl = atoi(value); 169 ctx.cfg.cache_scanrc_ttl = atoi(value);
166 else if (!strcmp(name, "cache-static-ttl")) 170 else if (!strcmp(name, "cache-static-ttl"))
167 ctx.cfg.cache_static_ttl = atoi(value); 171 ctx.cfg.cache_static_ttl = atoi(value);
168 else if (!strcmp(name, "cache-dynamic-ttl")) 172 else if (!strcmp(name, "cache-dynamic-ttl"))
169 ctx.cfg.cache_dynamic_ttl = atoi(value); 173 ctx.cfg.cache_dynamic_ttl = atoi(value);
170 else if (!strcmp(name, "about-filter")) 174 else if (!strcmp(name, "about-filter"))
171 ctx.cfg.about_filter = new_filter(value, 0); 175 ctx.cfg.about_filter = new_filter(value, 0);
172 else if (!strcmp(name, "commit-filter")) 176 else if (!strcmp(name, "commit-filter"))
173 ctx.cfg.commit_filter = new_filter(value, 0); 177 ctx.cfg.commit_filter = new_filter(value, 0);
174 else if (!strcmp(name, "embedded")) 178 else if (!strcmp(name, "embedded"))
175 ctx.cfg.embedded = atoi(value); 179 ctx.cfg.embedded = atoi(value);
176 else if (!strcmp(name, "max-atom-items")) 180 else if (!strcmp(name, "max-atom-items"))
177 ctx.cfg.max_atom_items = atoi(value); 181 ctx.cfg.max_atom_items = atoi(value);
178 else if (!strcmp(name, "max-message-length")) 182 else if (!strcmp(name, "max-message-length"))
179 ctx.cfg.max_msg_len = atoi(value); 183 ctx.cfg.max_msg_len = atoi(value);
180 else if (!strcmp(name, "max-repodesc-length")) 184 else if (!strcmp(name, "max-repodesc-length"))
181 ctx.cfg.max_repodesc_len = atoi(value); 185 ctx.cfg.max_repodesc_len = atoi(value);
182 else if (!strcmp(name, "max-blob-size")) 186 else if (!strcmp(name, "max-blob-size"))
183 ctx.cfg.max_blob_size = atoi(value); 187 ctx.cfg.max_blob_size = atoi(value);
184 else if (!strcmp(name, "max-repo-count")) 188 else if (!strcmp(name, "max-repo-count"))
185 ctx.cfg.max_repo_count = atoi(value); 189 ctx.cfg.max_repo_count = atoi(value);
186 else if (!strcmp(name, "max-commit-count")) 190 else if (!strcmp(name, "max-commit-count"))
187 ctx.cfg.max_commit_count = atoi(value); 191 ctx.cfg.max_commit_count = atoi(value);
188 else if (!strcmp(name, "project-list")) 192 else if (!strcmp(name, "project-list"))
189 ctx.cfg.project_list = xstrdup(expand_macros(value)); 193 ctx.cfg.project_list = xstrdup(expand_macros(value));
190 else if (!strcmp(name, "scan-path")) 194 else if (!strcmp(name, "scan-path"))
191 if (!ctx.cfg.nocache && ctx.cfg.cache_size) 195 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
192 process_cached_repolist(expand_macros(value)); 196 process_cached_repolist(expand_macros(value));
193 else if (ctx.cfg.project_list) 197 else if (ctx.cfg.project_list)
194 scan_projects(expand_macros(value), 198 scan_projects(expand_macros(value),
195 ctx.cfg.project_list, repo_config); 199 ctx.cfg.project_list, repo_config);
196 else 200 else
197 scan_tree(expand_macros(value), repo_config); 201 scan_tree(expand_macros(value), repo_config);
198 else if (!strcmp(name, "section-from-path")) 202 else if (!strcmp(name, "section-from-path"))
199 ctx.cfg.section_from_path = atoi(value); 203 ctx.cfg.section_from_path = atoi(value);
200 else if (!strcmp(name, "source-filter")) 204 else if (!strcmp(name, "source-filter"))
201 ctx.cfg.source_filter = new_filter(value, 1); 205 ctx.cfg.source_filter = new_filter(value, 1);
202 else if (!strcmp(name, "summary-log")) 206 else if (!strcmp(name, "summary-log"))
203 ctx.cfg.summary_log = atoi(value); 207 ctx.cfg.summary_log = atoi(value);
204 else if (!strcmp(name, "summary-branches")) 208 else if (!strcmp(name, "summary-branches"))
205 ctx.cfg.summary_branches = atoi(value); 209 ctx.cfg.summary_branches = atoi(value);
206 else if (!strcmp(name, "summary-tags")) 210 else if (!strcmp(name, "summary-tags"))
207 ctx.cfg.summary_tags = atoi(value); 211 ctx.cfg.summary_tags = atoi(value);
208 else if (!strcmp(name, "side-by-side-diffs")) 212 else if (!strcmp(name, "side-by-side-diffs"))
209 ctx.cfg.ssdiff = atoi(value); 213 ctx.cfg.ssdiff = atoi(value);
210 else if (!strcmp(name, "agefile")) 214 else if (!strcmp(name, "agefile"))
211 ctx.cfg.agefile = xstrdup(value); 215 ctx.cfg.agefile = xstrdup(value);
212 else if (!strcmp(name, "renamelimit")) 216 else if (!strcmp(name, "renamelimit"))
213 ctx.cfg.renamelimit = atoi(value); 217 ctx.cfg.renamelimit = atoi(value);
214 else if (!strcmp(name, "remove-suffix")) 218 else if (!strcmp(name, "remove-suffix"))
215 ctx.cfg.remove_suffix = atoi(value); 219 ctx.cfg.remove_suffix = atoi(value);
216 else if (!strcmp(name, "robots")) 220 else if (!strcmp(name, "robots"))
217 ctx.cfg.robots = xstrdup(value); 221 ctx.cfg.robots = xstrdup(value);
218 else if (!strcmp(name, "clone-prefix")) 222 else if (!strcmp(name, "clone-prefix"))
219 ctx.cfg.clone_prefix = xstrdup(value); 223 ctx.cfg.clone_prefix = xstrdup(value);
220 else if (!strcmp(name, "local-time")) 224 else if (!strcmp(name, "local-time"))
221 ctx.cfg.local_time = atoi(value); 225 ctx.cfg.local_time = atoi(value);
222 else if (!prefixcmp(name, "mimetype.")) 226 else if (!prefixcmp(name, "mimetype."))
223 add_mimetype(name + 9, value); 227 add_mimetype(name + 9, value);
224 else if (!strcmp(name, "include")) 228 else if (!strcmp(name, "include"))
225 parse_configfile(expand_macros(value), config_cb); 229 parse_configfile(expand_macros(value), config_cb);
226} 230}
227 231
228static void querystring_cb(const char *name, const char *value) 232static void querystring_cb(const char *name, const char *value)
229{ 233{
230 if (!value) 234 if (!value)
231 value = ""; 235 value = "";
232 236
233 if (!strcmp(name,"r")) { 237 if (!strcmp(name,"r")) {
234 ctx.qry.repo = xstrdup(value); 238 ctx.qry.repo = xstrdup(value);
235 ctx.repo = cgit_get_repoinfo(value); 239 ctx.repo = cgit_get_repoinfo(value);
236 } else if (!strcmp(name, "p")) { 240 } else if (!strcmp(name, "p")) {
237 ctx.qry.page = xstrdup(value); 241 ctx.qry.page = xstrdup(value);
238 } else if (!strcmp(name, "url")) { 242 } else if (!strcmp(name, "url")) {
239 if (*value == '/') 243 if (*value == '/')
@@ -447,192 +451,194 @@ static void process_request(void *cbdata)
447 ctx->page.title = "cgit error"; 451 ctx->page.title = "cgit error";
448 cgit_print_http_headers(ctx); 452 cgit_print_http_headers(ctx);
449 cgit_print_docstart(ctx); 453 cgit_print_docstart(ctx);
450 cgit_print_pageheader(ctx); 454 cgit_print_pageheader(ctx);
451 cgit_print_error("Invalid request"); 455 cgit_print_error("Invalid request");
452 cgit_print_docend(); 456 cgit_print_docend();
453 return; 457 return;
454 } 458 }
455 459
456 /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" 460 /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
457 * in-project path limit to be made available at ctx->qry.vpath. 461 * in-project path limit to be made available at ctx->qry.vpath.
458 * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). 462 * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
459 */ 463 */
460 ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; 464 ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
461 465
462 if (cmd->want_repo && !ctx->repo) { 466 if (cmd->want_repo && !ctx->repo) {
463 cgit_print_http_headers(ctx); 467 cgit_print_http_headers(ctx);
464 cgit_print_docstart(ctx); 468 cgit_print_docstart(ctx);
465 cgit_print_pageheader(ctx); 469 cgit_print_pageheader(ctx);
466 cgit_print_error(fmt("No repository selected")); 470 cgit_print_error(fmt("No repository selected"));
467 cgit_print_docend(); 471 cgit_print_docend();
468 return; 472 return;
469 } 473 }
470 474
471 if (ctx->repo && prepare_repo_cmd(ctx)) 475 if (ctx->repo && prepare_repo_cmd(ctx))
472 return; 476 return;
473 477
474 if (cmd->want_layout) { 478 if (cmd->want_layout) {
475 cgit_print_http_headers(ctx); 479 cgit_print_http_headers(ctx);
476 cgit_print_docstart(ctx); 480 cgit_print_docstart(ctx);
477 cgit_print_pageheader(ctx); 481 cgit_print_pageheader(ctx);
478 } 482 }
479 483
480 cmd->fn(ctx); 484 cmd->fn(ctx);
481 485
482 if (cmd->want_layout) 486 if (cmd->want_layout)
483 cgit_print_docend(); 487 cgit_print_docend();
484} 488}
485 489
486int cmp_repos(const void *a, const void *b) 490int cmp_repos(const void *a, const void *b)
487{ 491{
488 const struct cgit_repo *ra = a, *rb = b; 492 const struct cgit_repo *ra = a, *rb = b;
489 return strcmp(ra->url, rb->url); 493 return strcmp(ra->url, rb->url);
490} 494}
491 495
492char *build_snapshot_setting(int bitmap) 496char *build_snapshot_setting(int bitmap)
493{ 497{
494 const struct cgit_snapshot_format *f; 498 const struct cgit_snapshot_format *f;
495 char *result = xstrdup(""); 499 char *result = xstrdup("");
496 char *tmp; 500 char *tmp;
497 int len; 501 int len;
498 502
499 for (f = cgit_snapshot_formats; f->suffix; f++) { 503 for (f = cgit_snapshot_formats; f->suffix; f++) {
500 if (f->bit & bitmap) { 504 if (f->bit & bitmap) {
501 tmp = result; 505 tmp = result;
502 result = xstrdup(fmt("%s%s ", tmp, f->suffix)); 506 result = xstrdup(fmt("%s%s ", tmp, f->suffix));
503 free(tmp); 507 free(tmp);
504 } 508 }
505 } 509 }
506 len = strlen(result); 510 len = strlen(result);
507 if (len) 511 if (len)
508 result[len - 1] = '\0'; 512 result[len - 1] = '\0';
509 return result; 513 return result;
510} 514}
511 515
512char *get_first_line(char *txt) 516char *get_first_line(char *txt)
513{ 517{
514 char *t = xstrdup(txt); 518 char *t = xstrdup(txt);
515 char *p = strchr(t, '\n'); 519 char *p = strchr(t, '\n');
516 if (p) 520 if (p)
517 *p = '\0'; 521 *p = '\0';
518 return t; 522 return t;
519} 523}
520 524
521void print_repo(FILE *f, struct cgit_repo *repo) 525void print_repo(FILE *f, struct cgit_repo *repo)
522{ 526{
523 fprintf(f, "repo.url=%s\n", repo->url); 527 fprintf(f, "repo.url=%s\n", repo->url);
524 fprintf(f, "repo.name=%s\n", repo->name); 528 fprintf(f, "repo.name=%s\n", repo->name);
525 fprintf(f, "repo.path=%s\n", repo->path); 529 fprintf(f, "repo.path=%s\n", repo->path);
526 if (repo->owner) 530 if (repo->owner)
527 fprintf(f, "repo.owner=%s\n", repo->owner); 531 fprintf(f, "repo.owner=%s\n", repo->owner);
528 if (repo->desc) { 532 if (repo->desc) {
529 char *tmp = get_first_line(repo->desc); 533 char *tmp = get_first_line(repo->desc);
530 fprintf(f, "repo.desc=%s\n", tmp); 534 fprintf(f, "repo.desc=%s\n", tmp);
531 free(tmp); 535 free(tmp);
532 } 536 }
533 if (repo->readme) 537 if (repo->readme)
534 fprintf(f, "repo.readme=%s\n", repo->readme); 538 fprintf(f, "repo.readme=%s\n", repo->readme);
535 if (repo->defbranch) 539 if (repo->defbranch)
536 fprintf(f, "repo.defbranch=%s\n", repo->defbranch); 540 fprintf(f, "repo.defbranch=%s\n", repo->defbranch);
537 if (repo->module_link) 541 if (repo->module_link)
538 fprintf(f, "repo.module-link=%s\n", repo->module_link); 542 fprintf(f, "repo.module-link=%s\n", repo->module_link);
539 if (repo->section) 543 if (repo->section)
540 fprintf(f, "repo.section=%s\n", repo->section); 544 fprintf(f, "repo.section=%s\n", repo->section);
541 if (repo->clone_url) 545 if (repo->clone_url)
542 fprintf(f, "repo.clone-url=%s\n", repo->clone_url); 546 fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
547 fprintf(f, "repo.enable-commit-graph=%d\n",
548 repo->enable_commit_graph);
543 fprintf(f, "repo.enable-log-filecount=%d\n", 549 fprintf(f, "repo.enable-log-filecount=%d\n",
544 repo->enable_log_filecount); 550 repo->enable_log_filecount);
545 fprintf(f, "repo.enable-log-linecount=%d\n", 551 fprintf(f, "repo.enable-log-linecount=%d\n",
546 repo->enable_log_linecount); 552 repo->enable_log_linecount);
547 if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) 553 if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
548 fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); 554 fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
549 if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) 555 if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
550 fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); 556 fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
551 if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) 557 if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
552 fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); 558 fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd);
553 if (repo->snapshots != ctx.cfg.snapshots) { 559 if (repo->snapshots != ctx.cfg.snapshots) {
554 char *tmp = build_snapshot_setting(repo->snapshots); 560 char *tmp = build_snapshot_setting(repo->snapshots);
555 fprintf(f, "repo.snapshots=%s\n", tmp); 561 fprintf(f, "repo.snapshots=%s\n", tmp);
556 free(tmp); 562 free(tmp);
557 } 563 }
558 if (repo->max_stats != ctx.cfg.max_stats) 564 if (repo->max_stats != ctx.cfg.max_stats)
559 fprintf(f, "repo.max-stats=%s\n", 565 fprintf(f, "repo.max-stats=%s\n",
560 cgit_find_stats_periodname(repo->max_stats)); 566 cgit_find_stats_periodname(repo->max_stats));
561 fprintf(f, "\n"); 567 fprintf(f, "\n");
562} 568}
563 569
564void print_repolist(FILE *f, struct cgit_repolist *list, int start) 570void print_repolist(FILE *f, struct cgit_repolist *list, int start)
565{ 571{
566 int i; 572 int i;
567 573
568 for(i = start; i < list->count; i++) 574 for(i = start; i < list->count; i++)
569 print_repo(f, &list->repos[i]); 575 print_repo(f, &list->repos[i]);
570} 576}
571 577
572/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' 578/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc'
573 * and return 0 on success. 579 * and return 0 on success.
574 */ 580 */
575static int generate_cached_repolist(const char *path, const char *cached_rc) 581static int generate_cached_repolist(const char *path, const char *cached_rc)
576{ 582{
577 char *locked_rc; 583 char *locked_rc;
578 int idx; 584 int idx;
579 FILE *f; 585 FILE *f;
580 586
581 locked_rc = xstrdup(fmt("%s.lock", cached_rc)); 587 locked_rc = xstrdup(fmt("%s.lock", cached_rc));
582 f = fopen(locked_rc, "wx"); 588 f = fopen(locked_rc, "wx");
583 if (!f) { 589 if (!f) {
584 /* Inform about the error unless the lockfile already existed, 590 /* Inform about the error unless the lockfile already existed,
585 * since that only means we've got concurrent requests. 591 * since that only means we've got concurrent requests.
586 */ 592 */
587 if (errno != EEXIST) 593 if (errno != EEXIST)
588 fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", 594 fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n",
589 locked_rc, strerror(errno), errno); 595 locked_rc, strerror(errno), errno);
590 return errno; 596 return errno;
591 } 597 }
592 idx = cgit_repolist.count; 598 idx = cgit_repolist.count;
593 if (ctx.cfg.project_list) 599 if (ctx.cfg.project_list)
594 scan_projects(path, ctx.cfg.project_list, repo_config); 600 scan_projects(path, ctx.cfg.project_list, repo_config);
595 else 601 else
596 scan_tree(path, repo_config); 602 scan_tree(path, repo_config);
597 print_repolist(f, &cgit_repolist, idx); 603 print_repolist(f, &cgit_repolist, idx);
598 if (rename(locked_rc, cached_rc)) 604 if (rename(locked_rc, cached_rc))
599 fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", 605 fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
600 locked_rc, cached_rc, strerror(errno), errno); 606 locked_rc, cached_rc, strerror(errno), errno);
601 fclose(f); 607 fclose(f);
602 return 0; 608 return 0;
603} 609}
604 610
605static void process_cached_repolist(const char *path) 611static void process_cached_repolist(const char *path)
606{ 612{
607 struct stat st; 613 struct stat st;
608 char *cached_rc; 614 char *cached_rc;
609 time_t age; 615 time_t age;
610 unsigned long hash; 616 unsigned long hash;
611 617
612 hash = hash_str(path); 618 hash = hash_str(path);
613 if (ctx.cfg.project_list) 619 if (ctx.cfg.project_list)
614 hash += hash_str(ctx.cfg.project_list); 620 hash += hash_str(ctx.cfg.project_list);
615 cached_rc = xstrdup(fmt("%s/rc-%8lx", ctx.cfg.cache_root, hash)); 621 cached_rc = xstrdup(fmt("%s/rc-%8lx", ctx.cfg.cache_root, hash));
616 622
617 if (stat(cached_rc, &st)) { 623 if (stat(cached_rc, &st)) {
618 /* Nothing is cached, we need to scan without forking. And 624 /* Nothing is cached, we need to scan without forking. And
619 * if we fail to generate a cached repolist, we need to 625 * if we fail to generate a cached repolist, we need to
620 * invoke scan_tree manually. 626 * invoke scan_tree manually.
621 */ 627 */
622 if (generate_cached_repolist(path, cached_rc)) { 628 if (generate_cached_repolist(path, cached_rc)) {
623 if (ctx.cfg.project_list) 629 if (ctx.cfg.project_list)
624 scan_projects(path, ctx.cfg.project_list, 630 scan_projects(path, ctx.cfg.project_list,
625 repo_config); 631 repo_config);
626 else 632 else
627 scan_tree(path, repo_config); 633 scan_tree(path, repo_config);
628 } 634 }
629 return; 635 return;
630 } 636 }
631 637
632 parse_configfile(cached_rc, config_cb); 638 parse_configfile(cached_rc, config_cb);
633 639
634 /* If the cached configfile hasn't expired, lets exit now */ 640 /* If the cached configfile hasn't expired, lets exit now */
635 age = time(NULL) - st.st_mtime; 641 age = time(NULL) - st.st_mtime;
636 if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) 642 if (age <= (ctx.cfg.cache_scanrc_ttl * 60))
637 return; 643 return;
638 644