]>
git.cameronkatri.com Git - cgit.git/blob - ui-log.c
1 /* ui-log.c: functions for log output
3 * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
12 #include "ui-shared.h"
13 #include "argv-array.h"
15 static int files
, add_lines
, rem_lines
, lines_counted
;
18 * The list of available column colors in the commit graph.
20 static const char *column_colors_html
[] = {
21 "<span class='column1'>",
22 "<span class='column2'>",
23 "<span class='column3'>",
24 "<span class='column4'>",
25 "<span class='column5'>",
26 "<span class='column6'>",
30 #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
32 static void count_lines(char *line
, int size
)
40 else if (line
[0] == '-')
44 static void inspect_files(struct diff_filepair
*pair
)
46 unsigned long old_size
= 0;
47 unsigned long new_size
= 0;
51 if (ctx
.repo
->enable_log_linecount
)
52 cgit_diff_files(pair
->one
->sha1
, pair
->two
->sha1
, &old_size
,
53 &new_size
, &binary
, 0, ctx
.qry
.ignorews
,
57 void show_commit_decorations(struct commit
*commit
)
59 const struct name_decoration
*deco
;
60 static char buf
[1024];
62 buf
[sizeof(buf
) - 1] = 0;
63 deco
= get_name_decoration(&commit
->object
);
64 html("<span class='decoration'>");
66 if (starts_with(deco
->name
, "refs/heads/")) {
67 strncpy(buf
, deco
->name
+ 11, sizeof(buf
) - 1);
68 cgit_log_link(buf
, NULL
, "branch-deco", buf
, NULL
,
69 ctx
.qry
.vpath
, 0, NULL
, NULL
,
72 else if (starts_with(deco
->name
, "tag: refs/tags/")) {
73 strncpy(buf
, deco
->name
+ 15, sizeof(buf
) - 1);
74 cgit_tag_link(buf
, NULL
, "tag-deco", buf
);
76 else if (starts_with(deco
->name
, "refs/tags/")) {
77 strncpy(buf
, deco
->name
+ 10, sizeof(buf
) - 1);
78 cgit_tag_link(buf
, NULL
, "tag-deco", buf
);
80 else if (starts_with(deco
->name
, "refs/remotes/")) {
81 if (!ctx
.repo
->enable_remote_branches
)
83 strncpy(buf
, deco
->name
+ 13, sizeof(buf
) - 1);
84 cgit_log_link(buf
, NULL
, "remote-deco", NULL
,
85 oid_to_hex(&commit
->object
.oid
),
86 ctx
.qry
.vpath
, 0, NULL
, NULL
,
90 strncpy(buf
, deco
->name
, sizeof(buf
) - 1);
91 cgit_commit_link(buf
, NULL
, "deco", ctx
.qry
.head
,
92 oid_to_hex(&commit
->object
.oid
),
101 static void handle_rename(struct diff_filepair
*pair
)
104 * After we have seen a rename, we generate links to the previous
105 * name of the file so that commit & diff views get fed the path
106 * that is correct for the commit they are showing, avoiding the
107 * need to walk the entire history leading back to every commit we
108 * show in order detect renames.
110 if (0 != strcmp(ctx
.qry
.vpath
, pair
->two
->path
)) {
112 ctx
.qry
.vpath
= xstrdup(pair
->two
->path
);
117 static int show_commit(struct commit
*commit
, struct rev_info
*revs
)
119 struct commit_list
*parents
= commit
->parents
;
120 struct commit
*parent
;
121 int found
= 0, saved_fmt
;
122 unsigned saved_flags
= revs
->diffopt
.flags
;
125 /* Always show if we're not in "follow" mode with a single file. */
130 * In "follow" mode, we don't show merges. This is consistent with
131 * "git log --follow -- <file>".
133 if (parents
&& parents
->next
)
137 * If this is the root commit, do what rev_info tells us.
140 return revs
->show_root_diff
;
142 /* When we get here we have precisely one parent. */
143 parent
= parents
->item
;
144 /* If we can't parse the commit, let print_commit() report an error. */
145 if (parse_commit(parent
))
152 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
153 diff_tree_sha1(parent
->tree
->object
.oid
.hash
,
154 commit
->tree
->object
.oid
.hash
,
156 diffcore_std(&revs
->diffopt
);
158 found
= !diff_queue_is_empty();
159 saved_fmt
= revs
->diffopt
.output_format
;
160 revs
->diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
161 revs
->diffopt
.format_callback
= cgit_diff_tree_cb
;
162 revs
->diffopt
.format_callback_data
= handle_rename
;
163 diff_flush(&revs
->diffopt
);
164 revs
->diffopt
.output_format
= saved_fmt
;
165 revs
->diffopt
.flags
= saved_flags
;
171 static void print_commit(struct commit
*commit
, struct rev_info
*revs
)
173 struct commitinfo
*info
;
174 int columns
= revs
->graph
? 4 : 3;
175 struct strbuf graphbuf
= STRBUF_INIT
;
176 struct strbuf msgbuf
= STRBUF_INIT
;
178 if (ctx
.repo
->enable_log_filecount
)
180 if (ctx
.repo
->enable_log_linecount
)
184 /* Advance graph until current commit */
185 while (!graph_next_line(revs
->graph
, &graphbuf
)) {
186 /* Print graph segment in otherwise empty table row */
187 html("<tr class='nohover'><td class='commitgraph'>");
189 htmlf("</td><td colspan='%d' /></tr>\n", columns
);
190 strbuf_setlen(&graphbuf
, 0);
192 /* Current commit's graph segment is now ready in graphbuf */
195 info
= cgit_parse_commit(commit
);
196 htmlf("<tr%s>", ctx
.qry
.showmsg
? " class='logheader'" : "");
199 /* Print graph segment for current commit */
200 html("<td class='commitgraph'>");
203 strbuf_setlen(&graphbuf
, 0);
207 cgit_print_age(info
->committer_date
, info
->committer_tz
, TM_WEEK
* 2);
211 htmlf("<td%s>", ctx
.qry
.showmsg
? " class='logsubject'" : "");
212 if (ctx
.qry
.showmsg
) {
213 /* line-wrap long commit subjects instead of truncating them */
214 size_t subject_len
= strlen(info
->subject
);
216 if (subject_len
> ctx
.cfg
.max_msg_len
&&
217 ctx
.cfg
.max_msg_len
>= 15) {
218 /* symbol for signaling line-wrap (in PAGE_ENCODING) */
219 const char wrap_symbol
[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
220 int i
= ctx
.cfg
.max_msg_len
- strlen(wrap_symbol
);
222 /* Rewind i to preceding space character */
223 while (i
> 0 && !isspace(info
->subject
[i
]))
225 if (!i
) /* Oops, zero spaces. Reset i */
226 i
= ctx
.cfg
.max_msg_len
- strlen(wrap_symbol
);
228 /* add remainder starting at i to msgbuf */
229 strbuf_add(&msgbuf
, info
->subject
+ i
, subject_len
- i
);
230 strbuf_trim(&msgbuf
);
231 strbuf_add(&msgbuf
, "\n\n", 2);
233 /* Place wrap_symbol at position i in info->subject */
234 strcpy(info
->subject
+ i
, wrap_symbol
);
237 cgit_commit_link(info
->subject
, NULL
, NULL
, ctx
.qry
.head
,
238 oid_to_hex(&commit
->object
.oid
), ctx
.qry
.vpath
);
239 show_commit_decorations(commit
);
241 cgit_open_filter(ctx
.repo
->email_filter
, info
->author_email
, "log");
242 html_txt(info
->author
);
243 cgit_close_filter(ctx
.repo
->email_filter
);
247 cgit_print_age(info
->committer_date
, info
->committer_tz
, TM_WEEK
* 2);
250 if (!lines_counted
&& (ctx
.repo
->enable_log_filecount
||
251 ctx
.repo
->enable_log_linecount
)) {
255 cgit_diff_commit(commit
, inspect_files
, ctx
.qry
.vpath
);
258 if (ctx
.repo
->enable_log_filecount
)
259 htmlf("</td><td>%d", files
);
260 if (ctx
.repo
->enable_log_linecount
)
261 htmlf("</td><td>-%d/+%d", rem_lines
, add_lines
);
263 html("</td></tr>\n");
265 if (revs
->graph
|| ctx
.qry
.showmsg
) { /* Print a second table row */
266 html("<tr class='nohover'>");
268 if (ctx
.qry
.showmsg
) {
269 /* Concatenate commit message + notes in msgbuf */
270 if (info
->msg
&& *(info
->msg
)) {
271 strbuf_addstr(&msgbuf
, info
->msg
);
272 strbuf_addch(&msgbuf
, '\n');
274 format_display_notes(commit
->object
.oid
.hash
,
275 &msgbuf
, PAGE_ENCODING
, 0);
276 strbuf_addch(&msgbuf
, '\n');
277 strbuf_ltrim(&msgbuf
);
283 /* Calculate graph padding */
284 if (ctx
.qry
.showmsg
) {
285 /* Count #lines in commit message + notes */
286 const char *p
= msgbuf
.buf
;
288 while ((p
= strchr(p
, '\n'))) {
294 /* Print graph padding */
295 html("<td class='commitgraph'>");
296 while (lines
> 0 || !graph_is_commit_finished(revs
->graph
)) {
299 strbuf_setlen(&graphbuf
, 0);
300 graph_next_line(revs
->graph
, &graphbuf
);
307 html("<td/>"); /* Empty 'Age' column */
309 /* Print msgbuf into remainder of table row */
310 htmlf("<td colspan='%d'%s>\n", columns
- (revs
->graph
? 1 : 0),
311 ctx
.qry
.showmsg
? " class='logmsg'" : "");
312 html_txt(msgbuf
.buf
);
313 html("</td></tr>\n");
316 strbuf_release(&msgbuf
);
317 strbuf_release(&graphbuf
);
318 cgit_free_commitinfo(info
);
321 static const char *disambiguate_ref(const char *ref
, int *must_free_result
)
323 struct object_id oid
;
324 struct strbuf longref
= STRBUF_INIT
;
326 strbuf_addf(&longref
, "refs/heads/%s", ref
);
327 if (get_sha1(longref
.buf
, oid
.hash
) == 0) {
328 *must_free_result
= 1;
329 return strbuf_detach(&longref
, NULL
);
332 *must_free_result
= 0;
333 strbuf_release(&longref
);
337 static char *next_token(char **src
)
343 while (isspace(**src
))
349 if (isspace(**src
)) {
359 void cgit_print_log(const char *tip
, int ofs
, int cnt
, char *grep
, char *pattern
,
360 char *path
, int pager
, int commit_graph
, int commit_sort
)
363 struct commit
*commit
;
364 struct argv_array rev_argv
= ARGV_ARRAY_INIT
;
365 int i
, columns
= commit_graph
? 4 : 3;
366 int must_free_tip
= 0;
368 /* rev_argv.argv[0] will be ignored by setup_revisions */
369 argv_array_push(&rev_argv
, "log_rev_setup");
373 tip
= disambiguate_ref(tip
, &must_free_tip
);
374 argv_array_push(&rev_argv
, tip
);
376 if (grep
&& pattern
&& *pattern
) {
377 pattern
= xstrdup(pattern
);
378 if (!strcmp(grep
, "grep") || !strcmp(grep
, "author") ||
379 !strcmp(grep
, "committer")) {
380 argv_array_pushf(&rev_argv
, "--%s=%s", grep
, pattern
);
381 } else if (!strcmp(grep
, "range")) {
383 /* Split the pattern at whitespace and add each token
384 * as a revision expression. Do not accept other
385 * rev-list options. Also, replace the previously
386 * pushed tip (it's no longer relevant).
388 argv_array_pop(&rev_argv
);
389 while ((arg
= next_token(&pattern
))) {
391 fprintf(stderr
, "Bad range expr: %s\n",
395 argv_array_push(&rev_argv
, arg
);
400 if (!path
|| !ctx
.cfg
.enable_follow_links
) {
402 * If we don't have a path, "follow" is a no-op so make sure
403 * the variable is set to false to avoid needing to check
404 * both this and whether we have a path everywhere.
409 if (commit_graph
&& !ctx
.qry
.follow
) {
410 argv_array_push(&rev_argv
, "--graph");
411 argv_array_push(&rev_argv
, "--color");
412 graph_set_column_colors(column_colors_html
,
413 COLUMN_COLORS_HTML_MAX
);
416 if (commit_sort
== 1)
417 argv_array_push(&rev_argv
, "--date-order");
418 else if (commit_sort
== 2)
419 argv_array_push(&rev_argv
, "--topo-order");
421 if (path
&& ctx
.qry
.follow
)
422 argv_array_push(&rev_argv
, "--follow");
423 argv_array_push(&rev_argv
, "--");
425 argv_array_push(&rev_argv
, path
);
427 init_revisions(&rev
, NULL
);
428 rev
.abbrev
= DEFAULT_ABBREV
;
429 rev
.commit_format
= CMIT_FMT_DEFAULT
;
430 rev
.verbose_header
= 1;
431 rev
.show_root_diff
= 0;
432 rev
.ignore_missing
= 1;
433 rev
.simplify_history
= 1;
434 setup_revisions(rev_argv
.argc
, rev_argv
.argv
, &rev
, NULL
);
435 load_ref_decorations(DECORATE_FULL_REFS
);
436 rev
.show_decorations
= 1;
437 rev
.grep_filter
.regflags
|= REG_ICASE
;
439 rev
.diffopt
.detect_rename
= 1;
440 rev
.diffopt
.rename_limit
= ctx
.cfg
.renamelimit
;
441 if (ctx
.qry
.ignorews
)
442 DIFF_XDL_SET(&rev
.diffopt
, IGNORE_WHITESPACE
);
444 compile_grep_patterns(&rev
.grep_filter
);
445 prepare_revision_walk(&rev
);
448 cgit_print_layout_start();
449 html("<table class='list nowrap'>");
452 html("<tr class='nohover'>");
456 html("<th class='left'>Age</th>");
457 html("<th class='left'>Commit message");
460 cgit_log_link(ctx
.qry
.showmsg
? "Collapse" : "Expand", NULL
,
461 NULL
, ctx
.qry
.head
, ctx
.qry
.sha1
,
462 ctx
.qry
.vpath
, ctx
.qry
.ofs
, ctx
.qry
.grep
,
463 ctx
.qry
.search
, ctx
.qry
.showmsg
? 0 : 1,
467 html("</th><th class='left'>Author</th>");
469 html("<th class='left'>Age</th>");
470 if (ctx
.repo
->enable_log_filecount
) {
471 html("<th class='left'>Files</th>");
474 if (ctx
.repo
->enable_log_linecount
) {
475 html("<th class='left'>Lines</th>");
483 for (i
= 0; i
< ofs
&& (commit
= get_revision(&rev
)) != NULL
; /* nop */) {
484 if (show_commit(commit
, &rev
))
486 free_commit_buffer(commit
);
487 free_commit_list(commit
->parents
);
488 commit
->parents
= NULL
;
491 for (i
= 0; i
< cnt
&& (commit
= get_revision(&rev
)) != NULL
; /* nop */) {
493 * In "follow" mode, we must count the files and lines the
494 * first time we invoke diff on a given commit, and we need
495 * to do that to see if the commit touches the path we care
496 * about, so we do it in show_commit. Hence we must clear
497 * lines_counted here.
499 * This has the side effect of avoiding running diff twice
500 * when we are both following renames and showing file
501 * and/or line counts.
504 if (show_commit(commit
, &rev
)) {
506 print_commit(commit
, &rev
);
508 free_commit_buffer(commit
);
509 free_commit_list(commit
->parents
);
510 commit
->parents
= NULL
;
513 html("</table><ul class='pager'>");
516 cgit_log_link("[prev]", NULL
, NULL
, ctx
.qry
.head
,
517 ctx
.qry
.sha1
, ctx
.qry
.vpath
,
518 ofs
- cnt
, ctx
.qry
.grep
,
519 ctx
.qry
.search
, ctx
.qry
.showmsg
,
523 if ((commit
= get_revision(&rev
)) != NULL
) {
525 cgit_log_link("[next]", NULL
, NULL
, ctx
.qry
.head
,
526 ctx
.qry
.sha1
, ctx
.qry
.vpath
,
527 ofs
+ cnt
, ctx
.qry
.grep
,
528 ctx
.qry
.search
, ctx
.qry
.showmsg
,
533 cgit_print_layout_end();
534 } else if ((commit
= get_revision(&rev
)) != NULL
) {
535 htmlf("<tr class='nohover'><td colspan='%d'>", columns
);
536 cgit_log_link("[...]", NULL
, NULL
, ctx
.qry
.head
, NULL
,
537 ctx
.qry
.vpath
, 0, NULL
, NULL
, ctx
.qry
.showmsg
,
539 html("</td></tr>\n");
542 /* If we allocated tip then it is safe to cast away const. */