]> git.cameronkatri.com Git - cgit.git/blob - ui-log.c
ui-log: Implement support for commit graphs
[cgit.git] / 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 void count_lines(char *line, int size)
17 {
18 if (size <= 0)
19 return;
20
21 if (line[0] == '+')
22 add_lines++;
23
24 else if (line[0] == '-')
25 rem_lines++;
26 }
27
28 void inspect_files(struct diff_filepair *pair)
29 {
30 unsigned long old_size = 0;
31 unsigned long new_size = 0;
32 int binary = 0;
33
34 files++;
35 if (ctx.repo->enable_log_linecount)
36 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
37 &new_size, &binary, 0, ctx.qry.ignorews,
38 count_lines);
39 }
40
41 void show_commit_decorations(struct commit *commit)
42 {
43 struct name_decoration *deco;
44 static char buf[1024];
45
46 buf[sizeof(buf) - 1] = 0;
47 deco = lookup_decoration(&name_decoration, &commit->object);
48 while (deco) {
49 if (!prefixcmp(deco->name, "refs/heads/")) {
50 strncpy(buf, deco->name + 11, sizeof(buf) - 1);
51 cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
52 ctx.qry.vpath, 0, NULL, NULL,
53 ctx.qry.showmsg);
54 }
55 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
56 strncpy(buf, deco->name + 15, sizeof(buf) - 1);
57 cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
58 }
59 else if (!prefixcmp(deco->name, "refs/tags/")) {
60 strncpy(buf, deco->name + 10, sizeof(buf) - 1);
61 cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
62 }
63 else if (!prefixcmp(deco->name, "refs/remotes/")) {
64 strncpy(buf, deco->name + 13, sizeof(buf) - 1);
65 cgit_log_link(buf, NULL, "remote-deco", NULL,
66 sha1_to_hex(commit->object.sha1),
67 ctx.qry.vpath, 0, NULL, NULL,
68 ctx.qry.showmsg);
69 }
70 else {
71 strncpy(buf, deco->name, sizeof(buf) - 1);
72 cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
73 sha1_to_hex(commit->object.sha1),
74 ctx.qry.vpath, 0);
75 }
76 deco = deco->next;
77 }
78 }
79
80 void print_commit(struct commit *commit, struct rev_info *revs)
81 {
82 struct commitinfo *info;
83 char *tmp;
84 int cols = 2;
85 struct strbuf graphbuf = STRBUF_INIT;
86
87 if (ctx.repo->enable_log_filecount) {
88 cols++;
89 if (ctx.repo->enable_log_linecount)
90 cols++;
91 }
92
93 if (revs->graph) {
94 /* Advance graph until current commit */
95 while (!graph_next_line(revs->graph, &graphbuf)) {
96 /* Print graph segment in otherwise empty table row */
97 html("<tr class='nohover'><td/><td class='commitgraph'>");
98 html(graphbuf.buf);
99 htmlf("</td><td colspan='%d' /></tr>\n", cols);
100 strbuf_setlen(&graphbuf, 0);
101 }
102 /* Current commit's graph segment is now ready in graphbuf */
103 }
104
105 info = cgit_parse_commit(commit);
106 htmlf("<tr%s><td>",
107 ctx.qry.showmsg ? " class='logheader'" : "");
108 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
109 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
110 html_link_open(tmp, NULL, NULL);
111 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
112 html_link_close();
113 html("</td>");
114
115 if (revs->graph) {
116 /* Print graph segment for current commit */
117 html("<td class='commitgraph'>");
118 html(graphbuf.buf);
119 html("</td>");
120 strbuf_setlen(&graphbuf, 0);
121 }
122
123 htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
124 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
125 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
126 show_commit_decorations(commit);
127 html("</td><td>");
128 html_txt(info->author);
129 if (ctx.repo->enable_log_filecount) {
130 files = 0;
131 add_lines = 0;
132 rem_lines = 0;
133 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
134 html("</td><td>");
135 htmlf("%d", files);
136 if (ctx.repo->enable_log_linecount) {
137 html("</td><td>");
138 htmlf("-%d/+%d", rem_lines, add_lines);
139 }
140 }
141 html("</td></tr>\n");
142
143 if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
144 struct strbuf msgbuf = STRBUF_INIT;
145 html("<tr class='nohover'><td/>"); /* Empty 'Age' column */
146
147 if (ctx.qry.showmsg) {
148 /* Concatenate commit message + notes in msgbuf */
149 if (info->msg && *(info->msg)) {
150 strbuf_addstr(&msgbuf, info->msg);
151 strbuf_addch(&msgbuf, '\n');
152 }
153 format_note(NULL, commit->object.sha1, &msgbuf,
154 PAGE_ENCODING,
155 NOTES_SHOW_HEADER | NOTES_INDENT);
156 strbuf_addch(&msgbuf, '\n');
157 strbuf_ltrim(&msgbuf);
158 }
159
160 if (revs->graph) {
161 int lines = 0;
162
163 /* Calculate graph padding */
164 if (ctx.qry.showmsg) {
165 /* Count #lines in commit message + notes */
166 const char *p = msgbuf.buf;
167 lines = 1;
168 while ((p = strchr(p, '\n'))) {
169 p++;
170 lines++;
171 }
172 }
173
174 /* Print graph padding */
175 html("<td class='commitgraph'>");
176 while (lines > 0 || !graph_is_commit_finished(revs->graph)) {
177 if (graphbuf.len)
178 html("\n");
179 strbuf_setlen(&graphbuf, 0);
180 graph_next_line(revs->graph, &graphbuf);
181 html(graphbuf.buf);
182 lines--;
183 }
184 html("</td>\n");
185 }
186
187 /* Print msgbuf into remainder of table row */
188 htmlf("<td colspan='%d'%s>\n", cols,
189 ctx.qry.showmsg ? " class='logmsg'" : "");
190 html_txt(msgbuf.buf);
191 html("</td></tr>\n");
192 strbuf_release(&msgbuf);
193 }
194
195 strbuf_release(&graphbuf);
196 cgit_free_commitinfo(info);
197 }
198
199 static const char *disambiguate_ref(const char *ref)
200 {
201 unsigned char sha1[20];
202 const char *longref;
203
204 longref = fmt("refs/heads/%s", ref);
205 if (get_sha1(longref, sha1) == 0)
206 return longref;
207
208 return ref;
209 }
210
211 static char *next_token(char **src)
212 {
213 char *result;
214
215 if (!src || !*src)
216 return NULL;
217 while (isspace(**src))
218 (*src)++;
219 if (!**src)
220 return NULL;
221 result = *src;
222 while (**src) {
223 if (isspace(**src)) {
224 **src = '\0';
225 (*src)++;
226 break;
227 }
228 (*src)++;
229 }
230 return result;
231 }
232
233 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
234 char *path, int pager)
235 {
236 struct rev_info rev;
237 struct commit *commit;
238 struct vector vec = VECTOR_INIT(char *);
239 int i, columns = 3;
240 char *arg;
241
242 /* First argv is NULL */
243 vector_push(&vec, NULL, 0);
244
245 if (!tip)
246 tip = ctx.qry.head;
247 tip = disambiguate_ref(tip);
248 vector_push(&vec, &tip, 0);
249
250 if (grep && pattern && *pattern) {
251 pattern = xstrdup(pattern);
252 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
253 !strcmp(grep, "committer")) {
254 arg = fmt("--%s=%s", grep, pattern);
255 vector_push(&vec, &arg, 0);
256 }
257 if (!strcmp(grep, "range")) {
258 /* Split the pattern at whitespace and add each token
259 * as a revision expression. Do not accept other
260 * rev-list options. Also, replace the previously
261 * pushed tip (it's no longer relevant).
262 */
263 vec.count--;
264 while ((arg = next_token(&pattern))) {
265 if (*arg == '-') {
266 fprintf(stderr, "Bad range expr: %s\n",
267 arg);
268 break;
269 }
270 vector_push(&vec, &arg, 0);
271 }
272 }
273 }
274 if (ctx.repo->enable_commit_graph) {
275 static const char *graph_arg = "--graph";
276 vector_push(&vec, &graph_arg, 0);
277 }
278
279 if (path) {
280 arg = "--";
281 vector_push(&vec, &arg, 0);
282 vector_push(&vec, &path, 0);
283 }
284
285 /* Make sure the vector is NULL-terminated */
286 vector_push(&vec, NULL, 0);
287 vec.count--;
288
289 init_revisions(&rev, NULL);
290 rev.abbrev = DEFAULT_ABBREV;
291 rev.commit_format = CMIT_FMT_DEFAULT;
292 rev.verbose_header = 1;
293 rev.show_root_diff = 0;
294 setup_revisions(vec.count, vec.data, &rev, NULL);
295 load_ref_decorations(DECORATE_FULL_REFS);
296 rev.show_decorations = 1;
297 rev.grep_filter.regflags |= REG_ICASE;
298 compile_grep_patterns(&rev.grep_filter);
299 prepare_revision_walk(&rev);
300
301 if (pager)
302 html("<table class='list nowrap'>");
303
304 html("<tr class='nohover'><th class='left'>Age</th>");
305 if (ctx.repo->enable_commit_graph)
306 html("<th></th>");
307 html("<th class='left'>Commit message");
308 if (pager) {
309 html(" (");
310 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
311 NULL, ctx.qry.head, ctx.qry.sha1,
312 ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
313 ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
314 html(")");
315 }
316 html("</th><th class='left'>Author</th>");
317 if (ctx.repo->enable_log_filecount) {
318 html("<th class='left'>Files</th>");
319 columns++;
320 if (ctx.repo->enable_log_linecount) {
321 html("<th class='left'>Lines</th>");
322 columns++;
323 }
324 }
325 html("</tr>\n");
326
327 if (ofs<0)
328 ofs = 0;
329
330 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
331 free(commit->buffer);
332 commit->buffer = NULL;
333 free_commit_list(commit->parents);
334 commit->parents = NULL;
335 }
336
337 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
338 print_commit(commit, &rev);
339 free(commit->buffer);
340 commit->buffer = NULL;
341 free_commit_list(commit->parents);
342 commit->parents = NULL;
343 }
344 if (pager) {
345 html("</table><div class='pager'>");
346 if (ofs > 0) {
347 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
348 ctx.qry.sha1, ctx.qry.vpath,
349 ofs - cnt, ctx.qry.grep,
350 ctx.qry.search, ctx.qry.showmsg);
351 html("&nbsp;");
352 }
353 if ((commit = get_revision(&rev)) != NULL) {
354 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
355 ctx.qry.sha1, ctx.qry.vpath,
356 ofs + cnt, ctx.qry.grep,
357 ctx.qry.search, ctx.qry.showmsg);
358 }
359 html("</div>");
360 } else if ((commit = get_revision(&rev)) != NULL) {
361 html("<tr class='nohover'><td colspan='3'>");
362 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
363 ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
364 html("</td></tr>\n");
365 }
366 }