]> gitweb.ps.run Git - ps-cgit/blob - ui-log.c
ui-log: Move 'Age' column when commit graph is present
[ps-cgit] / ui-log.c
1 /* ui-log.c: functions for log output
2  *
3  * Copyright (C) 2006 Lars Hjemli
4  *
5  * Licensed under GNU General Public License v2
6  *   (see COPYING for full license text)
7  */
8
9 #include "cgit.h"
10 #include "html.h"
11 #include "ui-shared.h"
12 #include "vector.h"
13
14 int files, add_lines, rem_lines;
15
16 /*
17  * The list of available column colors in the commit graph.
18  */
19 static 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
31 void count_lines(char *line, int size)
32 {
33         if (size <= 0)
34                 return;
35
36         if (line[0] == '+')
37                 add_lines++;
38
39         else if (line[0] == '-')
40                 rem_lines++;
41 }
42
43 void inspect_files(struct diff_filepair *pair)
44 {
45         unsigned long old_size = 0;
46         unsigned long new_size = 0;
47         int binary = 0;
48
49         files++;
50         if (ctx.repo->enable_log_linecount)
51                 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
52                                 &new_size, &binary, 0, ctx.qry.ignorews,
53                                 count_lines);
54 }
55
56 void show_commit_decorations(struct commit *commit)
57 {
58         struct name_decoration *deco;
59         static char buf[1024];
60
61         buf[sizeof(buf) - 1] = 0;
62         deco = lookup_decoration(&name_decoration, &commit->object);
63         while (deco) {
64                 if (!prefixcmp(deco->name, "refs/heads/")) {
65                         strncpy(buf, deco->name + 11, sizeof(buf) - 1);
66                         cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
67                                       ctx.qry.vpath, 0, NULL, NULL,
68                                       ctx.qry.showmsg);
69                 }
70                 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
71                         strncpy(buf, deco->name + 15, sizeof(buf) - 1);
72                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
73                 }
74                 else if (!prefixcmp(deco->name, "refs/tags/")) {
75                         strncpy(buf, deco->name + 10, sizeof(buf) - 1);
76                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
77                 }
78                 else if (!prefixcmp(deco->name, "refs/remotes/")) {
79                         strncpy(buf, deco->name + 13, sizeof(buf) - 1);
80                         cgit_log_link(buf, NULL, "remote-deco", NULL,
81                                       sha1_to_hex(commit->object.sha1),
82                                       ctx.qry.vpath, 0, NULL, NULL,
83                                       ctx.qry.showmsg);
84                 }
85                 else {
86                         strncpy(buf, deco->name, sizeof(buf) - 1);
87                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
88                                          sha1_to_hex(commit->object.sha1),
89                                          ctx.qry.vpath, 0);
90                 }
91                 deco = deco->next;
92         }
93 }
94
95 void print_commit(struct commit *commit, struct rev_info *revs)
96 {
97         struct commitinfo *info;
98         char *tmp;
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         }
120
121         info = cgit_parse_commit(commit);
122         htmlf("<tr%s>", 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>");
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         }
167         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
168                          sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
169         show_commit_decorations(commit);
170         html("</td><td>");
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
182         if (ctx.repo->enable_log_filecount) {
183                 files = 0;
184                 add_lines = 0;
185                 rem_lines = 0;
186                 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
187                 html("</td><td>");
188                 htmlf("%d", files);
189                 if (ctx.repo->enable_log_linecount) {
190                         html("</td><td>");
191                         htmlf("-%d/+%d", rem_lines, add_lines);
192                 }
193         }
194         html("</td></tr>\n");
195
196         if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
197                 html("<tr class='nohover'>");
198
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");
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");
246         }
247
248         strbuf_release(&msgbuf);
249         strbuf_release(&graphbuf);
250         cgit_free_commitinfo(info);
251 }
252
253 static const char *disambiguate_ref(const char *ref)
254 {
255         unsigned char sha1[20];
256         const char *longref;
257
258         longref = fmt("refs/heads/%s", ref);
259         if (get_sha1(longref, sha1) == 0)
260                 return longref;
261
262         return ref;
263 }
264
265 static 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
287 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
288                     char *path, int pager, int commit_graph)
289 {
290         struct rev_info rev;
291         struct commit *commit;
292         struct vector vec = VECTOR_INIT(char *);
293         int i, columns = 3;
294         char *arg;
295
296         /* First argv is NULL */
297         vector_push(&vec, NULL, 0);
298
299         if (!tip)
300                 tip = ctx.qry.head;
301         tip = disambiguate_ref(tip);
302         vector_push(&vec, &tip, 0);
303
304         if (grep && pattern && *pattern) {
305                 pattern = xstrdup(pattern);
306                 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
307                     !strcmp(grep, "committer")) {
308                         arg = 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         }
336
337         if (path) {
338                 arg = "--";
339                 vector_push(&vec, &arg, 0);
340                 vector_push(&vec, &path, 0);
341         }
342
343         /* Make sure the vector is NULL-terminated */
344         vector_push(&vec, NULL, 0);
345         vec.count--;
346
347         init_revisions(&rev, NULL);
348         rev.abbrev = DEFAULT_ABBREV;
349         rev.commit_format = CMIT_FMT_DEFAULT;
350         rev.verbose_header = 1;
351         rev.show_root_diff = 0;
352         setup_revisions(vec.count, vec.data, &rev, NULL);
353         load_ref_decorations(DECORATE_FULL_REFS);
354         rev.show_decorations = 1;
355         rev.grep_filter.regflags |= REG_ICASE;
356         compile_grep_patterns(&rev.grep_filter);
357         prepare_revision_walk(&rev);
358
359         if (pager)
360                 html("<table class='list nowrap'>");
361
362         html("<tr class='nohover'>");
363         if (commit_graph)
364                 html("<th></th>");
365         else
366                 html("<th class='left'>Age</th>");
367         html("<th class='left'>Commit message");
368         if (pager) {
369                 html(" (");
370                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
371                               NULL, ctx.qry.head, ctx.qry.sha1,
372                               ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
373                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
374                 html(")");
375         }
376         html("</th><th class='left'>Author</th>");
377         if (commit_graph)
378                 html("<th class='left'>Age</th>");
379         if (ctx.repo->enable_log_filecount) {
380                 html("<th class='left'>Files</th>");
381                 columns++;
382                 if (ctx.repo->enable_log_linecount) {
383                         html("<th class='left'>Lines</th>");
384                         columns++;
385                 }
386         }
387         html("</tr>\n");
388
389         if (ofs<0)
390                 ofs = 0;
391
392         for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
393                 free(commit->buffer);
394                 commit->buffer = NULL;
395                 free_commit_list(commit->parents);
396                 commit->parents = NULL;
397         }
398
399         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
400                 print_commit(commit, &rev);
401                 free(commit->buffer);
402                 commit->buffer = NULL;
403                 free_commit_list(commit->parents);
404                 commit->parents = NULL;
405         }
406         if (pager) {
407                 html("</table><div class='pager'>");
408                 if (ofs > 0) {
409                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
410                                       ctx.qry.sha1, ctx.qry.vpath,
411                                       ofs - cnt, ctx.qry.grep,
412                                       ctx.qry.search, ctx.qry.showmsg);
413                         html("&nbsp;");
414                 }
415                 if ((commit = get_revision(&rev)) != NULL) {
416                         cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
417                                       ctx.qry.sha1, ctx.qry.vpath,
418                                       ofs + cnt, ctx.qry.grep,
419                                       ctx.qry.search, ctx.qry.showmsg);
420                 }
421                 html("</div>");
422         } else if ((commit = get_revision(&rev)) != NULL) {
423                 html("<tr class='nohover'><td colspan='3'>");
424                 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
425                               ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
426                 html("</td></tr>\n");
427         }
428 }