summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2011-02-19 13:01:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-02-19 13:01:59 (UTC)
commit31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (patch) (unidiff)
tree26200ad3c376ea1208d2a870ebb3b2bc6d7abee6
parente66a16cebcdac53b63e77876acef1ca9e4877038 (diff)
parentc2bfd40f8aaaa69a66c6eb729c202e42a43ec166 (diff)
downloadcgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.zip
cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.gz
cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.bz2
Merge branch 'jh/graph'
* jh/graph: ui-log: Move 'Age' column when commit graph is present ui-log: Line-wrap long commit subjects when showmsg is enabled ui-log: Colorize commit graph ui-log: Implement support for commit graphs ui-log: Change display of full commit messages (and notes) Conflicts: cgit.css
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c6
-rw-r--r--cgit.css40
-rw-r--r--cgit.h3
-rw-r--r--cgitrc.5.txt13
-rw-r--r--cmd.c3
-rw-r--r--shared.c1
-rw-r--r--ui-log.c183
-rw-r--r--ui-log.h3
-rw-r--r--ui-summary.c2
9 files changed, 212 insertions, 42 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
diff --git a/cgit.css b/cgit.css
index a2a685b..008cff8 100644
--- a/cgit.css
+++ b/cgit.css
@@ -60,212 +60,230 @@ table#header td.form select {
60table#header td.sub { 60table#header td.sub {
61 color: #777; 61 color: #777;
62 border-top: solid 1px #ccc; 62 border-top: solid 1px #ccc;
63 padding-left: 10px; 63 padding-left: 10px;
64} 64}
65 65
66table.tabs { 66table.tabs {
67 border-bottom: solid 3px #ccc; 67 border-bottom: solid 3px #ccc;
68 border-collapse: collapse; 68 border-collapse: collapse;
69 margin-top: 2em; 69 margin-top: 2em;
70 margin-bottom: 0px; 70 margin-bottom: 0px;
71 width: 100%; 71 width: 100%;
72} 72}
73 73
74table.tabs td { 74table.tabs td {
75 padding: 0px 1em; 75 padding: 0px 1em;
76 vertical-align: bottom; 76 vertical-align: bottom;
77} 77}
78 78
79table.tabs td a { 79table.tabs td a {
80 padding: 2px 0.75em; 80 padding: 2px 0.75em;
81 color: #777; 81 color: #777;
82 font-size: 110%; 82 font-size: 110%;
83} 83}
84 84
85table.tabs td a.active { 85table.tabs td a.active {
86 color: #000; 86 color: #000;
87 background-color: #ccc; 87 background-color: #ccc;
88} 88}
89 89
90table.tabs td.form { 90table.tabs td.form {
91 text-align: right; 91 text-align: right;
92} 92}
93 93
94table.tabs td.form form { 94table.tabs td.form form {
95 padding-bottom: 2px; 95 padding-bottom: 2px;
96 font-size: 90%; 96 font-size: 90%;
97 white-space: nowrap; 97 white-space: nowrap;
98} 98}
99 99
100table.tabs td.form input, 100table.tabs td.form input,
101table.tabs td.form select { 101table.tabs td.form select {
102 font-size: 90%; 102 font-size: 90%;
103} 103}
104 104
105div.path { 105div.path {
106 margin: 0px; 106 margin: 0px;
107 padding: 5px 2em 2px 2em; 107 padding: 5px 2em 2px 2em;
108 color: #000; 108 color: #000;
109 background-color: #eee; 109 background-color: #eee;
110} 110}
111 111
112div.content { 112div.content {
113 margin: 0px; 113 margin: 0px;
114 padding: 2em; 114 padding: 2em;
115 border-bottom: solid 3px #ccc; 115 border-bottom: solid 3px #ccc;
116} 116}
117 117
118 118
119table.list { 119table.list {
120 width: 100%; 120 width: 100%;
121 border: none; 121 border: none;
122 border-collapse: collapse; 122 border-collapse: collapse;
123} 123}
124 124
125table.list tr { 125table.list tr {
126 background: white; 126 background: white;
127} 127}
128 128
129table.list tr.logheader { 129table.list tr.logheader {
130 background: #eee; 130 background: #eee;
131} 131}
132 132
133table.list tr:hover { 133table.list tr:hover {
134 background: #eee; 134 background: #eee;
135} 135}
136 136
137table.list tr.nohover:hover { 137table.list tr.nohover:hover {
138 background: white; 138 background: white;
139} 139}
140 140
141table.list th { 141table.list th {
142 font-weight: bold; 142 font-weight: bold;
143 /* color: #888; 143 /* color: #888;
144 border-top: dashed 1px #888; 144 border-top: dashed 1px #888;
145 border-bottom: dashed 1px #888; 145 border-bottom: dashed 1px #888;
146 */ 146 */
147 padding: 0.1em 0.5em 0.05em 0.5em; 147 padding: 0.1em 0.5em 0.05em 0.5em;
148 vertical-align: baseline; 148 vertical-align: baseline;
149} 149}
150 150
151table.list td { 151table.list td {
152 border: none; 152 border: none;
153 padding: 0.1em 0.5em 0.1em 0.5em; 153 padding: 0.1em 0.5em 0.1em 0.5em;
154} 154}
155 155
156table.list td.logsubject { 156table.list td.commitgraph {
157 font-family: monospace; 157 font-family: monospace;
158 font-weight: bold; 158 white-space: pre;
159} 159}
160 160
161table.list td.logmsg { 161table.list td.commitgraph .column1 {
162 font-family: monospace; 162 color: #a00;
163 white-space: pre;
164 padding: 1em 0.5em 2em 0.5em;
165} 163}
166 164
167table.list td.lognotes-label { 165table.list td.commitgraph .column2 {
168 text-align:right; 166 color: #0a0;
169 vertical-align:top; 167}
168
169table.list td.commitgraph .column3 {
170 color: #aa0;
171}
172
173table.list td.commitgraph .column4 {
174 color: #00a;
175}
176
177table.list td.commitgraph .column5 {
178 color: #a0a;
170} 179}
171 180
172table.list td.lognotes { 181table.list td.commitgraph .column6 {
182 color: #0aa;
183}
184
185table.list td.logsubject {
186 font-family: monospace;
187 font-weight: bold;
188}
189
190table.list td.logmsg {
173 font-family: monospace; 191 font-family: monospace;
174 white-space: pre; 192 white-space: pre;
175 padding: 0em 0.5em 2em 0.5em; 193 padding: 0 0.5em;
176} 194}
177 195
178table.list td a { 196table.list td a {
179 color: black; 197 color: black;
180} 198}
181 199
182table.list td a.ls-dir { 200table.list td a.ls-dir {
183 font-weight: bold; 201 font-weight: bold;
184 color: #00f; 202 color: #00f;
185} 203}
186 204
187table.list td a:hover { 205table.list td a:hover {
188 color: #00f; 206 color: #00f;
189} 207}
190 208
191img { 209img {
192 border: none; 210 border: none;
193} 211}
194 212
195input#switch-btn { 213input#switch-btn {
196 margin: 2px 0px 0px 0px; 214 margin: 2px 0px 0px 0px;
197} 215}
198 216
199td#sidebar input.txt { 217td#sidebar input.txt {
200 width: 100%; 218 width: 100%;
201 margin: 2px 0px 0px 0px; 219 margin: 2px 0px 0px 0px;
202} 220}
203 221
204table#grid { 222table#grid {
205 margin: 0px; 223 margin: 0px;
206} 224}
207 225
208td#content { 226td#content {
209 vertical-align: top; 227 vertical-align: top;
210 padding: 1em 2em 1em 1em; 228 padding: 1em 2em 1em 1em;
211 border: none; 229 border: none;
212} 230}
213 231
214div#summary { 232div#summary {
215 vertical-align: top; 233 vertical-align: top;
216 margin-bottom: 1em; 234 margin-bottom: 1em;
217} 235}
218 236
219table#downloads { 237table#downloads {
220 float: right; 238 float: right;
221 border-collapse: collapse; 239 border-collapse: collapse;
222 border: solid 1px #777; 240 border: solid 1px #777;
223 margin-left: 0.5em; 241 margin-left: 0.5em;
224 margin-bottom: 0.5em; 242 margin-bottom: 0.5em;
225} 243}
226 244
227table#downloads th { 245table#downloads th {
228 background-color: #ccc; 246 background-color: #ccc;
229} 247}
230 248
231div#blob { 249div#blob {
232 border: solid 1px black; 250 border: solid 1px black;
233} 251}
234 252
235div.error { 253div.error {
236 color: red; 254 color: red;
237 font-weight: bold; 255 font-weight: bold;
238 margin: 1em 2em; 256 margin: 1em 2em;
239} 257}
240 258
241a.ls-blob, a.ls-dir, a.ls-mod { 259a.ls-blob, a.ls-dir, a.ls-mod {
242 font-family: monospace; 260 font-family: monospace;
243} 261}
244 262
245td.ls-size { 263td.ls-size {
246 text-align: right; 264 text-align: right;
247 font-family: monospace; 265 font-family: monospace;
248 width: 10em; 266 width: 10em;
249} 267}
250 268
251td.ls-mode { 269td.ls-mode {
252 font-family: monospace; 270 font-family: monospace;
253 width: 10em; 271 width: 10em;
254} 272}
255 273
256table.blob { 274table.blob {
257 margin-top: 0.5em; 275 margin-top: 0.5em;
258 border-top: solid 1px black; 276 border-top: solid 1px black;
259} 277}
260 278
261table.blob td.lines { 279table.blob td.lines {
262 margin: 0; padding: 0 0 0 0.5em; 280 margin: 0; padding: 0 0 0 0.5em;
263 vertical-align: top; 281 vertical-align: top;
264 color: black; 282 color: black;
265} 283}
266 284
267table.blob td.linenumbers { 285table.blob td.linenumbers {
268 margin: 0; padding: 0 0.5em 0 0.5em; 286 margin: 0; padding: 0 0.5em 0 0.5em;
269 vertical-align: top; 287 vertical-align: top;
270 text-align: right; 288 text-align: right;
271 border-right: 1px solid gray; 289 border-right: 1px solid gray;
diff --git a/cgit.h b/cgit.h
index f5f68ac..bed770b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,286 +1,289 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <string-list.h> 18#include <string-list.h>
19#include <xdiff-interface.h> 19#include <xdiff-interface.h>
20#include <xdiff/xdiff.h> 20#include <xdiff/xdiff.h>
21#include <utf8.h> 21#include <utf8.h>
22#include <notes.h> 22#include <notes.h>
23#include <graph.h>
23 24
24 25
25/* 26/*
26 * Dateformats used on misc. pages 27 * Dateformats used on misc. pages
27 */ 28 */
28#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" 29#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
29#define FMT_SHORTDATE "%Y-%m-%d" 30#define FMT_SHORTDATE "%Y-%m-%d"
30#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" 31#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
31 32
32 33
33/* 34/*
34 * Limits used for relative dates 35 * Limits used for relative dates
35 */ 36 */
36#define TM_MIN 60 37#define TM_MIN 60
37#define TM_HOUR (TM_MIN * 60) 38#define TM_HOUR (TM_MIN * 60)
38#define TM_DAY (TM_HOUR * 24) 39#define TM_DAY (TM_HOUR * 24)
39#define TM_WEEK (TM_DAY * 7) 40#define TM_WEEK (TM_DAY * 7)
40#define TM_YEAR (TM_DAY * 365) 41#define TM_YEAR (TM_DAY * 365)
41#define TM_MONTH (TM_YEAR / 12.0) 42#define TM_MONTH (TM_YEAR / 12.0)
42 43
43 44
44/* 45/*
45 * Default encoding 46 * Default encoding
46 */ 47 */
47#define PAGE_ENCODING "UTF-8" 48#define PAGE_ENCODING "UTF-8"
48 49
49typedef void (*configfn)(const char *name, const char *value); 50typedef void (*configfn)(const char *name, const char *value);
50typedef void (*filepair_fn)(struct diff_filepair *pair); 51typedef void (*filepair_fn)(struct diff_filepair *pair);
51typedef void (*linediff_fn)(char *line, int len); 52typedef void (*linediff_fn)(char *line, int len);
52 53
53struct cgit_filter { 54struct cgit_filter {
54 char *cmd; 55 char *cmd;
55 char **argv; 56 char **argv;
56 int old_stdout; 57 int old_stdout;
57 int pipe_fh[2]; 58 int pipe_fh[2];
58 int pid; 59 int pid;
59 int exitstatus; 60 int exitstatus;
60}; 61};
61 62
62struct cgit_repo { 63struct cgit_repo {
63 char *url; 64 char *url;
64 char *name; 65 char *name;
65 char *path; 66 char *path;
66 char *desc; 67 char *desc;
67 char *owner; 68 char *owner;
68 char *defbranch; 69 char *defbranch;
69 char *module_link; 70 char *module_link;
70 char *readme; 71 char *readme;
71 char *section; 72 char *section;
72 char *clone_url; 73 char *clone_url;
73 int snapshots; 74 int snapshots;
75 int enable_commit_graph;
74 int enable_log_filecount; 76 int enable_log_filecount;
75 int enable_log_linecount; 77 int enable_log_linecount;
76 int enable_remote_branches; 78 int enable_remote_branches;
77 int enable_subject_links; 79 int enable_subject_links;
78 int max_stats; 80 int max_stats;
79 time_t mtime; 81 time_t mtime;
80 struct cgit_filter *about_filter; 82 struct cgit_filter *about_filter;
81 struct cgit_filter *commit_filter; 83 struct cgit_filter *commit_filter;
82 struct cgit_filter *source_filter; 84 struct cgit_filter *source_filter;
83}; 85};
84 86
85typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, 87typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
86 const char *value); 88 const char *value);
87 89
88struct cgit_repolist { 90struct cgit_repolist {
89 int length; 91 int length;
90 int count; 92 int count;
91 struct cgit_repo *repos; 93 struct cgit_repo *repos;
92}; 94};
93 95
94struct commitinfo { 96struct commitinfo {
95 struct commit *commit; 97 struct commit *commit;
96 char *author; 98 char *author;
97 char *author_email; 99 char *author_email;
98 unsigned long author_date; 100 unsigned long author_date;
99 char *committer; 101 char *committer;
100 char *committer_email; 102 char *committer_email;
101 unsigned long committer_date; 103 unsigned long committer_date;
102 char *subject; 104 char *subject;
103 char *msg; 105 char *msg;
104 char *msg_encoding; 106 char *msg_encoding;
105}; 107};
106 108
107struct taginfo { 109struct taginfo {
108 char *tagger; 110 char *tagger;
109 char *tagger_email; 111 char *tagger_email;
110 unsigned long tagger_date; 112 unsigned long tagger_date;
111 char *msg; 113 char *msg;
112}; 114};
113 115
114struct refinfo { 116struct refinfo {
115 const char *refname; 117 const char *refname;
116 struct object *object; 118 struct object *object;
117 union { 119 union {
118 struct taginfo *tag; 120 struct taginfo *tag;
119 struct commitinfo *commit; 121 struct commitinfo *commit;
120 }; 122 };
121}; 123};
122 124
123struct reflist { 125struct reflist {
124 struct refinfo **refs; 126 struct refinfo **refs;
125 int alloc; 127 int alloc;
126 int count; 128 int count;
127}; 129};
128 130
129struct cgit_query { 131struct cgit_query {
130 int has_symref; 132 int has_symref;
131 int has_sha1; 133 int has_sha1;
132 char *raw; 134 char *raw;
133 char *repo; 135 char *repo;
134 char *page; 136 char *page;
135 char *search; 137 char *search;
136 char *grep; 138 char *grep;
137 char *head; 139 char *head;
138 char *sha1; 140 char *sha1;
139 char *sha2; 141 char *sha2;
140 char *path; 142 char *path;
141 char *name; 143 char *name;
142 char *mimetype; 144 char *mimetype;
143 char *url; 145 char *url;
144 char *period; 146 char *period;
145 int ofs; 147 int ofs;
146 int nohead; 148 int nohead;
147 char *sort; 149 char *sort;
148 int showmsg; 150 int showmsg;
149 int ssdiff; 151 int ssdiff;
150 int show_all; 152 int show_all;
151 int context; 153 int context;
152 int ignorews; 154 int ignorews;
153 char *vpath; 155 char *vpath;
154}; 156};
155 157
156struct cgit_config { 158struct cgit_config {
157 char *agefile; 159 char *agefile;
158 char *cache_root; 160 char *cache_root;
159 char *clone_prefix; 161 char *clone_prefix;
160 char *css; 162 char *css;
161 char *favicon; 163 char *favicon;
162 char *footer; 164 char *footer;
163 char *head_include; 165 char *head_include;
164 char *header; 166 char *header;
165 char *index_header; 167 char *index_header;
166 char *index_info; 168 char *index_info;
167 char *logo; 169 char *logo;
168 char *logo_link; 170 char *logo_link;
169 char *module_link; 171 char *module_link;
170 char *project_list; 172 char *project_list;
171 char *readme; 173 char *readme;
172 char *robots; 174 char *robots;
173 char *root_title; 175 char *root_title;
174 char *root_desc; 176 char *root_desc;
175 char *root_readme; 177 char *root_readme;
176 char *script_name; 178 char *script_name;
177 char *section; 179 char *section;
178 char *virtual_root; 180 char *virtual_root;
179 char *strict_export; 181 char *strict_export;
180 int cache_size; 182 int cache_size;
181 int cache_dynamic_ttl; 183 int cache_dynamic_ttl;
182 int cache_max_create_time; 184 int cache_max_create_time;
183 int cache_repo_ttl; 185 int cache_repo_ttl;
184 int cache_root_ttl; 186 int cache_root_ttl;
185 int cache_scanrc_ttl; 187 int cache_scanrc_ttl;
186 int cache_static_ttl; 188 int cache_static_ttl;
187 int embedded; 189 int embedded;
188 int enable_filter_overrides; 190 int enable_filter_overrides;
189 int enable_gitweb_owner; 191 int enable_gitweb_owner;
190 int enable_index_links; 192 int enable_index_links;
193 int enable_commit_graph;
191 int enable_log_filecount; 194 int enable_log_filecount;
192 int enable_log_linecount; 195 int enable_log_linecount;
193 int enable_remote_branches; 196 int enable_remote_branches;
194 int enable_subject_links; 197 int enable_subject_links;
195 int enable_tree_linenumbers; 198 int enable_tree_linenumbers;
196 int local_time; 199 int local_time;
197 int max_atom_items; 200 int max_atom_items;
198 int max_repo_count; 201 int max_repo_count;
199 int max_commit_count; 202 int max_commit_count;
200 int max_lock_attempts; 203 int max_lock_attempts;
201 int max_msg_len; 204 int max_msg_len;
202 int max_repodesc_len; 205 int max_repodesc_len;
203 int max_blob_size; 206 int max_blob_size;
204 int max_stats; 207 int max_stats;
205 int nocache; 208 int nocache;
206 int noplainemail; 209 int noplainemail;
207 int noheader; 210 int noheader;
208 int renamelimit; 211 int renamelimit;
209 int remove_suffix; 212 int remove_suffix;
210 int section_from_path; 213 int section_from_path;
211 int snapshots; 214 int snapshots;
212 int summary_branches; 215 int summary_branches;
213 int summary_log; 216 int summary_log;
214 int summary_tags; 217 int summary_tags;
215 int ssdiff; 218 int ssdiff;
216 struct string_list mimetypes; 219 struct string_list mimetypes;
217 struct cgit_filter *about_filter; 220 struct cgit_filter *about_filter;
218 struct cgit_filter *commit_filter; 221 struct cgit_filter *commit_filter;
219 struct cgit_filter *source_filter; 222 struct cgit_filter *source_filter;
220}; 223};
221 224
222struct cgit_page { 225struct cgit_page {
223 time_t modified; 226 time_t modified;
224 time_t expires; 227 time_t expires;
225 size_t size; 228 size_t size;
226 char *mimetype; 229 char *mimetype;
227 char *charset; 230 char *charset;
228 char *filename; 231 char *filename;
229 char *etag; 232 char *etag;
230 char *title; 233 char *title;
231 int status; 234 int status;
232 char *statusmsg; 235 char *statusmsg;
233}; 236};
234 237
235struct cgit_environment { 238struct cgit_environment {
236 char *cgit_config; 239 char *cgit_config;
237 char *http_host; 240 char *http_host;
238 char *https; 241 char *https;
239 char *no_http; 242 char *no_http;
240 char *path_info; 243 char *path_info;
241 char *query_string; 244 char *query_string;
242 char *request_method; 245 char *request_method;
243 char *script_name; 246 char *script_name;
244 char *server_name; 247 char *server_name;
245 char *server_port; 248 char *server_port;
246}; 249};
247 250
248struct cgit_context { 251struct cgit_context {
249 struct cgit_environment env; 252 struct cgit_environment env;
250 struct cgit_query qry; 253 struct cgit_query qry;
251 struct cgit_config cfg; 254 struct cgit_config cfg;
252 struct cgit_repo *repo; 255 struct cgit_repo *repo;
253 struct cgit_page page; 256 struct cgit_page page;
254}; 257};
255 258
256struct cgit_snapshot_format { 259struct cgit_snapshot_format {
257 const char *suffix; 260 const char *suffix;
258 const char *mimetype; 261 const char *mimetype;
259 write_archive_fn_t write_func; 262 write_archive_fn_t write_func;
260 int bit; 263 int bit;
261}; 264};
262 265
263extern const char *cgit_version; 266extern const char *cgit_version;
264 267
265extern struct cgit_repolist cgit_repolist; 268extern struct cgit_repolist cgit_repolist;
266extern struct cgit_context ctx; 269extern struct cgit_context ctx;
267extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 270extern const struct cgit_snapshot_format cgit_snapshot_formats[];
268 271
269extern struct cgit_repo *cgit_add_repo(const char *url); 272extern struct cgit_repo *cgit_add_repo(const char *url);
270extern struct cgit_repo *cgit_get_repoinfo(const char *url); 273extern struct cgit_repo *cgit_get_repoinfo(const char *url);
271extern void cgit_repo_config_cb(const char *name, const char *value); 274extern void cgit_repo_config_cb(const char *name, const char *value);
272 275
273extern int chk_zero(int result, char *msg); 276extern int chk_zero(int result, char *msg);
274extern int chk_positive(int result, char *msg); 277extern int chk_positive(int result, char *msg);
275extern int chk_non_negative(int result, char *msg); 278extern int chk_non_negative(int result, char *msg);
276 279
277extern char *trim_end(const char *str, char c); 280extern char *trim_end(const char *str, char c);
278extern char *strlpart(char *txt, int maxlen); 281extern char *strlpart(char *txt, int maxlen);
279extern char *strrpart(char *txt, int maxlen); 282extern char *strrpart(char *txt, int maxlen);
280 283
281extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 284extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
282extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 285extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
283 int flags, void *cb_data); 286 int flags, void *cb_data);
284 287
285extern void *cgit_free_commitinfo(struct commitinfo *info); 288extern void *cgit_free_commitinfo(struct commitinfo *info);
286 289
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 8e51ca5..3c20fe1 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -1,189 +1,194 @@
1:man source: cgit 1:man source: cgit
2:man manual: cgit 2:man manual: cgit
3 3
4CGITRC(5) 4CGITRC(5)
5======== 5========
6 6
7 7
8NAME 8NAME
9---- 9----
10cgitrc - runtime configuration for cgit 10cgitrc - runtime configuration for cgit
11 11
12 12
13SYNOPSIS 13SYNOPSIS
14-------- 14--------
15Cgitrc contains all runtime settings for cgit, including the list of git 15Cgitrc contains all runtime settings for cgit, including the list of git
16repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank 16repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank
17lines, and lines starting with '#', are ignored. 17lines, and lines starting with '#', are ignored.
18 18
19 19
20LOCATION 20LOCATION
21-------- 21--------
22The default location of cgitrc, defined at compile time, is /etc/cgitrc. At 22The default location of cgitrc, defined at compile time, is /etc/cgitrc. At
23runtime, cgit will consult the environment variable CGIT_CONFIG and, if 23runtime, cgit will consult the environment variable CGIT_CONFIG and, if
24defined, use its value instead. 24defined, use its value instead.
25 25
26 26
27GLOBAL SETTINGS 27GLOBAL SETTINGS
28--------------- 28---------------
29about-filter:: 29about-filter::
30 Specifies a command which will be invoked to format the content of 30 Specifies a command which will be invoked to format the content of
31 about pages (both top-level and for each repository). The command will 31 about pages (both top-level and for each repository). The command will
32 get the content of the about-file on its STDIN, and the STDOUT from the 32 get the content of the about-file on its STDIN, and the STDOUT from the
33 command will be included verbatim on the about page. Default value: 33 command will be included verbatim on the about page. Default value:
34 none. 34 none.
35 35
36agefile:: 36agefile::
37 Specifies a path, relative to each repository path, which can be used 37 Specifies a path, relative to each repository path, which can be used
38 to specify the date and time of the youngest commit in the repository. 38 to specify the date and time of the youngest commit in the repository.
39 The first line in the file is used as input to the "parse_date" 39 The first line in the file is used as input to the "parse_date"
40 function in libgit. Recommended timestamp-format is "yyyy-mm-dd 40 function in libgit. Recommended timestamp-format is "yyyy-mm-dd
41 hh:mm:ss". Default value: "info/web/last-modified". 41 hh:mm:ss". Default value: "info/web/last-modified".
42 42
43cache-root:: 43cache-root::
44 Path used to store the cgit cache entries. Default value: 44 Path used to store the cgit cache entries. Default value:
45 "/var/cache/cgit". 45 "/var/cache/cgit".
46 46
47cache-dynamic-ttl:: 47cache-dynamic-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 without a fixed SHA1. Default 49 version of repository pages accessed without a fixed SHA1. Default
50 value: "5". 50 value: "5".
51 51
52cache-repo-ttl:: 52cache-repo-ttl::
53 Number which specifies the time-to-live, in minutes, for the cached 53 Number which specifies the time-to-live, in minutes, for the cached
54 version of the repository summary page. Default value: "5". 54 version of the repository summary page. Default value: "5".
55 55
56cache-root-ttl:: 56cache-root-ttl::
57 Number which specifies the time-to-live, in minutes, for the cached 57 Number which specifies the time-to-live, in minutes, for the cached
58 version of the repository index page. Default value: "5". 58 version of the repository index page. Default value: "5".
59 59
60cache-scanrc-ttl:: 60cache-scanrc-ttl::
61 Number which specifies the time-to-live, in minutes, for the result 61 Number which specifies the time-to-live, in minutes, for the result
62 of scanning a path for git repositories. Default value: "15". 62 of scanning a path for git repositories. Default value: "15".
63 63
64cache-size:: 64cache-size::
65 The maximum number of entries in the cgit cache. Default value: "0" 65 The maximum number of entries in the cgit cache. Default value: "0"
66 (i.e. caching is disabled). 66 (i.e. caching is disabled).
67 67
68cache-static-ttl:: 68cache-static-ttl::
69 Number which specifies the time-to-live, in minutes, for the cached 69 Number which specifies the time-to-live, in minutes, for the cached
70 version of repository pages accessed with a fixed SHA1. Default value: 70 version of repository pages accessed with a fixed SHA1. Default value:
71 "5". 71 "5".
72 72
73clone-prefix:: 73clone-prefix::
74 Space-separated list of common prefixes which, when combined with a 74 Space-separated list of common prefixes which, when combined with a
75 repository url, generates valid clone urls for the repository. This 75 repository url, generates valid clone urls for the repository. This
76 setting is only used if `repo.clone-url` is unspecified. Default value: 76 setting is only used if `repo.clone-url` is unspecified. Default value:
77 none. 77 none.
78 78
79commit-filter:: 79commit-filter::
80 Specifies a command which will be invoked to format commit messages. 80 Specifies a command which will be invoked to format commit messages.
81 The command will get the message on its STDIN, and the STDOUT from the 81 The command will get the message on its STDIN, and the STDOUT from the
82 command will be included verbatim as the commit message, i.e. this can 82 command will be included verbatim as the commit message, i.e. this can
83 be used to implement bugtracker integration. Default value: none. 83 be used to implement bugtracker integration. Default value: none.
84 84
85css:: 85css::
86 Url which specifies the css document to include in all cgit pages. 86 Url which specifies the css document to include in all cgit pages.
87 Default value: "/cgit.css". 87 Default value: "/cgit.css".
88 88
89embedded:: 89embedded::
90 Flag which, when set to "1", will make cgit generate a html fragment 90 Flag which, when set to "1", will make cgit generate a html fragment
91 suitable for embedding in other html pages. Default value: none. See 91 suitable for embedding in other html pages. Default value: none. See
92 also: "noheader". 92 also: "noheader".
93 93
94enable-commit-graph::
95 Flag which, when set to "1", will make cgit print an ASCII-art commit
96 history graph to the left of the commit messages in the repository
97 log page. Default value: "0".
98
94enable-filter-overrides:: 99enable-filter-overrides::
95 Flag which, when set to "1", allows all filter settings to be 100 Flag which, when set to "1", allows all filter settings to be
96 overridden in repository-specific cgitrc files. Default value: none. 101 overridden in repository-specific cgitrc files. Default value: none.
97 102
98enable-gitweb-owner:: 103enable-gitweb-owner::
99 If set to "1" and scan-path is enabled, we first check each repository 104 If set to "1" and scan-path is enabled, we first check each repository
100 for the git config value "gitweb.owner" to determine the owner. 105 for the git config value "gitweb.owner" to determine the owner.
101 Default value: "1". See also: scan-path. 106 Default value: "1". See also: scan-path.
102 107
103enable-index-links:: 108enable-index-links::
104 Flag which, when set to "1", will make cgit generate extra links for 109 Flag which, when set to "1", will make cgit generate extra links for
105 each repo in the repository index (specifically, to the "summary", 110 each repo in the repository index (specifically, to the "summary",
106 "commit" and "tree" pages). Default value: "0". 111 "commit" and "tree" pages). Default value: "0".
107 112
108enable-log-filecount:: 113enable-log-filecount::
109 Flag which, when set to "1", will make cgit print the number of 114 Flag which, when set to "1", will make cgit print the number of
110 modified files for each commit on the repository log page. Default 115 modified files for each commit on the repository log page. Default
111 value: "0". 116 value: "0".
112 117
113enable-log-linecount:: 118enable-log-linecount::
114 Flag which, when set to "1", will make cgit print the number of added 119 Flag which, when set to "1", will make cgit print the number of added
115 and removed lines for each commit on the repository log page. Default 120 and removed lines for each commit on the repository log page. Default
116 value: "0". 121 value: "0".
117 122
118enable-remote-branches:: 123enable-remote-branches::
119 Flag which, when set to "1", will make cgit display remote branches 124 Flag which, when set to "1", will make cgit display remote branches
120 in the summary and refs views. Default value: "0". See also: 125 in the summary and refs views. Default value: "0". See also:
121 "repo.enable-remote-branches". 126 "repo.enable-remote-branches".
122 127
123enable-subject-links:: 128enable-subject-links::
124 Flag which, when set to "1", will make cgit use the subject of the 129 Flag which, when set to "1", will make cgit use the subject of the
125 parent commit as link text when generating links to parent commits 130 parent commit as link text when generating links to parent commits
126 in commit view. Default value: "0". See also: 131 in commit view. Default value: "0". See also:
127 "repo.enable-subject-links". 132 "repo.enable-subject-links".
128 133
129enable-tree-linenumbers:: 134enable-tree-linenumbers::
130 Flag which, when set to "1", will make cgit generate linenumber links 135 Flag which, when set to "1", will make cgit generate linenumber links
131 for plaintext blobs printed in the tree view. Default value: "1". 136 for plaintext blobs printed in the tree view. Default value: "1".
132 137
133favicon:: 138favicon::
134 Url used as link to a shortcut icon for cgit. If specified, it is 139 Url used as link to a shortcut icon for cgit. If specified, it is
135 suggested to use the value "/favicon.ico" since certain browsers will 140 suggested to use the value "/favicon.ico" since certain browsers will
136 ignore other values. Default value: none. 141 ignore other values. Default value: none.
137 142
138footer:: 143footer::
139 The content of the file specified with this option will be included 144 The content of the file specified with this option will be included
140 verbatim at the bottom of all pages (i.e. it replaces the standard 145 verbatim at the bottom of all pages (i.e. it replaces the standard
141 "generated by..." message. Default value: none. 146 "generated by..." message. Default value: none.
142 147
143head-include:: 148head-include::
144 The content of the file specified with this option will be included 149 The content of the file specified with this option will be included
145 verbatim in the html HEAD section on all pages. Default value: none. 150 verbatim in the html HEAD section on all pages. Default value: none.
146 151
147header:: 152header::
148 The content of the file specified with this option will be included 153 The content of the file specified with this option will be included
149 verbatim at the top of all pages. Default value: none. 154 verbatim at the top of all pages. Default value: none.
150 155
151include:: 156include::
152 Name of a configfile to include before the rest of the current config- 157 Name of a configfile to include before the rest of the current config-
153 file is parsed. Default value: none. 158 file is parsed. Default value: none.
154 159
155index-header:: 160index-header::
156 The content of the file specified with this option will be included 161 The content of the file specified with this option will be included
157 verbatim above the repository index. This setting is deprecated, and 162 verbatim above the repository index. This setting is deprecated, and
158 will not be supported by cgit-1.0 (use root-readme instead). Default 163 will not be supported by cgit-1.0 (use root-readme instead). Default
159 value: none. 164 value: none.
160 165
161index-info:: 166index-info::
162 The content of the file specified with this option will be included 167 The content of the file specified with this option will be included
163 verbatim below the heading on the repository index page. This setting 168 verbatim below the heading on the repository index page. This setting
164 is deprecated, and will not be supported by cgit-1.0 (use root-desc 169 is deprecated, and will not be supported by cgit-1.0 (use root-desc
165 instead). Default value: none. 170 instead). Default value: none.
166 171
167local-time:: 172local-time::
168 Flag which, if set to "1", makes cgit print commit and tag times in the 173 Flag which, if set to "1", makes cgit print commit and tag times in the
169 servers timezone. Default value: "0". 174 servers timezone. Default value: "0".
170 175
171logo:: 176logo::
172 Url which specifies the source of an image which will be used as a logo 177 Url which specifies the source of an image which will be used as a logo
173 on all cgit pages. Default value: "/cgit.png". 178 on all cgit pages. Default value: "/cgit.png".
174 179
175logo-link:: 180logo-link::
176 Url loaded when clicking on the cgit logo image. If unspecified the 181 Url loaded when clicking on the cgit logo image. If unspecified the
177 calculated url of the repository index page will be used. Default 182 calculated url of the repository index page will be used. Default
178 value: none. 183 value: none.
179 184
180max-atom-items:: 185max-atom-items::
181 Specifies the number of items to display in atom feeds view. Default 186 Specifies the number of items to display in atom feeds view. Default
182 value: "10". 187 value: "10".
183 188
184max-commit-count:: 189max-commit-count::
185 Specifies the number of entries to list per page in "log" view. Default 190 Specifies the number of entries to list per page in "log" view. Default
186 value: "50". 191 value: "50".
187 192
188max-message-length:: 193max-message-length::
189 Specifies the maximum number of commit message characters to display in 194 Specifies the maximum number of commit message characters to display in
@@ -261,279 +266,287 @@ root-desc::
261 value: "a fast webinterface for the git dscm". 266 value: "a fast webinterface for the git dscm".
262 267
263root-readme:: 268root-readme::
264 The content of the file specified with this option will be included 269 The content of the file specified with this option will be included
265 verbatim below the "about" link on the repository index page. Default 270 verbatim below the "about" link on the repository index page. Default
266 value: none. 271 value: none.
267 272
268root-title:: 273root-title::
269 Text printed as heading on the repository index page. Default value: 274 Text printed as heading on the repository index page. Default value:
270 "Git Repository Browser". 275 "Git Repository Browser".
271 276
272scan-path:: 277scan-path::
273 A path which will be scanned for repositories. If caching is enabled, 278 A path which will be scanned for repositories. If caching is enabled,
274 the result will be cached as a cgitrc include-file in the cache 279 the result will be cached as a cgitrc include-file in the cache
275 directory. If project-list has been defined prior to scan-path, 280 directory. If project-list has been defined prior to scan-path,
276 scan-path loads only the directories listed in the file pointed to by 281 scan-path loads only the directories listed in the file pointed to by
277 project-list. Default value: none. See also: cache-scanrc-ttl, 282 project-list. Default value: none. See also: cache-scanrc-ttl,
278 project-list. 283 project-list.
279 284
280section:: 285section::
281 The name of the current repository section - all repositories defined 286 The name of the current repository section - all repositories defined
282 after this option will inherit the current section name. Default value: 287 after this option will inherit the current section name. Default value:
283 none. 288 none.
284 289
285section-from-path:: 290section-from-path::
286 A number which, if specified before scan-path, specifies how many 291 A number which, if specified before scan-path, specifies how many
287 path elements from each repo path to use as a default section name. 292 path elements from each repo path to use as a default section name.
288 If negative, cgit will discard the specified number of path elements 293 If negative, cgit will discard the specified number of path elements
289 above the repo directory. Default value: 0. 294 above the repo directory. Default value: 0.
290 295
291side-by-side-diffs:: 296side-by-side-diffs::
292 If set to "1" shows side-by-side diffs instead of unidiffs per 297 If set to "1" shows side-by-side diffs instead of unidiffs per
293 default. Default value: "0". 298 default. Default value: "0".
294 299
295snapshots:: 300snapshots::
296 Text which specifies the default set of snapshot formats generated by 301 Text which specifies the default set of snapshot formats generated by
297 cgit. The value is a space-separated list of zero or more of the 302 cgit. The value is a space-separated list of zero or more of the
298 values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. 303 values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none.
299 304
300source-filter:: 305source-filter::
301 Specifies a command which will be invoked to format plaintext blobs 306 Specifies a command which will be invoked to format plaintext blobs
302 in the tree view. The command will get the blob content on its STDIN 307 in the tree view. The command will get the blob content on its STDIN
303 and the name of the blob as its only command line argument. The STDOUT 308 and the name of the blob as its only command line argument. The STDOUT
304 from the command will be included verbatim as the blob contents, i.e. 309 from the command will be included verbatim as the blob contents, i.e.
305 this can be used to implement e.g. syntax highlighting. Default value: 310 this can be used to implement e.g. syntax highlighting. Default value:
306 none. 311 none.
307 312
308summary-branches:: 313summary-branches::
309 Specifies the number of branches to display in the repository "summary" 314 Specifies the number of branches to display in the repository "summary"
310 view. Default value: "10". 315 view. Default value: "10".
311 316
312summary-log:: 317summary-log::
313 Specifies the number of log entries to display in the repository 318 Specifies the number of log entries to display in the repository
314 "summary" view. Default value: "10". 319 "summary" view. Default value: "10".
315 320
316summary-tags:: 321summary-tags::
317 Specifies the number of tags to display in the repository "summary" 322 Specifies the number of tags to display in the repository "summary"
318 view. Default value: "10". 323 view. Default value: "10".
319 324
320strict-export:: 325strict-export::
321 Filename which, if specified, needs to be present within the repository 326 Filename which, if specified, needs to be present within the repository
322 for cgit to allow access to that repository. This can be used to emulate 327 for cgit to allow access to that repository. This can be used to emulate
323 gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's 328 gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's
324 repositories to match those exported by git-daemon. This option MUST come 329 repositories to match those exported by git-daemon. This option MUST come
325 before 'scan-path'. 330 before 'scan-path'.
326 331
327virtual-root:: 332virtual-root::
328 Url which, if specified, will be used as root for all cgit links. It 333 Url which, if specified, will be used as root for all cgit links. It
329 will also cause cgit to generate 'virtual urls', i.e. urls like 334 will also cause cgit to generate 'virtual urls', i.e. urls like
330 '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default 335 '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default
331 value: none. 336 value: none.
332 NOTE: cgit has recently learned how to use PATH_INFO to achieve the 337 NOTE: cgit has recently learned how to use PATH_INFO to achieve the
333 same kind of virtual urls, so this option will probably be deprecated. 338 same kind of virtual urls, so this option will probably be deprecated.
334 339
335REPOSITORY SETTINGS 340REPOSITORY SETTINGS
336------------------- 341-------------------
337repo.about-filter:: 342repo.about-filter::
338 Override the default about-filter. Default value: none. See also: 343 Override the default about-filter. Default value: none. See also:
339 "enable-filter-overrides". 344 "enable-filter-overrides".
340 345
341repo.clone-url:: 346repo.clone-url::
342 A list of space-separated urls which can be used to clone this repo. 347 A list of space-separated urls which can be used to clone this repo.
343 Default value: none. 348 Default value: none.
344 349
345repo.commit-filter:: 350repo.commit-filter::
346 Override the default commit-filter. Default value: none. See also: 351 Override the default commit-filter. Default value: none. See also:
347 "enable-filter-overrides". 352 "enable-filter-overrides".
348 353
349repo.defbranch:: 354repo.defbranch::
350 The name of the default branch for this repository. If no such branch 355 The name of the default branch for this repository. If no such branch
351 exists in the repository, the first branch name (when sorted) is used 356 exists in the repository, the first branch name (when sorted) is used
352 as default instead. Default value: "master". 357 as default instead. Default value: "master".
353 358
354repo.desc:: 359repo.desc::
355 The value to show as repository description. Default value: none. 360 The value to show as repository description. Default value: none.
356 361
362repo.enable-commit-graph::
363 A flag which can be used to disable the global setting
364 `enable-commit-graph'. Default value: none.
365
357repo.enable-log-filecount:: 366repo.enable-log-filecount::
358 A flag which can be used to disable the global setting 367 A flag which can be used to disable the global setting
359 `enable-log-filecount'. Default value: none. 368 `enable-log-filecount'. Default value: none.
360 369
361repo.enable-log-linecount:: 370repo.enable-log-linecount::
362 A flag which can be used to disable the global setting 371 A flag which can be used to disable the global setting
363 `enable-log-linecount'. Default value: none. 372 `enable-log-linecount'. Default value: none.
364 373
365repo.enable-remote-branches:: 374repo.enable-remote-branches::
366 Flag which, when set to "1", will make cgit display remote branches 375 Flag which, when set to "1", will make cgit display remote branches
367 in the summary and refs views. Default value: <enable-remote-branches>. 376 in the summary and refs views. Default value: <enable-remote-branches>.
368 377
369repo.enable-subject-links:: 378repo.enable-subject-links::
370 A flag which can be used to override the global setting 379 A flag which can be used to override the global setting
371 `enable-subject-links'. Default value: none. 380 `enable-subject-links'. Default value: none.
372 381
373repo.max-stats:: 382repo.max-stats::
374 Override the default maximum statistics period. Valid values are equal 383 Override the default maximum statistics period. Valid values are equal
375 to the values specified for the global "max-stats" setting. Default 384 to the values specified for the global "max-stats" setting. Default
376 value: none. 385 value: none.
377 386
378repo.name:: 387repo.name::
379 The value to show as repository name. Default value: <repo.url>. 388 The value to show as repository name. Default value: <repo.url>.
380 389
381repo.owner:: 390repo.owner::
382 A value used to identify the owner of the repository. Default value: 391 A value used to identify the owner of the repository. Default value:
383 none. 392 none.
384 393
385repo.path:: 394repo.path::
386 An absolute path to the repository directory. For non-bare repositories 395 An absolute path to the repository directory. For non-bare repositories
387 this is the .git-directory. Default value: none. 396 this is the .git-directory. Default value: none.
388 397
389repo.readme:: 398repo.readme::
390 A path (relative to <repo.path>) which specifies a file to include 399 A path (relative to <repo.path>) which specifies a file to include
391 verbatim as the "About" page for this repo. You may also specify a 400 verbatim as the "About" page for this repo. You may also specify a
392 git refspec by head or by hash by prepending the refspec followed by 401 git refspec by head or by hash by prepending the refspec followed by
393 a colon. For example, "master:docs/readme.mkd" Default value: <readme>. 402 a colon. For example, "master:docs/readme.mkd" Default value: <readme>.
394 403
395repo.snapshots:: 404repo.snapshots::
396 A mask of allowed snapshot-formats for this repo, restricted by the 405 A mask of allowed snapshot-formats for this repo, restricted by the
397 "snapshots" global setting. Default value: <snapshots>. 406 "snapshots" global setting. Default value: <snapshots>.
398 407
399repo.section:: 408repo.section::
400 Override the current section name for this repository. Default value: 409 Override the current section name for this repository. Default value:
401 none. 410 none.
402 411
403repo.source-filter:: 412repo.source-filter::
404 Override the default source-filter. Default value: none. See also: 413 Override the default source-filter. Default value: none. See also:
405 "enable-filter-overrides". 414 "enable-filter-overrides".
406 415
407repo.url:: 416repo.url::
408 The relative url used to access the repository. This must be the first 417 The relative url used to access the repository. This must be the first
409 setting specified for each repo. Default value: none. 418 setting specified for each repo. Default value: none.
410 419
411 420
412REPOSITORY-SPECIFIC CGITRC FILE 421REPOSITORY-SPECIFIC CGITRC FILE
413------------------------------- 422-------------------------------
414When the option "scan-path" is used to auto-discover git repositories, cgit 423When the option "scan-path" is used to auto-discover git repositories, cgit
415will try to parse the file "cgitrc" within any found repository. Such a 424will try to parse the file "cgitrc" within any found repository. Such a
416repo-specific config file may contain any of the repo-specific options 425repo-specific config file may contain any of the repo-specific options
417described above, except "repo.url" and "repo.path". Additionally, the "filter" 426described above, except "repo.url" and "repo.path". Additionally, the "filter"
418options are only acknowledged in repo-specific config files when 427options are only acknowledged in repo-specific config files when
419"enable-filter-overrides" is set to "1". 428"enable-filter-overrides" is set to "1".
420 429
421Note: the "repo." prefix is dropped from the option names in repo-specific 430Note: the "repo." prefix is dropped from the option names in repo-specific
422config files, e.g. "repo.desc" becomes "desc". 431config files, e.g. "repo.desc" becomes "desc".
423 432
424 433
425EXAMPLE CGITRC FILE 434EXAMPLE CGITRC FILE
426------------------- 435-------------------
427 436
428.... 437....
429# Enable caching of up to 1000 output entriess 438# Enable caching of up to 1000 output entriess
430cache-size=1000 439cache-size=1000
431 440
432 441
433# Specify some default clone prefixes 442# Specify some default clone prefixes
434clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git 443clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
435 444
436# Specify the css url 445# Specify the css url
437css=/css/cgit.css 446css=/css/cgit.css
438 447
439 448
440# Show extra links for each repository on the index page 449# Show extra links for each repository on the index page
441enable-index-links=1 450enable-index-links=1
442 451
443 452
453# Enable ASCII art commit history graph on the log pages
454enable-commit-graph=1
455
456
444# Show number of affected files per commit on the log pages 457# Show number of affected files per commit on the log pages
445enable-log-filecount=1 458enable-log-filecount=1
446 459
447 460
448# Show number of added/removed lines per commit on the log pages 461# Show number of added/removed lines per commit on the log pages
449enable-log-linecount=1 462enable-log-linecount=1
450 463
451 464
452# Add a cgit favicon 465# Add a cgit favicon
453favicon=/favicon.ico 466favicon=/favicon.ico
454 467
455 468
456# Use a custom logo 469# Use a custom logo
457logo=/img/mylogo.png 470logo=/img/mylogo.png
458 471
459 472
460# Enable statistics per week, month and quarter 473# Enable statistics per week, month and quarter
461max-stats=quarter 474max-stats=quarter
462 475
463 476
464# Set the title and heading of the repository index page 477# Set the title and heading of the repository index page
465root-title=example.com git repositories 478root-title=example.com git repositories
466 479
467 480
468# Set a subheading for the repository index page 481# Set a subheading for the repository index page
469root-desc=tracking the foobar development 482root-desc=tracking the foobar development
470 483
471 484
472# Include some more info about example.com on the index page 485# Include some more info about example.com on the index page
473root-readme=/var/www/htdocs/about.html 486root-readme=/var/www/htdocs/about.html
474 487
475 488
476# Allow download of tar.gz, tar.bz2 and zip-files 489# Allow download of tar.gz, tar.bz2 and zip-files
477snapshots=tar.gz tar.bz2 zip 490snapshots=tar.gz tar.bz2 zip
478 491
479 492
480## 493##
481## List of common mimetypes 494## List of common mimetypes
482## 495##
483 496
484mimetype.gif=image/gif 497mimetype.gif=image/gif
485mimetype.html=text/html 498mimetype.html=text/html
486mimetype.jpg=image/jpeg 499mimetype.jpg=image/jpeg
487mimetype.jpeg=image/jpeg 500mimetype.jpeg=image/jpeg
488mimetype.pdf=application/pdf 501mimetype.pdf=application/pdf
489mimetype.png=image/png 502mimetype.png=image/png
490mimetype.svg=image/svg+xml 503mimetype.svg=image/svg+xml
491 504
492 505
493## 506##
494## List of repositories. 507## List of repositories.
495## PS: Any repositories listed when section is unset will not be 508## PS: Any repositories listed when section is unset will not be
496## displayed under a section heading 509## displayed under a section heading
497## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') 510## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
498## and included like this: 511## and included like this:
499## include=/etc/cgitrepos 512## include=/etc/cgitrepos
500## 513##
501 514
502 515
503repo.url=foo 516repo.url=foo
504repo.path=/pub/git/foo.git 517repo.path=/pub/git/foo.git
505repo.desc=the master foo repository 518repo.desc=the master foo repository
506repo.owner=fooman@example.com 519repo.owner=fooman@example.com
507repo.readme=info/web/about.html 520repo.readme=info/web/about.html
508 521
509 522
510repo.url=bar 523repo.url=bar
511repo.path=/pub/git/bar.git 524repo.path=/pub/git/bar.git
512repo.desc=the bars for your foo 525repo.desc=the bars for your foo
513repo.owner=barman@example.com 526repo.owner=barman@example.com
514repo.readme=info/web/about.html 527repo.readme=info/web/about.html
515 528
516 529
517# The next repositories will be displayed under the 'extras' heading 530# The next repositories will be displayed under the 'extras' heading
518section=extras 531section=extras
519 532
520 533
521repo.url=baz 534repo.url=baz
522repo.path=/pub/git/baz.git 535repo.path=/pub/git/baz.git
523repo.desc=a set of extensions for bar users 536repo.desc=a set of extensions for bar users
524 537
525repo.url=wiz 538repo.url=wiz
526repo.path=/pub/git/wiz.git 539repo.path=/pub/git/wiz.git
527repo.desc=the wizard of foo 540repo.desc=the wizard of foo
528 541
529 542
530# Add some mirrored repositories 543# Add some mirrored repositories
531section=mirrors 544section=mirrors
532 545
533 546
534repo.url=git 547repo.url=git
535repo.path=/pub/git/git.git 548repo.path=/pub/git/git.git
536repo.desc=the dscm 549repo.desc=the dscm
537 550
538 551
539repo.url=linux 552repo.url=linux
diff --git a/cmd.c b/cmd.c
index 6dc9f5e..536515b 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,166 +1,167 @@
1/* cmd.c: the cgit command dispatcher 1/* cmd.c: the cgit command dispatcher
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cmd.h" 10#include "cmd.h"
11#include "cache.h" 11#include "cache.h"
12#include "ui-shared.h" 12#include "ui-shared.h"
13#include "ui-atom.h" 13#include "ui-atom.h"
14#include "ui-blob.h" 14#include "ui-blob.h"
15#include "ui-clone.h" 15#include "ui-clone.h"
16#include "ui-commit.h" 16#include "ui-commit.h"
17#include "ui-diff.h" 17#include "ui-diff.h"
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
29static void HEAD_fn(struct cgit_context *ctx) 29static void HEAD_fn(struct cgit_context *ctx)
30{ 30{
31 cgit_clone_head(ctx); 31 cgit_clone_head(ctx);
32} 32}
33 33
34static void atom_fn(struct cgit_context *ctx) 34static void atom_fn(struct cgit_context *ctx)
35{ 35{
36 cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items); 36 cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items);
37} 37}
38 38
39static void about_fn(struct cgit_context *ctx) 39static void about_fn(struct cgit_context *ctx)
40{ 40{
41 if (ctx->repo) 41 if (ctx->repo)
42 cgit_print_repo_readme(ctx->qry.path); 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
47static void blob_fn(struct cgit_context *ctx) 47static 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
52static void commit_fn(struct cgit_context *ctx) 52static void commit_fn(struct cgit_context *ctx)
53{ 53{
54 cgit_print_commit(ctx->qry.sha1, ctx->qry.path); 54 cgit_print_commit(ctx->qry.sha1, ctx->qry.path);
55} 55}
56 56
57static void diff_fn(struct cgit_context *ctx) 57static 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
62static void info_fn(struct cgit_context *ctx) 62static void info_fn(struct cgit_context *ctx)
63{ 63{
64 cgit_clone_info(ctx); 64 cgit_clone_info(ctx);
65} 65}
66 66
67static void log_fn(struct cgit_context *ctx) 67static void log_fn(struct cgit_context *ctx)
68{ 68{
69 cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, 69 cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
70 ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); 70 ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1,
71 ctx->repo->enable_commit_graph);
71} 72}
72 73
73static void ls_cache_fn(struct cgit_context *ctx) 74static void ls_cache_fn(struct cgit_context *ctx)
74{ 75{
75 ctx->page.mimetype = "text/plain"; 76 ctx->page.mimetype = "text/plain";
76 ctx->page.filename = "ls-cache.txt"; 77 ctx->page.filename = "ls-cache.txt";
77 cgit_print_http_headers(ctx); 78 cgit_print_http_headers(ctx);
78 cache_ls(ctx->cfg.cache_root); 79 cache_ls(ctx->cfg.cache_root);
79} 80}
80 81
81static void objects_fn(struct cgit_context *ctx) 82static void objects_fn(struct cgit_context *ctx)
82{ 83{
83 cgit_clone_objects(ctx); 84 cgit_clone_objects(ctx);
84} 85}
85 86
86static void repolist_fn(struct cgit_context *ctx) 87static void repolist_fn(struct cgit_context *ctx)
87{ 88{
88 cgit_print_repolist(); 89 cgit_print_repolist();
89} 90}
90 91
91static void patch_fn(struct cgit_context *ctx) 92static void patch_fn(struct cgit_context *ctx)
92{ 93{
93 cgit_print_patch(ctx->qry.sha1, ctx->qry.path); 94 cgit_print_patch(ctx->qry.sha1, ctx->qry.path);
94} 95}
95 96
96static void plain_fn(struct cgit_context *ctx) 97static void plain_fn(struct cgit_context *ctx)
97{ 98{
98 cgit_print_plain(ctx); 99 cgit_print_plain(ctx);
99} 100}
100 101
101static void refs_fn(struct cgit_context *ctx) 102static void refs_fn(struct cgit_context *ctx)
102{ 103{
103 cgit_print_refs(); 104 cgit_print_refs();
104} 105}
105 106
106static void snapshot_fn(struct cgit_context *ctx) 107static void snapshot_fn(struct cgit_context *ctx)
107{ 108{
108 cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, 109 cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path,
109 ctx->repo->snapshots, ctx->qry.nohead); 110 ctx->repo->snapshots, ctx->qry.nohead);
110} 111}
111 112
112static void stats_fn(struct cgit_context *ctx) 113static void stats_fn(struct cgit_context *ctx)
113{ 114{
114 cgit_show_stats(ctx); 115 cgit_show_stats(ctx);
115} 116}
116 117
117static void summary_fn(struct cgit_context *ctx) 118static void summary_fn(struct cgit_context *ctx)
118{ 119{
119 cgit_print_summary(); 120 cgit_print_summary();
120} 121}
121 122
122static void tag_fn(struct cgit_context *ctx) 123static void tag_fn(struct cgit_context *ctx)
123{ 124{
124 cgit_print_tag(ctx->qry.sha1); 125 cgit_print_tag(ctx->qry.sha1);
125} 126}
126 127
127static void tree_fn(struct cgit_context *ctx) 128static void tree_fn(struct cgit_context *ctx)
128{ 129{
129 cgit_print_tree(ctx->qry.sha1, ctx->qry.path); 130 cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
130} 131}
131 132
132#define def_cmd(name, want_repo, want_layout, want_vpath) \ 133#define def_cmd(name, want_repo, want_layout, want_vpath) \
133 {#name, name##_fn, want_repo, want_layout, want_vpath} 134 {#name, name##_fn, want_repo, want_layout, want_vpath}
134 135
135struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) 136struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
136{ 137{
137 static struct cgit_cmd cmds[] = { 138 static struct cgit_cmd cmds[] = {
138 def_cmd(HEAD, 1, 0, 0), 139 def_cmd(HEAD, 1, 0, 0),
139 def_cmd(atom, 1, 0, 0), 140 def_cmd(atom, 1, 0, 0),
140 def_cmd(about, 0, 1, 0), 141 def_cmd(about, 0, 1, 0),
141 def_cmd(blob, 1, 0, 0), 142 def_cmd(blob, 1, 0, 0),
142 def_cmd(commit, 1, 1, 1), 143 def_cmd(commit, 1, 1, 1),
143 def_cmd(diff, 1, 1, 1), 144 def_cmd(diff, 1, 1, 1),
144 def_cmd(info, 1, 0, 0), 145 def_cmd(info, 1, 0, 0),
145 def_cmd(log, 1, 1, 1), 146 def_cmd(log, 1, 1, 1),
146 def_cmd(ls_cache, 0, 0, 0), 147 def_cmd(ls_cache, 0, 0, 0),
147 def_cmd(objects, 1, 0, 0), 148 def_cmd(objects, 1, 0, 0),
148 def_cmd(patch, 1, 0, 1), 149 def_cmd(patch, 1, 0, 1),
149 def_cmd(plain, 1, 0, 0), 150 def_cmd(plain, 1, 0, 0),
150 def_cmd(refs, 1, 1, 0), 151 def_cmd(refs, 1, 1, 0),
151 def_cmd(repolist, 0, 0, 0), 152 def_cmd(repolist, 0, 0, 0),
152 def_cmd(snapshot, 1, 0, 0), 153 def_cmd(snapshot, 1, 0, 0),
153 def_cmd(stats, 1, 1, 1), 154 def_cmd(stats, 1, 1, 1),
154 def_cmd(summary, 1, 1, 0), 155 def_cmd(summary, 1, 1, 0),
155 def_cmd(tag, 1, 1, 0), 156 def_cmd(tag, 1, 1, 0),
156 def_cmd(tree, 1, 1, 1), 157 def_cmd(tree, 1, 1, 1),
157 }; 158 };
158 int i; 159 int i;
159 160
160 if (ctx->qry.page == NULL) { 161 if (ctx->qry.page == NULL) {
161 if (ctx->repo) 162 if (ctx->repo)
162 ctx->qry.page = "summary"; 163 ctx->qry.page = "summary";
163 else 164 else
164 ctx->qry.page = "repolist"; 165 ctx->qry.page = "repolist";
165 } 166 }
166 167
diff --git a/shared.c b/shared.c
index 765cd27..7ec2e19 100644
--- a/shared.c
+++ b/shared.c
@@ -1,154 +1,155 @@
1/* shared.c: global vars + some callback functions 1/* shared.c: global vars + some callback functions
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11struct cgit_repolist cgit_repolist; 11struct cgit_repolist cgit_repolist;
12struct cgit_context ctx; 12struct cgit_context ctx;
13 13
14int chk_zero(int result, char *msg) 14int chk_zero(int result, char *msg)
15{ 15{
16 if (result != 0) 16 if (result != 0)
17 die("%s: %s", msg, strerror(errno)); 17 die("%s: %s", msg, strerror(errno));
18 return result; 18 return result;
19} 19}
20 20
21int chk_positive(int result, char *msg) 21int chk_positive(int result, char *msg)
22{ 22{
23 if (result <= 0) 23 if (result <= 0)
24 die("%s: %s", msg, strerror(errno)); 24 die("%s: %s", msg, strerror(errno));
25 return result; 25 return result;
26} 26}
27 27
28int chk_non_negative(int result, char *msg) 28int chk_non_negative(int result, char *msg)
29{ 29{
30 if (result < 0) 30 if (result < 0)
31 die("%s: %s",msg, strerror(errno)); 31 die("%s: %s",msg, strerror(errno));
32 return result; 32 return result;
33} 33}
34 34
35struct cgit_repo *cgit_add_repo(const char *url) 35struct cgit_repo *cgit_add_repo(const char *url)
36{ 36{
37 struct cgit_repo *ret; 37 struct cgit_repo *ret;
38 38
39 if (++cgit_repolist.count > cgit_repolist.length) { 39 if (++cgit_repolist.count > cgit_repolist.length) {
40 if (cgit_repolist.length == 0) 40 if (cgit_repolist.length == 0)
41 cgit_repolist.length = 8; 41 cgit_repolist.length = 8;
42 else 42 else
43 cgit_repolist.length *= 2; 43 cgit_repolist.length *= 2;
44 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 44 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
45 cgit_repolist.length * 45 cgit_repolist.length *
46 sizeof(struct cgit_repo)); 46 sizeof(struct cgit_repo));
47 } 47 }
48 48
49 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 49 ret = &cgit_repolist.repos[cgit_repolist.count-1];
50 memset(ret, 0, sizeof(struct cgit_repo)); 50 memset(ret, 0, sizeof(struct cgit_repo));
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->section = ctx.cfg.section; 56 ret->section = ctx.cfg.section;
57 ret->defbranch = "master"; 57 ret->defbranch = "master";
58 ret->snapshots = ctx.cfg.snapshots; 58 ret->snapshots = ctx.cfg.snapshots;
59 ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
59 ret->enable_log_filecount = ctx.cfg.enable_log_filecount; 60 ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
60 ret->enable_log_linecount = ctx.cfg.enable_log_linecount; 61 ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
61 ret->enable_remote_branches = ctx.cfg.enable_remote_branches; 62 ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
62 ret->enable_subject_links = ctx.cfg.enable_subject_links; 63 ret->enable_subject_links = ctx.cfg.enable_subject_links;
63 ret->max_stats = ctx.cfg.max_stats; 64 ret->max_stats = ctx.cfg.max_stats;
64 ret->module_link = ctx.cfg.module_link; 65 ret->module_link = ctx.cfg.module_link;
65 ret->readme = ctx.cfg.readme; 66 ret->readme = ctx.cfg.readme;
66 ret->mtime = -1; 67 ret->mtime = -1;
67 ret->about_filter = ctx.cfg.about_filter; 68 ret->about_filter = ctx.cfg.about_filter;
68 ret->commit_filter = ctx.cfg.commit_filter; 69 ret->commit_filter = ctx.cfg.commit_filter;
69 ret->source_filter = ctx.cfg.source_filter; 70 ret->source_filter = ctx.cfg.source_filter;
70 return ret; 71 return ret;
71} 72}
72 73
73struct cgit_repo *cgit_get_repoinfo(const char *url) 74struct cgit_repo *cgit_get_repoinfo(const char *url)
74{ 75{
75 int i; 76 int i;
76 struct cgit_repo *repo; 77 struct cgit_repo *repo;
77 78
78 for (i=0; i<cgit_repolist.count; i++) { 79 for (i=0; i<cgit_repolist.count; i++) {
79 repo = &cgit_repolist.repos[i]; 80 repo = &cgit_repolist.repos[i];
80 if (!strcmp(repo->url, url)) 81 if (!strcmp(repo->url, url))
81 return repo; 82 return repo;
82 } 83 }
83 return NULL; 84 return NULL;
84} 85}
85 86
86void *cgit_free_commitinfo(struct commitinfo *info) 87void *cgit_free_commitinfo(struct commitinfo *info)
87{ 88{
88 free(info->author); 89 free(info->author);
89 free(info->author_email); 90 free(info->author_email);
90 free(info->committer); 91 free(info->committer);
91 free(info->committer_email); 92 free(info->committer_email);
92 free(info->subject); 93 free(info->subject);
93 free(info->msg); 94 free(info->msg);
94 free(info->msg_encoding); 95 free(info->msg_encoding);
95 free(info); 96 free(info);
96 return NULL; 97 return NULL;
97} 98}
98 99
99char *trim_end(const char *str, char c) 100char *trim_end(const char *str, char c)
100{ 101{
101 int len; 102 int len;
102 char *s, *t; 103 char *s, *t;
103 104
104 if (str == NULL) 105 if (str == NULL)
105 return NULL; 106 return NULL;
106 t = (char *)str; 107 t = (char *)str;
107 len = strlen(t); 108 len = strlen(t);
108 while(len > 0 && t[len - 1] == c) 109 while(len > 0 && t[len - 1] == c)
109 len--; 110 len--;
110 111
111 if (len == 0) 112 if (len == 0)
112 return NULL; 113 return NULL;
113 114
114 c = t[len]; 115 c = t[len];
115 t[len] = '\0'; 116 t[len] = '\0';
116 s = xstrdup(t); 117 s = xstrdup(t);
117 t[len] = c; 118 t[len] = c;
118 return s; 119 return s;
119} 120}
120 121
121char *strlpart(char *txt, int maxlen) 122char *strlpart(char *txt, int maxlen)
122{ 123{
123 char *result; 124 char *result;
124 125
125 if (!txt) 126 if (!txt)
126 return txt; 127 return txt;
127 128
128 if (strlen(txt) <= maxlen) 129 if (strlen(txt) <= maxlen)
129 return txt; 130 return txt;
130 result = xmalloc(maxlen + 1); 131 result = xmalloc(maxlen + 1);
131 memcpy(result, txt, maxlen - 3); 132 memcpy(result, txt, maxlen - 3);
132 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; 133 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
133 result[maxlen] = '\0'; 134 result[maxlen] = '\0';
134 return result; 135 return result;
135} 136}
136 137
137char *strrpart(char *txt, int maxlen) 138char *strrpart(char *txt, int maxlen)
138{ 139{
139 char *result; 140 char *result;
140 141
141 if (!txt) 142 if (!txt)
142 return txt; 143 return txt;
143 144
144 if (strlen(txt) <= maxlen) 145 if (strlen(txt) <= maxlen)
145 return txt; 146 return txt;
146 result = xmalloc(maxlen + 1); 147 result = xmalloc(maxlen + 1);
147 memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); 148 memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
148 result[0] = result[1] = result[2] = '.'; 149 result[0] = result[1] = result[2] = '.';
149 return result; 150 return result;
150} 151}
151 152
152void cgit_add_ref(struct reflist *list, struct refinfo *ref) 153void cgit_add_ref(struct reflist *list, struct refinfo *ref)
153{ 154{
154 size_t size; 155 size_t size;
diff --git a/ui-log.c b/ui-log.c
index 27f5a1a..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,301 +1,428 @@
1/* ui-log.c: functions for log output 1/* ui-log.c: functions for log output
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12#include "vector.h" 12#include "vector.h"
13 13
14int files, add_lines, rem_lines; 14int files, add_lines, rem_lines;
15 15
16/*
17 * The list of available column colors in the commit graph.
18 */
19static const char *column_colors_html[] = {
20 "<span class='column1'>",
21 "<span class='column2'>",
22 "<span class='column3'>",
23 "<span class='column4'>",
24 "<span class='column5'>",
25 "<span class='column6'>",
26 "</span>",
27};
28
29#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
30
16void count_lines(char *line, int size) 31void count_lines(char *line, int size)
17{ 32{
18 if (size <= 0) 33 if (size <= 0)
19 return; 34 return;
20 35
21 if (line[0] == '+') 36 if (line[0] == '+')
22 add_lines++; 37 add_lines++;
23 38
24 else if (line[0] == '-') 39 else if (line[0] == '-')
25 rem_lines++; 40 rem_lines++;
26} 41}
27 42
28void inspect_files(struct diff_filepair *pair) 43void inspect_files(struct diff_filepair *pair)
29{ 44{
30 unsigned long old_size = 0; 45 unsigned long old_size = 0;
31 unsigned long new_size = 0; 46 unsigned long new_size = 0;
32 int binary = 0; 47 int binary = 0;
33 48
34 files++; 49 files++;
35 if (ctx.repo->enable_log_linecount) 50 if (ctx.repo->enable_log_linecount)
36 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 51 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
37 &new_size, &binary, 0, ctx.qry.ignorews, 52 &new_size, &binary, 0, ctx.qry.ignorews,
38 count_lines); 53 count_lines);
39} 54}
40 55
41void show_commit_decorations(struct commit *commit) 56void show_commit_decorations(struct commit *commit)
42{ 57{
43 struct name_decoration *deco; 58 struct name_decoration *deco;
44 static char buf[1024]; 59 static char buf[1024];
45 60
46 buf[sizeof(buf) - 1] = 0; 61 buf[sizeof(buf) - 1] = 0;
47 deco = lookup_decoration(&name_decoration, &commit->object); 62 deco = lookup_decoration(&name_decoration, &commit->object);
48 while (deco) { 63 while (deco) {
49 if (!prefixcmp(deco->name, "refs/heads/")) { 64 if (!prefixcmp(deco->name, "refs/heads/")) {
50 strncpy(buf, deco->name + 11, sizeof(buf) - 1); 65 strncpy(buf, deco->name + 11, sizeof(buf) - 1);
51 cgit_log_link(buf, NULL, "branch-deco", buf, NULL, 66 cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
52 ctx.qry.vpath, 0, NULL, NULL, 67 ctx.qry.vpath, 0, NULL, NULL,
53 ctx.qry.showmsg); 68 ctx.qry.showmsg);
54 } 69 }
55 else if (!prefixcmp(deco->name, "tag: refs/tags/")) { 70 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
56 strncpy(buf, deco->name + 15, sizeof(buf) - 1); 71 strncpy(buf, deco->name + 15, sizeof(buf) - 1);
57 cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); 72 cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
58 } 73 }
59 else if (!prefixcmp(deco->name, "refs/tags/")) { 74 else if (!prefixcmp(deco->name, "refs/tags/")) {
60 strncpy(buf, deco->name + 10, sizeof(buf) - 1); 75 strncpy(buf, deco->name + 10, sizeof(buf) - 1);
61 cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); 76 cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
62 } 77 }
63 else if (!prefixcmp(deco->name, "refs/remotes/")) { 78 else if (!prefixcmp(deco->name, "refs/remotes/")) {
64 strncpy(buf, deco->name + 13, sizeof(buf) - 1); 79 strncpy(buf, deco->name + 13, sizeof(buf) - 1);
65 cgit_log_link(buf, NULL, "remote-deco", NULL, 80 cgit_log_link(buf, NULL, "remote-deco", NULL,
66 sha1_to_hex(commit->object.sha1), 81 sha1_to_hex(commit->object.sha1),
67 ctx.qry.vpath, 0, NULL, NULL, 82 ctx.qry.vpath, 0, NULL, NULL,
68 ctx.qry.showmsg); 83 ctx.qry.showmsg);
69 } 84 }
70 else { 85 else {
71 strncpy(buf, deco->name, sizeof(buf) - 1); 86 strncpy(buf, deco->name, sizeof(buf) - 1);
72 cgit_commit_link(buf, NULL, "deco", ctx.qry.head, 87 cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
73 sha1_to_hex(commit->object.sha1), 88 sha1_to_hex(commit->object.sha1),
74 ctx.qry.vpath, 0); 89 ctx.qry.vpath, 0);
75 } 90 }
76 deco = deco->next; 91 deco = deco->next;
77 } 92 }
78} 93}
79 94
80void print_commit(struct commit *commit) 95void print_commit(struct commit *commit, struct rev_info *revs)
81{ 96{
82 struct commitinfo *info; 97 struct commitinfo *info;
83 char *tmp; 98 char *tmp;
84 int cols = 2; 99 int cols = revs->graph ? 3 : 2;
100 struct strbuf graphbuf = STRBUF_INIT;
101 struct strbuf msgbuf = STRBUF_INIT;
102
103 if (ctx.repo->enable_log_filecount) {
104 cols++;
105 if (ctx.repo->enable_log_linecount)
106 cols++;
107 }
108
109 if (revs->graph) {
110 /* Advance graph until current commit */
111 while (!graph_next_line(revs->graph, &graphbuf)) {
112 /* Print graph segment in otherwise empty table row */
113 html("<tr class='nohover'><td class='commitgraph'>");
114 html(graphbuf.buf);
115 htmlf("</td><td colspan='%d' /></tr>\n", cols);
116 strbuf_setlen(&graphbuf, 0);
117 }
118 /* Current commit's graph segment is now ready in graphbuf */
119 }
85 120
86 info = cgit_parse_commit(commit); 121 info = cgit_parse_commit(commit);
87 htmlf("<tr%s><td>", 122 htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
88 ctx.qry.showmsg ? " class='logheader'" : ""); 123
124 if (revs->graph) {
125 /* Print graph segment for current commit */
126 html("<td class='commitgraph'>");
127 html(graphbuf.buf);
128 html("</td>");
129 strbuf_setlen(&graphbuf, 0);
130 }
131 else {
132 html("<td>");
89 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 133 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
90 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); 134 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
91 html_link_open(tmp, NULL, NULL); 135 html_link_open(tmp, NULL, NULL);
92 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 136 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
93 html_link_close(); 137 html_link_close();
94 htmlf("</td><td%s>", 138 html("</td>");
95 ctx.qry.showmsg ? " class='logsubject'" : ""); 139 }
140
141 htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
142 if (ctx.qry.showmsg) {
143 /* line-wrap long commit subjects instead of truncating them */
144 size_t subject_len = strlen(info->subject);
145
146 if (subject_len > ctx.cfg.max_msg_len &&
147 ctx.cfg.max_msg_len >= 15) {
148 /* symbol for signaling line-wrap (in PAGE_ENCODING) */
149 const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
150 int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
151
152 /* Rewind i to preceding space character */
153 while (i > 0 && !isspace(info->subject[i]))
154 --i;
155 if (!i) /* Oops, zero spaces. Reset i */
156 i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
157
158 /* add remainder starting at i to msgbuf */
159 strbuf_add(&msgbuf, info->subject + i, subject_len - i);
160 strbuf_trim(&msgbuf);
161 strbuf_add(&msgbuf, "\n\n", 2);
162
163 /* Place wrap_symbol at position i in info->subject */
164 strcpy(info->subject + i, wrap_symbol);
165 }
166 }
96 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 167 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
97 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); 168 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
98 show_commit_decorations(commit); 169 show_commit_decorations(commit);
99 html("</td><td>"); 170 html("</td><td>");
100 html_txt(info->author); 171 html_txt(info->author);
172
173 if (revs->graph) {
174 html("</td><td>");
175 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
176 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
177 html_link_open(tmp, NULL, NULL);
178 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
179 html_link_close();
180 }
181
101 if (ctx.repo->enable_log_filecount) { 182 if (ctx.repo->enable_log_filecount) {
102 files = 0; 183 files = 0;
103 add_lines = 0; 184 add_lines = 0;
104 rem_lines = 0; 185 rem_lines = 0;
105 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); 186 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
106 html("</td><td>"); 187 html("</td><td>");
107 htmlf("%d", files); 188 htmlf("%d", files);
108 if (ctx.repo->enable_log_linecount) { 189 if (ctx.repo->enable_log_linecount) {
109 html("</td><td>"); 190 html("</td><td>");
110 htmlf("-%d/+%d", rem_lines, add_lines); 191 htmlf("-%d/+%d", rem_lines, add_lines);
111 } 192 }
112 } 193 }
113 html("</td></tr>\n"); 194 html("</td></tr>\n");
195
196 if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
197 html("<tr class='nohover'>");
198
114 if (ctx.qry.showmsg) { 199 if (ctx.qry.showmsg) {
115 struct strbuf notes = STRBUF_INIT; 200 /* Concatenate commit message + notes in msgbuf */
116 format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0); 201 if (info->msg && *(info->msg)) {
202 strbuf_addstr(&msgbuf, info->msg);
203 strbuf_addch(&msgbuf, '\n');
204 }
205 format_note(NULL, commit->object.sha1, &msgbuf,
206 PAGE_ENCODING,
207 NOTES_SHOW_HEADER | NOTES_INDENT);
208 strbuf_addch(&msgbuf, '\n');
209 strbuf_ltrim(&msgbuf);
210 }
117 211
118 if (ctx.repo->enable_log_filecount) { 212 if (revs->graph) {
119 cols++; 213 int lines = 0;
120 if (ctx.repo->enable_log_linecount) 214
121 cols++; 215 /* Calculate graph padding */
216 if (ctx.qry.showmsg) {
217 /* Count #lines in commit message + notes */
218 const char *p = msgbuf.buf;
219 lines = 1;
220 while ((p = strchr(p, '\n'))) {
221 p++;
222 lines++;
122 } 223 }
123 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
124 cols);
125 html_txt(info->msg);
126 html("</td></tr>\n");
127 if (notes.len != 0) {
128 html("<tr class='nohover'>");
129 html("<td class='lognotes-label'>Notes:</td>");
130 htmlf("<td colspan='%d' class='lognotes'>",
131 cols);
132 html_txt(notes.buf);
133 html("</td></tr>\n");
134 } 224 }
135 strbuf_release(&notes); 225
226 /* Print graph padding */
227 html("<td class='commitgraph'>");
228 while (lines > 0 || !graph_is_commit_finished(revs->graph)) {
229 if (graphbuf.len)
230 html("\n");
231 strbuf_setlen(&graphbuf, 0);
232 graph_next_line(revs->graph, &graphbuf);
233 html(graphbuf.buf);
234 lines--;
235 }
236 html("</td>\n");
237 }
238 else
239 html("<td/>"); /* Empty 'Age' column */
240
241 /* Print msgbuf into remainder of table row */
242 htmlf("<td colspan='%d'%s>\n", cols,
243 ctx.qry.showmsg ? " class='logmsg'" : "");
244 html_txt(msgbuf.buf);
245 html("</td></tr>\n");
136 } 246 }
247
248 strbuf_release(&msgbuf);
249 strbuf_release(&graphbuf);
137 cgit_free_commitinfo(info); 250 cgit_free_commitinfo(info);
138} 251}
139 252
140static const char *disambiguate_ref(const char *ref) 253static const char *disambiguate_ref(const char *ref)
141{ 254{
142 unsigned char sha1[20]; 255 unsigned char sha1[20];
143 const char *longref; 256 const char *longref;
144 257
145 longref = fmt("refs/heads/%s", ref); 258 longref = fmt("refs/heads/%s", ref);
146 if (get_sha1(longref, sha1) == 0) 259 if (get_sha1(longref, sha1) == 0)
147 return longref; 260 return longref;
148 261
149 return ref; 262 return ref;
150} 263}
151 264
152static char *next_token(char **src) 265static char *next_token(char **src)
153{ 266{
154 char *result; 267 char *result;
155 268
156 if (!src || !*src) 269 if (!src || !*src)
157 return NULL; 270 return NULL;
158 while (isspace(**src)) 271 while (isspace(**src))
159 (*src)++; 272 (*src)++;
160 if (!**src) 273 if (!**src)
161 return NULL; 274 return NULL;
162 result = *src; 275 result = *src;
163 while (**src) { 276 while (**src) {
164 if (isspace(**src)) { 277 if (isspace(**src)) {
165 **src = '\0'; 278 **src = '\0';
166 (*src)++; 279 (*src)++;
167 break; 280 break;
168 } 281 }
169 (*src)++; 282 (*src)++;
170 } 283 }
171 return result; 284 return result;
172} 285}
173 286
174void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, 287void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
175 char *path, int pager) 288 char *path, int pager, int commit_graph)
176{ 289{
177 struct rev_info rev; 290 struct rev_info rev;
178 struct commit *commit; 291 struct commit *commit;
179 struct vector vec = VECTOR_INIT(char *); 292 struct vector vec = VECTOR_INIT(char *);
180 int i, columns = 3; 293 int i, columns = 3;
181 char *arg; 294 char *arg;
182 295
183 /* First argv is NULL */ 296 /* First argv is NULL */
184 vector_push(&vec, NULL, 0); 297 vector_push(&vec, NULL, 0);
185 298
186 if (!tip) 299 if (!tip)
187 tip = ctx.qry.head; 300 tip = ctx.qry.head;
188 tip = disambiguate_ref(tip); 301 tip = disambiguate_ref(tip);
189 vector_push(&vec, &tip, 0); 302 vector_push(&vec, &tip, 0);
190 303
191 if (grep && pattern && *pattern) { 304 if (grep && pattern && *pattern) {
192 pattern = xstrdup(pattern); 305 pattern = xstrdup(pattern);
193 if (!strcmp(grep, "grep") || !strcmp(grep, "author") || 306 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
194 !strcmp(grep, "committer")) { 307 !strcmp(grep, "committer")) {
195 arg = fmt("--%s=%s", grep, pattern); 308 arg = fmt("--%s=%s", grep, pattern);
196 vector_push(&vec, &arg, 0); 309 vector_push(&vec, &arg, 0);
197 } 310 }
198 if (!strcmp(grep, "range")) { 311 if (!strcmp(grep, "range")) {
199 /* Split the pattern at whitespace and add each token 312 /* Split the pattern at whitespace and add each token
200 * as a revision expression. Do not accept other 313 * as a revision expression. Do not accept other
201 * rev-list options. Also, replace the previously 314 * rev-list options. Also, replace the previously
202 * pushed tip (it's no longer relevant). 315 * pushed tip (it's no longer relevant).
203 */ 316 */
204 vec.count--; 317 vec.count--;
205 while ((arg = next_token(&pattern))) { 318 while ((arg = next_token(&pattern))) {
206 if (*arg == '-') { 319 if (*arg == '-') {
207 fprintf(stderr, "Bad range expr: %s\n", 320 fprintf(stderr, "Bad range expr: %s\n",
208 arg); 321 arg);
209 break; 322 break;
210 } 323 }
211 vector_push(&vec, &arg, 0); 324 vector_push(&vec, &arg, 0);
212 } 325 }
213 } 326 }
214 } 327 }
328 if (commit_graph) {
329 static const char *graph_arg = "--graph";
330 static const char *color_arg = "--color";
331 vector_push(&vec, &graph_arg, 0);
332 vector_push(&vec, &color_arg, 0);
333 graph_set_column_colors(column_colors_html,
334 COLUMN_COLORS_HTML_MAX);
335 }
215 336
216 if (path) { 337 if (path) {
217 arg = "--"; 338 arg = "--";
218 vector_push(&vec, &arg, 0); 339 vector_push(&vec, &arg, 0);
219 vector_push(&vec, &path, 0); 340 vector_push(&vec, &path, 0);
220 } 341 }
221 342
222 /* Make sure the vector is NULL-terminated */ 343 /* Make sure the vector is NULL-terminated */
223 vector_push(&vec, NULL, 0); 344 vector_push(&vec, NULL, 0);
224 vec.count--; 345 vec.count--;
225 346
226 init_revisions(&rev, NULL); 347 init_revisions(&rev, NULL);
227 rev.abbrev = DEFAULT_ABBREV; 348 rev.abbrev = DEFAULT_ABBREV;
228 rev.commit_format = CMIT_FMT_DEFAULT; 349 rev.commit_format = CMIT_FMT_DEFAULT;
229 rev.verbose_header = 1; 350 rev.verbose_header = 1;
230 rev.show_root_diff = 0; 351 rev.show_root_diff = 0;
231 setup_revisions(vec.count, vec.data, &rev, NULL); 352 setup_revisions(vec.count, vec.data, &rev, NULL);
232 load_ref_decorations(DECORATE_FULL_REFS); 353 load_ref_decorations(DECORATE_FULL_REFS);
233 rev.show_decorations = 1; 354 rev.show_decorations = 1;
234 rev.grep_filter.regflags |= REG_ICASE; 355 rev.grep_filter.regflags |= REG_ICASE;
235 compile_grep_patterns(&rev.grep_filter); 356 compile_grep_patterns(&rev.grep_filter);
236 prepare_revision_walk(&rev); 357 prepare_revision_walk(&rev);
237 358
238 if (pager) 359 if (pager)
239 html("<table class='list nowrap'>"); 360 html("<table class='list nowrap'>");
240 361
241 html("<tr class='nohover'><th class='left'>Age</th>" 362 html("<tr class='nohover'>");
242 "<th class='left'>Commit message"); 363 if (commit_graph)
364 html("<th></th>");
365 else
366 html("<th class='left'>Age</th>");
367 html("<th class='left'>Commit message");
243 if (pager) { 368 if (pager) {
244 html(" ("); 369 html(" (");
245 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, 370 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
246 NULL, ctx.qry.head, ctx.qry.sha1, 371 NULL, ctx.qry.head, ctx.qry.sha1,
247 ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, 372 ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
248 ctx.qry.search, ctx.qry.showmsg ? 0 : 1); 373 ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
249 html(")"); 374 html(")");
250 } 375 }
251 html("</th><th class='left'>Author</th>"); 376 html("</th><th class='left'>Author</th>");
377 if (commit_graph)
378 html("<th class='left'>Age</th>");
252 if (ctx.repo->enable_log_filecount) { 379 if (ctx.repo->enable_log_filecount) {
253 html("<th class='left'>Files</th>"); 380 html("<th class='left'>Files</th>");
254 columns++; 381 columns++;
255 if (ctx.repo->enable_log_linecount) { 382 if (ctx.repo->enable_log_linecount) {
256 html("<th class='left'>Lines</th>"); 383 html("<th class='left'>Lines</th>");
257 columns++; 384 columns++;
258 } 385 }
259 } 386 }
260 html("</tr>\n"); 387 html("</tr>\n");
261 388
262 if (ofs<0) 389 if (ofs<0)
263 ofs = 0; 390 ofs = 0;
264 391
265 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 392 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
266 free(commit->buffer); 393 free(commit->buffer);
267 commit->buffer = NULL; 394 commit->buffer = NULL;
268 free_commit_list(commit->parents); 395 free_commit_list(commit->parents);
269 commit->parents = NULL; 396 commit->parents = NULL;
270 } 397 }
271 398
272 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 399 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
273 print_commit(commit); 400 print_commit(commit, &rev);
274 free(commit->buffer); 401 free(commit->buffer);
275 commit->buffer = NULL; 402 commit->buffer = NULL;
276 free_commit_list(commit->parents); 403 free_commit_list(commit->parents);
277 commit->parents = NULL; 404 commit->parents = NULL;
278 } 405 }
279 if (pager) { 406 if (pager) {
280 html("</table><div class='pager'>"); 407 html("</table><div class='pager'>");
281 if (ofs > 0) { 408 if (ofs > 0) {
282 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, 409 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
283 ctx.qry.sha1, ctx.qry.vpath, 410 ctx.qry.sha1, ctx.qry.vpath,
284 ofs - cnt, ctx.qry.grep, 411 ofs - cnt, ctx.qry.grep,
285 ctx.qry.search, ctx.qry.showmsg); 412 ctx.qry.search, ctx.qry.showmsg);
286 html("&nbsp;"); 413 html("&nbsp;");
287 } 414 }
288 if ((commit = get_revision(&rev)) != NULL) { 415 if ((commit = get_revision(&rev)) != NULL) {
289 cgit_log_link("[next]", NULL, NULL, ctx.qry.head, 416 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
290 ctx.qry.sha1, ctx.qry.vpath, 417 ctx.qry.sha1, ctx.qry.vpath,
291 ofs + cnt, ctx.qry.grep, 418 ofs + cnt, ctx.qry.grep,
292 ctx.qry.search, ctx.qry.showmsg); 419 ctx.qry.search, ctx.qry.showmsg);
293 } 420 }
294 html("</div>"); 421 html("</div>");
295 } else if ((commit = get_revision(&rev)) != NULL) { 422 } else if ((commit = get_revision(&rev)) != NULL) {
296 html("<tr class='nohover'><td colspan='3'>"); 423 html("<tr class='nohover'><td colspan='3'>");
297 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, 424 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
298 ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); 425 ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
299 html("</td></tr>\n"); 426 html("</td></tr>\n");
300 } 427 }
301} 428}
diff --git a/ui-log.h b/ui-log.h
index 6034055..d0cb779 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -1,8 +1,9 @@
1#ifndef UI_LOG_H 1#ifndef UI_LOG_H
2#define UI_LOG_H 2#define UI_LOG_H
3 3
4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
5 char *pattern, char *path, int pager); 5 char *pattern, char *path, int pager,
6 int commit_graph);
6extern void show_commit_decorations(struct commit *commit); 7extern void show_commit_decorations(struct commit *commit);
7 8
8#endif /* UI_LOG_H */ 9#endif /* UI_LOG_H */
diff --git a/ui-summary.c b/ui-summary.c
index b203bcc..5be2545 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,124 +1,124 @@
1/* ui-summary.c: functions for generating repo summary page 1/* ui-summary.c: functions for generating repo summary page
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 "html.h" 11#include "html.h"
12#include "ui-log.h" 12#include "ui-log.h"
13#include "ui-refs.h" 13#include "ui-refs.h"
14#include "ui-blob.h" 14#include "ui-blob.h"
15 15
16int urls = 0; 16int urls = 0;
17 17
18static void print_url(char *base, char *suffix) 18static void print_url(char *base, char *suffix)
19{ 19{
20 if (!base || !*base) 20 if (!base || !*base)
21 return; 21 return;
22 if (urls++ == 0) { 22 if (urls++ == 0) {
23 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 23 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
24 html("<tr><th class='left' colspan='4'>Clone</th></tr>\n"); 24 html("<tr><th class='left' colspan='4'>Clone</th></tr>\n");
25 } 25 }
26 if (suffix && *suffix) 26 if (suffix && *suffix)
27 base = fmt("%s/%s", base, suffix); 27 base = fmt("%s/%s", base, suffix);
28 html("<tr><td colspan='4'><a href='"); 28 html("<tr><td colspan='4'><a href='");
29 html_url_path(base); 29 html_url_path(base);
30 html("'>"); 30 html("'>");
31 html_txt(base); 31 html_txt(base);
32 html("</a></td></tr>\n"); 32 html("</a></td></tr>\n");
33} 33}
34 34
35static void print_urls(char *txt, char *suffix) 35static void print_urls(char *txt, char *suffix)
36{ 36{
37 char *h = txt, *t, c; 37 char *h = txt, *t, c;
38 38
39 while (h && *h) { 39 while (h && *h) {
40 while (h && *h == ' ') 40 while (h && *h == ' ')
41 h++; 41 h++;
42 t = h; 42 t = h;
43 while (t && *t && *t != ' ') 43 while (t && *t && *t != ' ')
44 t++; 44 t++;
45 c = *t; 45 c = *t;
46 *t = 0; 46 *t = 0;
47 print_url(h, suffix); 47 print_url(h, suffix);
48 *t = c; 48 *t = c;
49 h = t; 49 h = t;
50 } 50 }
51} 51}
52 52
53void cgit_print_summary() 53void cgit_print_summary()
54{ 54{
55 html("<table summary='repository info' class='list nowrap'>"); 55 html("<table summary='repository info' class='list nowrap'>");
56 cgit_print_branches(ctx.cfg.summary_branches); 56 cgit_print_branches(ctx.cfg.summary_branches);
57 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 57 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
58 cgit_print_tags(ctx.cfg.summary_tags); 58 cgit_print_tags(ctx.cfg.summary_tags);
59 if (ctx.cfg.summary_log > 0) { 59 if (ctx.cfg.summary_log > 0) {
60 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 60 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
61 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, 61 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
62 NULL, NULL, 0); 62 NULL, NULL, 0, 0);
63 } 63 }
64 if (ctx.repo->clone_url) 64 if (ctx.repo->clone_url)
65 print_urls(ctx.repo->clone_url, NULL); 65 print_urls(ctx.repo->clone_url, NULL);
66 else if (ctx.cfg.clone_prefix) 66 else if (ctx.cfg.clone_prefix)
67 print_urls(ctx.cfg.clone_prefix, ctx.repo->url); 67 print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
68 html("</table>"); 68 html("</table>");
69} 69}
70 70
71void cgit_print_repo_readme(char *path) 71void cgit_print_repo_readme(char *path)
72{ 72{
73 char *slash, *tmp, *colon, *ref; 73 char *slash, *tmp, *colon, *ref;
74 74
75 if (!ctx.repo->readme || !(*ctx.repo->readme)) 75 if (!ctx.repo->readme || !(*ctx.repo->readme))
76 return; 76 return;
77 77
78 ref = NULL; 78 ref = NULL;
79 79
80 /* Check if the readme is tracked in the git repo. */ 80 /* Check if the readme is tracked in the git repo. */
81 colon = strchr(ctx.repo->readme, ':'); 81 colon = strchr(ctx.repo->readme, ':');
82 if (colon && strlen(colon) > 1) { 82 if (colon && strlen(colon) > 1) {
83 *colon = '\0'; 83 *colon = '\0';
84 ref = ctx.repo->readme; 84 ref = ctx.repo->readme;
85 ctx.repo->readme = colon + 1; 85 ctx.repo->readme = colon + 1;
86 if (!(*ctx.repo->readme)) 86 if (!(*ctx.repo->readme))
87 return; 87 return;
88 } 88 }
89 89
90 /* Prepend repo path to relative readme path unless tracked. */ 90 /* Prepend repo path to relative readme path unless tracked. */
91 if (!ref && *ctx.repo->readme != '/') 91 if (!ref && *ctx.repo->readme != '/')
92 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, 92 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
93 ctx.repo->readme)); 93 ctx.repo->readme));
94 94
95 /* If a subpath is specified for the about page, make it relative 95 /* If a subpath is specified for the about page, make it relative
96 * to the directory containing the configured readme. 96 * to the directory containing the configured readme.
97 */ 97 */
98 if (path) { 98 if (path) {
99 slash = strrchr(ctx.repo->readme, '/'); 99 slash = strrchr(ctx.repo->readme, '/');
100 if (!slash) { 100 if (!slash) {
101 if (!colon) 101 if (!colon)
102 return; 102 return;
103 slash = colon; 103 slash = colon;
104 } 104 }
105 tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); 105 tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
106 strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); 106 strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
107 strcpy(tmp + (slash - ctx.repo->readme + 1), path); 107 strcpy(tmp + (slash - ctx.repo->readme + 1), path);
108 } else 108 } else
109 tmp = ctx.repo->readme; 109 tmp = ctx.repo->readme;
110 110
111 /* Print the calculated readme, either from the git repo or from the 111 /* Print the calculated readme, either from the git repo or from the
112 * filesystem, while applying the about-filter. 112 * filesystem, while applying the about-filter.
113 */ 113 */
114 html("<div id='summary'>"); 114 html("<div id='summary'>");
115 if (ctx.repo->about_filter) 115 if (ctx.repo->about_filter)
116 cgit_open_filter(ctx.repo->about_filter); 116 cgit_open_filter(ctx.repo->about_filter);
117 if (ref) 117 if (ref)
118 cgit_print_file(tmp, ref); 118 cgit_print_file(tmp, ref);
119 else 119 else
120 html_include(tmp); 120 html_include(tmp);
121 if (ctx.repo->about_filter) 121 if (ctx.repo->about_filter)
122 cgit_close_filter(ctx.repo->about_filter); 122 cgit_close_filter(ctx.repo->about_filter);
123 html("</div>"); 123 html("</div>");
124} 124}