aboutsummaryrefslogtreecommitdiffstats
path: root/ui-log.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c292
1 files changed, 243 insertions, 49 deletions
diff --git a/ui-log.c b/ui-log.c
index f3132c9..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -9,9 +9,25 @@
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 13
13int files, add_lines, rem_lines; 14int files, add_lines, rem_lines;
14 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
15void count_lines(char *line, int size) 31void count_lines(char *line, int size)
16{ 32{
17 if (size <= 0) 33 if (size <= 0)
@@ -33,7 +49,8 @@ void inspect_files(struct diff_filepair *pair)
33 files++; 49 files++;
34 if (ctx.repo->enable_log_linecount) 50 if (ctx.repo->enable_log_linecount)
35 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 51 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
36 &new_size, &binary, count_lines); 52 &new_size, &binary, 0, ctx.qry.ignorews,
53 count_lines);
37} 54}
38 55
39void show_commit_decorations(struct commit *commit) 56void show_commit_decorations(struct commit *commit)
@@ -46,8 +63,9 @@ void show_commit_decorations(struct commit *commit)
46 while (deco) { 63 while (deco) {
47 if (!prefixcmp(deco->name, "refs/heads/")) { 64 if (!prefixcmp(deco->name, "refs/heads/")) {
48 strncpy(buf, deco->name + 11, sizeof(buf) - 1); 65 strncpy(buf, deco->name + 11, sizeof(buf) - 1);
49 cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, 66 cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
50 0, NULL, NULL, ctx.qry.showmsg); 67 ctx.qry.vpath, 0, NULL, NULL,
68 ctx.qry.showmsg);
51 } 69 }
52 else if (!prefixcmp(deco->name, "tag: refs/tags/")) { 70 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
53 strncpy(buf, deco->name + 15, sizeof(buf) - 1); 71 strncpy(buf, deco->name + 15, sizeof(buf) - 1);
@@ -60,44 +78,112 @@ void show_commit_decorations(struct commit *commit)
60 else if (!prefixcmp(deco->name, "refs/remotes/")) { 78 else if (!prefixcmp(deco->name, "refs/remotes/")) {
61 strncpy(buf, deco->name + 13, sizeof(buf) - 1); 79 strncpy(buf, deco->name + 13, sizeof(buf) - 1);
62 cgit_log_link(buf, NULL, "remote-deco", NULL, 80 cgit_log_link(buf, NULL, "remote-deco", NULL,
63 sha1_to_hex(commit->object.sha1), NULL, 81 sha1_to_hex(commit->object.sha1),
64 0, NULL, NULL, ctx.qry.showmsg); 82 ctx.qry.vpath, 0, NULL, NULL,
83 ctx.qry.showmsg);
65 } 84 }
66 else { 85 else {
67 strncpy(buf, deco->name, sizeof(buf) - 1); 86 strncpy(buf, deco->name, sizeof(buf) - 1);
68 cgit_commit_link(buf, NULL, "deco", ctx.qry.head, 87 cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
69 sha1_to_hex(commit->object.sha1)); 88 sha1_to_hex(commit->object.sha1),
89 ctx.qry.vpath, 0);
70 } 90 }
71 deco = deco->next; 91 deco = deco->next;
72 } 92 }
73} 93}
74 94
75void print_commit(struct commit *commit) 95void print_commit(struct commit *commit, struct rev_info *revs)
76{ 96{
77 struct commitinfo *info; 97 struct commitinfo *info;
78 char *tmp; 98 char *tmp;
79 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 }
80 120
81 info = cgit_parse_commit(commit); 121 info = cgit_parse_commit(commit);
82 htmlf("<tr%s><td>", 122 htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
83 ctx.qry.showmsg ? " class='logheader'" : ""); 123
84 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 124 if (revs->graph) {
85 tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); 125 /* Print graph segment for current commit */
86 html_link_open(tmp, NULL, NULL); 126 html("<td class='commitgraph'>");
87 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 127 html(graphbuf.buf);
88 html_link_close(); 128 html("</td>");
89 htmlf("</td><td%s>", 129 strbuf_setlen(&graphbuf, 0);
90 ctx.qry.showmsg ? " class='logsubject'" : ""); 130 }
131 else {
132 html("<td>");
133 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
134 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
135 html_link_open(tmp, NULL, NULL);
136 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
137 html_link_close();
138 html("</td>");
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 }
91 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 167 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
92 sha1_to_hex(commit->object.sha1)); 168 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
93 show_commit_decorations(commit); 169 show_commit_decorations(commit);
94 html("</td><td>"); 170 html("</td><td>");
95 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
96 if (ctx.repo->enable_log_filecount) { 182 if (ctx.repo->enable_log_filecount) {
97 files = 0; 183 files = 0;
98 add_lines = 0; 184 add_lines = 0;
99 rem_lines = 0; 185 rem_lines = 0;
100 cgit_diff_commit(commit, inspect_files); 186 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
101 html("</td><td>"); 187 html("</td><td>");
102 htmlf("%d", files); 188 htmlf("%d", files);
103 if (ctx.repo->enable_log_linecount) { 189 if (ctx.repo->enable_log_linecount) {
@@ -106,17 +192,61 @@ void print_commit(struct commit *commit)
106 } 192 }
107 } 193 }
108 html("</td></tr>\n"); 194 html("</td></tr>\n");
109 if (ctx.qry.showmsg) { 195
110 if (ctx.repo->enable_log_filecount) { 196 if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
111 cols++; 197 html("<tr class='nohover'>");
112 if (ctx.repo->enable_log_linecount) 198
113 cols++; 199 if (ctx.qry.showmsg) {
200 /* Concatenate commit message + notes in msgbuf */
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 }
211
212 if (revs->graph) {
213 int lines = 0;
214
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++;
223 }
224 }
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");
114 } 237 }
115 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", 238 else
116 cols); 239 html("<td/>"); /* Empty 'Age' column */
117 html_txt(info->msg); 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);
118 html("</td></tr>\n"); 245 html("</td></tr>\n");
119 } 246 }
247
248 strbuf_release(&msgbuf);
249 strbuf_release(&graphbuf);
120 cgit_free_commitinfo(info); 250 cgit_free_commitinfo(info);
121} 251}
122 252
@@ -132,35 +262,94 @@ static const char *disambiguate_ref(const char *ref)
132 return ref; 262 return ref;
133} 263}
134 264
265static char *next_token(char **src)
266{
267 char *result;
268
269 if (!src || !*src)
270 return NULL;
271 while (isspace(**src))
272 (*src)++;
273 if (!**src)
274 return NULL;
275 result = *src;
276 while (**src) {
277 if (isspace(**src)) {
278 **src = '\0';
279 (*src)++;
280 break;
281 }
282 (*src)++;
283 }
284 return result;
285}
286
135void 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,
136 char *path, int pager) 288 char *path, int pager, int commit_graph)
137{ 289{
138 struct rev_info rev; 290 struct rev_info rev;
139 struct commit *commit; 291 struct commit *commit;
140 const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; 292 struct vector vec = VECTOR_INIT(char *);
141 int argc = 2;
142 int i, columns = 3; 293 int i, columns = 3;
294 char *arg;
295
296 /* First argv is NULL */
297 vector_push(&vec, NULL, 0);
143 298
144 if (!tip) 299 if (!tip)
145 tip = ctx.qry.head; 300 tip = ctx.qry.head;
301 tip = disambiguate_ref(tip);
302 vector_push(&vec, &tip, 0);
146 303
147 argv[1] = disambiguate_ref(tip); 304 if (grep && pattern && *pattern) {
148 305 pattern = xstrdup(pattern);
149 if (grep && pattern && (!strcmp(grep, "grep") || 306 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
150 !strcmp(grep, "author") || 307 !strcmp(grep, "committer")) {
151 !strcmp(grep, "committer"))) 308 arg = fmt("--%s=%s", grep, pattern);
152 argv[argc++] = fmt("--%s=%s", grep, pattern); 309 vector_push(&vec, &arg, 0);
310 }
311 if (!strcmp(grep, "range")) {
312 /* Split the pattern at whitespace and add each token
313 * as a revision expression. Do not accept other
314 * rev-list options. Also, replace the previously
315 * pushed tip (it's no longer relevant).
316 */
317 vec.count--;
318 while ((arg = next_token(&pattern))) {
319 if (*arg == '-') {
320 fprintf(stderr, "Bad range expr: %s\n",
321 arg);
322 break;
323 }
324 vector_push(&vec, &arg, 0);
325 }
326 }
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 }
153 336
154 if (path) { 337 if (path) {
155 argv[argc++] = "--"; 338 arg = "--";
156 argv[argc++] = path; 339 vector_push(&vec, &arg, 0);
340 vector_push(&vec, &path, 0);
157 } 341 }
342
343 /* Make sure the vector is NULL-terminated */
344 vector_push(&vec, NULL, 0);
345 vec.count--;
346
158 init_revisions(&rev, NULL); 347 init_revisions(&rev, NULL);
159 rev.abbrev = DEFAULT_ABBREV; 348 rev.abbrev = DEFAULT_ABBREV;
160 rev.commit_format = CMIT_FMT_DEFAULT; 349 rev.commit_format = CMIT_FMT_DEFAULT;
161 rev.verbose_header = 1; 350 rev.verbose_header = 1;
162 rev.show_root_diff = 0; 351 rev.show_root_diff = 0;
163 setup_revisions(argc, argv, &rev, NULL); 352 setup_revisions(vec.count, vec.data, &rev, NULL);
164 load_ref_decorations(DECORATE_FULL_REFS); 353 load_ref_decorations(DECORATE_FULL_REFS);
165 rev.show_decorations = 1; 354 rev.show_decorations = 1;
166 rev.grep_filter.regflags |= REG_ICASE; 355 rev.grep_filter.regflags |= REG_ICASE;
@@ -170,17 +359,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
170 if (pager) 359 if (pager)
171 html("<table class='list nowrap'>"); 360 html("<table class='list nowrap'>");
172 361
173 html("<tr class='nohover'><th class='left'>Age</th>" 362 html("<tr class='nohover'>");
174 "<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");
175 if (pager) { 368 if (pager) {
176 html(" ("); 369 html(" (");
177 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, 370 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
178 NULL, ctx.qry.head, ctx.qry.sha1, 371 NULL, ctx.qry.head, ctx.qry.sha1,
179 ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, 372 ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
180 ctx.qry.search, ctx.qry.showmsg ? 0 : 1); 373 ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
181 html(")"); 374 html(")");
182 } 375 }
183 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>");
184 if (ctx.repo->enable_log_filecount) { 379 if (ctx.repo->enable_log_filecount) {
185 html("<th class='left'>Files</th>"); 380 html("<th class='left'>Files</th>");
186 columns++; 381 columns++;
@@ -202,33 +397,32 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
202 } 397 }
203 398
204 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 399 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
205 print_commit(commit); 400 print_commit(commit, &rev);
206 free(commit->buffer); 401 free(commit->buffer);
207 commit->buffer = NULL; 402 commit->buffer = NULL;
208 free_commit_list(commit->parents); 403 free_commit_list(commit->parents);
209 commit->parents = NULL; 404 commit->parents = NULL;
210 } 405 }
211 if (pager) { 406 if (pager) {
212 htmlf("</table><div class='pager'>", 407 html("</table><div class='pager'>");
213 columns);
214 if (ofs > 0) { 408 if (ofs > 0) {
215 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, 409 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
216 ctx.qry.sha1, ctx.qry.path, 410 ctx.qry.sha1, ctx.qry.vpath,
217 ofs - cnt, ctx.qry.grep, 411 ofs - cnt, ctx.qry.grep,
218 ctx.qry.search, ctx.qry.showmsg); 412 ctx.qry.search, ctx.qry.showmsg);
219 html("&nbsp;"); 413 html("&nbsp;");
220 } 414 }
221 if ((commit = get_revision(&rev)) != NULL) { 415 if ((commit = get_revision(&rev)) != NULL) {
222 cgit_log_link("[next]", NULL, NULL, ctx.qry.head, 416 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
223 ctx.qry.sha1, ctx.qry.path, 417 ctx.qry.sha1, ctx.qry.vpath,
224 ofs + cnt, ctx.qry.grep, 418 ofs + cnt, ctx.qry.grep,
225 ctx.qry.search, ctx.qry.showmsg); 419 ctx.qry.search, ctx.qry.showmsg);
226 } 420 }
227 html("</div>"); 421 html("</div>");
228 } else if ((commit = get_revision(&rev)) != NULL) { 422 } else if ((commit = get_revision(&rev)) != NULL) {
229 html("<tr class='nohover'><td colspan='3'>"); 423 html("<tr class='nohover'><td colspan='3'>");
230 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, 424 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
231 NULL, NULL, ctx.qry.showmsg); 425 ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
232 html("</td></tr>\n"); 426 html("</td></tr>\n");
233 } 427 }
234} 428}