Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 1 | /* ui-log.c: functions for log output |
| 2 | * |
Lukas Fleischer | f7f26f8 | 2014-01-08 15:10:49 +0100 | [diff] [blame] | 3 | * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com> |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 4 | * |
| 5 | * Licensed under GNU General Public License v2 |
| 6 | * (see COPYING for full license text) |
| 7 | */ |
| 8 | |
| 9 | #include "cgit.h" |
John Keeping | 8f20879 | 2013-04-06 11:37:59 +0100 | [diff] [blame] | 10 | #include "ui-log.h" |
Lars Hjemli | b1f9b9c | 2008-02-23 22:45:33 +0100 | [diff] [blame] | 11 | #include "html.h" |
Lars Hjemli | a4d1ca1 | 2008-03-24 16:50:57 +0100 | [diff] [blame] | 12 | #include "ui-shared.h" |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 13 | #include "argv-array.h" |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 14 | |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 15 | static int files, add_lines, rem_lines, lines_counted; |
Lars Hjemli | 48dc003 | 2007-05-13 11:27:46 +0200 | [diff] [blame] | 16 | |
Johan Herland | 268b34a | 2010-11-15 18:39:51 +0100 | [diff] [blame] | 17 | /* |
| 18 | * The list of available column colors in the commit graph. |
| 19 | */ |
| 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'>", |
| 27 | "</span>", |
| 28 | }; |
| 29 | |
| 30 | #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1) |
| 31 | |
Lukas Fleischer | bafab42 | 2013-03-04 08:52:33 +0100 | [diff] [blame] | 32 | static void count_lines(char *line, int size) |
Lars Hjemli | 80e577c | 2007-05-13 17:03:27 +0200 | [diff] [blame] | 33 | { |
Lars Hjemli | d04c473 | 2007-11-06 00:35:12 +0100 | [diff] [blame] | 34 | if (size <= 0) |
| 35 | return; |
| 36 | |
| 37 | if (line[0] == '+') |
| 38 | add_lines++; |
| 39 | |
| 40 | else if (line[0] == '-') |
| 41 | rem_lines++; |
Lars Hjemli | 80e577c | 2007-05-13 17:03:27 +0200 | [diff] [blame] | 42 | } |
| 43 | |
Lukas Fleischer | bafab42 | 2013-03-04 08:52:33 +0100 | [diff] [blame] | 44 | static void inspect_files(struct diff_filepair *pair) |
Lars Hjemli | 48dc003 | 2007-05-13 11:27:46 +0200 | [diff] [blame] | 45 | { |
Lars Hjemli | c495cf0 | 2009-01-31 10:40:40 +0100 | [diff] [blame] | 46 | unsigned long old_size = 0; |
| 47 | unsigned long new_size = 0; |
| 48 | int binary = 0; |
| 49 | |
Lars Hjemli | 48dc003 | 2007-05-13 11:27:46 +0200 | [diff] [blame] | 50 | files++; |
Lars Hjemli | d1f3bbe | 2008-02-16 13:56:09 +0100 | [diff] [blame] | 51 | if (ctx.repo->enable_log_linecount) |
Christian Hesse | 11695a5 | 2016-09-04 12:38:18 +0200 | [diff] [blame] | 52 | cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, |
Johan Herland | 2cc8b99 | 2010-06-24 17:52:57 +0200 | [diff] [blame] | 53 | &new_size, &binary, 0, ctx.qry.ignorews, |
| 54 | count_lines); |
Lars Hjemli | 48dc003 | 2007-05-13 11:27:46 +0200 | [diff] [blame] | 55 | } |
| 56 | |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 57 | void show_commit_decorations(struct commit *commit) |
| 58 | { |
Christian Hesse | 17838ec | 2014-12-19 00:28:34 -0700 | [diff] [blame] | 59 | const struct name_decoration *deco; |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 60 | static char buf[1024]; |
| 61 | |
| 62 | buf[sizeof(buf) - 1] = 0; |
Christian Hesse | 17838ec | 2014-12-19 00:28:34 -0700 | [diff] [blame] | 63 | deco = get_name_decoration(&commit->object); |
Tim Nordell | 499b239 | 2016-02-26 14:57:30 -0600 | [diff] [blame] | 64 | if (!deco) |
| 65 | return; |
John Keeping | 927060c | 2013-05-18 15:54:49 +0100 | [diff] [blame] | 66 | html("<span class='decoration'>"); |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 67 | while (deco) { |
Christian Hesse | 0bb34ef | 2018-06-05 12:46:13 +0200 | [diff] [blame] | 68 | struct object_id peeled; |
| 69 | int is_annotated = 0; |
Tim Nordell | 59d8fa1 | 2016-02-26 14:58:41 -0600 | [diff] [blame] | 70 | strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1); |
| 71 | switch(deco->type) { |
| 72 | case DECORATION_NONE: |
| 73 | /* If the git-core doesn't recognize it, |
| 74 | * don't display anything. */ |
| 75 | break; |
| 76 | case DECORATION_REF_LOCAL: |
Johan Herland | afc4072 | 2010-06-11 14:50:47 +0200 | [diff] [blame] | 77 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
Tim Nordell | 59d8fa1 | 2016-02-26 14:58:41 -0600 | [diff] [blame] | 78 | ctx.qry.vpath, 0, NULL, NULL, |
| 79 | ctx.qry.showmsg, 0); |
| 80 | break; |
| 81 | case DECORATION_REF_TAG: |
Christian Hesse | 0bb34ef | 2018-06-05 12:46:13 +0200 | [diff] [blame] | 82 | if (!peel_ref(deco->name, &peeled)) |
| 83 | is_annotated = !oidcmp(&commit->object.oid, &peeled); |
| 84 | cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf); |
Tim Nordell | 59d8fa1 | 2016-02-26 14:58:41 -0600 | [diff] [blame] | 85 | break; |
| 86 | case DECORATION_REF_REMOTE: |
Georg Müller | 0b6a716 | 2012-01-03 15:30:50 +0000 | [diff] [blame] | 87 | if (!ctx.repo->enable_remote_branches) |
Tim Nordell | 59d8fa1 | 2016-02-26 14:58:41 -0600 | [diff] [blame] | 88 | break; |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 89 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
Tim Nordell | 59d8fa1 | 2016-02-26 14:58:41 -0600 | [diff] [blame] | 90 | oid_to_hex(&commit->object.oid), |
| 91 | ctx.qry.vpath, 0, NULL, NULL, |
| 92 | ctx.qry.showmsg, 0); |
| 93 | break; |
| 94 | default: |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 95 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
Tim Nordell | 59d8fa1 | 2016-02-26 14:58:41 -0600 | [diff] [blame] | 96 | oid_to_hex(&commit->object.oid), |
| 97 | ctx.qry.vpath); |
| 98 | break; |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 99 | } |
| 100 | deco = deco->next; |
| 101 | } |
John Keeping | 927060c | 2013-05-18 15:54:49 +0100 | [diff] [blame] | 102 | html("</span>"); |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 103 | } |
| 104 | |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 105 | static void handle_rename(struct diff_filepair *pair) |
| 106 | { |
| 107 | /* |
| 108 | * After we have seen a rename, we generate links to the previous |
| 109 | * name of the file so that commit & diff views get fed the path |
| 110 | * that is correct for the commit they are showing, avoiding the |
| 111 | * need to walk the entire history leading back to every commit we |
| 112 | * show in order detect renames. |
| 113 | */ |
| 114 | if (0 != strcmp(ctx.qry.vpath, pair->two->path)) { |
| 115 | free(ctx.qry.vpath); |
| 116 | ctx.qry.vpath = xstrdup(pair->two->path); |
| 117 | } |
| 118 | inspect_files(pair); |
| 119 | } |
| 120 | |
| 121 | static int show_commit(struct commit *commit, struct rev_info *revs) |
| 122 | { |
| 123 | struct commit_list *parents = commit->parents; |
| 124 | struct commit *parent; |
| 125 | int found = 0, saved_fmt; |
Christian Hesse | 1dd53e3 | 2018-01-18 09:19:31 +0100 | [diff] [blame] | 126 | struct diff_flags saved_flags = revs->diffopt.flags; |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 127 | |
| 128 | /* Always show if we're not in "follow" mode with a single file. */ |
| 129 | if (!ctx.qry.follow) |
| 130 | return 1; |
| 131 | |
| 132 | /* |
| 133 | * In "follow" mode, we don't show merges. This is consistent with |
| 134 | * "git log --follow -- <file>". |
| 135 | */ |
| 136 | if (parents && parents->next) |
| 137 | return 0; |
| 138 | |
| 139 | /* |
| 140 | * If this is the root commit, do what rev_info tells us. |
| 141 | */ |
| 142 | if (!parents) |
| 143 | return revs->show_root_diff; |
| 144 | |
| 145 | /* When we get here we have precisely one parent. */ |
| 146 | parent = parents->item; |
John Keeping | baa5ad1 | 2016-01-16 11:03:05 +0000 | [diff] [blame] | 147 | /* If we can't parse the commit, let print_commit() report an error. */ |
| 148 | if (parse_commit(parent)) |
| 149 | return 1; |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 150 | |
| 151 | files = 0; |
| 152 | add_lines = 0; |
| 153 | rem_lines = 0; |
| 154 | |
Christian Hesse | 1dd53e3 | 2018-01-18 09:19:31 +0100 | [diff] [blame] | 155 | revs->diffopt.flags.recursive = 1; |
Christian Hesse | 255b78f | 2018-06-04 18:49:28 +0200 | [diff] [blame^] | 156 | diff_tree_oid(&parent->maybe_tree->object.oid, |
| 157 | &commit->maybe_tree->object.oid, |
Jeff Smith | 86a6d35 | 2017-08-09 19:02:56 -0500 | [diff] [blame] | 158 | "", &revs->diffopt); |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 159 | diffcore_std(&revs->diffopt); |
| 160 | |
| 161 | found = !diff_queue_is_empty(); |
| 162 | saved_fmt = revs->diffopt.output_format; |
| 163 | revs->diffopt.output_format = DIFF_FORMAT_CALLBACK; |
| 164 | revs->diffopt.format_callback = cgit_diff_tree_cb; |
| 165 | revs->diffopt.format_callback_data = handle_rename; |
| 166 | diff_flush(&revs->diffopt); |
| 167 | revs->diffopt.output_format = saved_fmt; |
| 168 | revs->diffopt.flags = saved_flags; |
| 169 | |
| 170 | lines_counted = 1; |
| 171 | return found; |
| 172 | } |
| 173 | |
Lukas Fleischer | bafab42 | 2013-03-04 08:52:33 +0100 | [diff] [blame] | 174 | static void print_commit(struct commit *commit, struct rev_info *revs) |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 175 | { |
Lars Hjemli | 2101e26 | 2006-12-15 18:17:36 +0100 | [diff] [blame] | 176 | struct commitinfo *info; |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 177 | int columns = revs->graph ? 4 : 3; |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 178 | struct strbuf graphbuf = STRBUF_INIT; |
Johan Herland | ad23026 | 2010-11-15 18:39:52 +0100 | [diff] [blame] | 179 | struct strbuf msgbuf = STRBUF_INIT; |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 180 | |
Julius Plenz | 2e6721e | 2011-03-10 17:03:22 +0100 | [diff] [blame] | 181 | if (ctx.repo->enable_log_filecount) |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 182 | columns++; |
Julius Plenz | 2e6721e | 2011-03-10 17:03:22 +0100 | [diff] [blame] | 183 | if (ctx.repo->enable_log_linecount) |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 184 | columns++; |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 185 | |
| 186 | if (revs->graph) { |
| 187 | /* Advance graph until current commit */ |
| 188 | while (!graph_next_line(revs->graph, &graphbuf)) { |
| 189 | /* Print graph segment in otherwise empty table row */ |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 190 | html("<tr class='nohover'><td class='commitgraph'>"); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 191 | html(graphbuf.buf); |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 192 | htmlf("</td><td colspan='%d' /></tr>\n", columns); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 193 | strbuf_setlen(&graphbuf, 0); |
| 194 | } |
| 195 | /* Current commit's graph segment is now ready in graphbuf */ |
| 196 | } |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 197 | |
Lars Hjemli | 2101e26 | 2006-12-15 18:17:36 +0100 | [diff] [blame] | 198 | info = cgit_parse_commit(commit); |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 199 | htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 200 | |
| 201 | if (revs->graph) { |
| 202 | /* Print graph segment for current commit */ |
| 203 | html("<td class='commitgraph'>"); |
| 204 | html(graphbuf.buf); |
| 205 | html("</td>"); |
| 206 | strbuf_setlen(&graphbuf, 0); |
| 207 | } |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 208 | else { |
| 209 | html("<td>"); |
John Keeping | f2a901d | 2016-01-19 19:33:05 +0000 | [diff] [blame] | 210 | cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2); |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 211 | html("</td>"); |
| 212 | } |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 213 | |
| 214 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
Johan Herland | ad23026 | 2010-11-15 18:39:52 +0100 | [diff] [blame] | 215 | if (ctx.qry.showmsg) { |
| 216 | /* line-wrap long commit subjects instead of truncating them */ |
| 217 | size_t subject_len = strlen(info->subject); |
| 218 | |
| 219 | if (subject_len > ctx.cfg.max_msg_len && |
| 220 | ctx.cfg.max_msg_len >= 15) { |
| 221 | /* symbol for signaling line-wrap (in PAGE_ENCODING) */ |
| 222 | const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 }; |
| 223 | int i = ctx.cfg.max_msg_len - strlen(wrap_symbol); |
| 224 | |
| 225 | /* Rewind i to preceding space character */ |
| 226 | while (i > 0 && !isspace(info->subject[i])) |
| 227 | --i; |
| 228 | if (!i) /* Oops, zero spaces. Reset i */ |
| 229 | i = ctx.cfg.max_msg_len - strlen(wrap_symbol); |
| 230 | |
| 231 | /* add remainder starting at i to msgbuf */ |
| 232 | strbuf_add(&msgbuf, info->subject + i, subject_len - i); |
| 233 | strbuf_trim(&msgbuf); |
| 234 | strbuf_add(&msgbuf, "\n\n", 2); |
| 235 | |
| 236 | /* Place wrap_symbol at position i in info->subject */ |
| 237 | strcpy(info->subject + i, wrap_symbol); |
| 238 | } |
| 239 | } |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 240 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
Christian Hesse | 559ab5e | 2016-01-05 07:38:53 +0100 | [diff] [blame] | 241 | oid_to_hex(&commit->object.oid), ctx.qry.vpath); |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 242 | show_commit_decorations(commit); |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 243 | html("</td><td>"); |
Jason A. Donenfeld | 786609b | 2014-01-13 16:24:40 +0100 | [diff] [blame] | 244 | cgit_open_filter(ctx.repo->email_filter, info->author_email, "log"); |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 245 | html_txt(info->author); |
Jason A. Donenfeld | a5e1553 | 2014-01-13 04:04:52 +0100 | [diff] [blame] | 246 | cgit_close_filter(ctx.repo->email_filter); |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 247 | |
| 248 | if (revs->graph) { |
| 249 | html("</td><td>"); |
John Keeping | f2a901d | 2016-01-19 19:33:05 +0000 | [diff] [blame] | 250 | cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2); |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 251 | } |
| 252 | |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 253 | if (!lines_counted && (ctx.repo->enable_log_filecount || |
| 254 | ctx.repo->enable_log_linecount)) { |
Lars Hjemli | e189344 | 2007-05-18 13:55:52 +0200 | [diff] [blame] | 255 | files = 0; |
Lars Hjemli | d04c473 | 2007-11-06 00:35:12 +0100 | [diff] [blame] | 256 | add_lines = 0; |
| 257 | rem_lines = 0; |
Johan Herland | 1415f3f | 2010-09-30 20:15:14 +0200 | [diff] [blame] | 258 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
Lars Hjemli | e189344 | 2007-05-18 13:55:52 +0200 | [diff] [blame] | 259 | } |
Julius Plenz | 2e6721e | 2011-03-10 17:03:22 +0100 | [diff] [blame] | 260 | |
| 261 | if (ctx.repo->enable_log_filecount) |
| 262 | htmlf("</td><td>%d", files); |
| 263 | if (ctx.repo->enable_log_linecount) |
Christian Hesse | 4fb4986 | 2016-06-29 09:37:57 +0200 | [diff] [blame] | 264 | htmlf("</td><td><span class='deletions'>-%d</span>/" |
| 265 | "<span class='insertions'>+%d</span>", rem_lines, add_lines); |
Julius Plenz | 2e6721e | 2011-03-10 17:03:22 +0100 | [diff] [blame] | 266 | |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 267 | html("</td></tr>\n"); |
Johan Herland | 5a36c2a | 2010-11-15 18:39:49 +0100 | [diff] [blame] | 268 | |
Christian Hesse | 81509a2 | 2016-07-06 22:42:36 +0200 | [diff] [blame] | 269 | if ((revs->graph && !graph_is_commit_finished(revs->graph)) |
| 270 | || ctx.qry.showmsg) { /* Print a second table row */ |
| 271 | html("<tr class='nohover-highlight'>"); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 272 | |
| 273 | if (ctx.qry.showmsg) { |
| 274 | /* Concatenate commit message + notes in msgbuf */ |
| 275 | if (info->msg && *(info->msg)) { |
| 276 | strbuf_addstr(&msgbuf, info->msg); |
| 277 | strbuf_addch(&msgbuf, '\n'); |
| 278 | } |
Jeff Smith | 86a6d35 | 2017-08-09 19:02:56 -0500 | [diff] [blame] | 279 | format_display_notes(&commit->object.oid, |
John Keeping | 849ecd9 | 2013-04-08 09:00:22 +0100 | [diff] [blame] | 280 | &msgbuf, PAGE_ENCODING, 0); |
Johan Herland | 5a36c2a | 2010-11-15 18:39:49 +0100 | [diff] [blame] | 281 | strbuf_addch(&msgbuf, '\n'); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 282 | strbuf_ltrim(&msgbuf); |
Lars Hjemli | 0274b57 | 2008-11-29 18:39:41 +0100 | [diff] [blame] | 283 | } |
Johan Herland | 5a36c2a | 2010-11-15 18:39:49 +0100 | [diff] [blame] | 284 | |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 285 | if (revs->graph) { |
| 286 | int lines = 0; |
| 287 | |
| 288 | /* Calculate graph padding */ |
| 289 | if (ctx.qry.showmsg) { |
| 290 | /* Count #lines in commit message + notes */ |
| 291 | const char *p = msgbuf.buf; |
| 292 | lines = 1; |
| 293 | while ((p = strchr(p, '\n'))) { |
| 294 | p++; |
| 295 | lines++; |
| 296 | } |
| 297 | } |
| 298 | |
| 299 | /* Print graph padding */ |
| 300 | html("<td class='commitgraph'>"); |
| 301 | while (lines > 0 || !graph_is_commit_finished(revs->graph)) { |
| 302 | if (graphbuf.len) |
| 303 | html("\n"); |
| 304 | strbuf_setlen(&graphbuf, 0); |
| 305 | graph_next_line(revs->graph, &graphbuf); |
| 306 | html(graphbuf.buf); |
| 307 | lines--; |
| 308 | } |
| 309 | html("</td>\n"); |
| 310 | } |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 311 | else |
| 312 | html("<td/>"); /* Empty 'Age' column */ |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 313 | |
| 314 | /* Print msgbuf into remainder of table row */ |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 315 | htmlf("<td colspan='%d'%s>\n", columns - (revs->graph ? 1 : 0), |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 316 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
Johan Herland | 5a36c2a | 2010-11-15 18:39:49 +0100 | [diff] [blame] | 317 | html_txt(msgbuf.buf); |
Lars Hjemli | ab67164 | 2008-11-29 19:11:26 +0100 | [diff] [blame] | 318 | html("</td></tr>\n"); |
Lars Hjemli | 0274b57 | 2008-11-29 18:39:41 +0100 | [diff] [blame] | 319 | } |
Johan Herland | 5a36c2a | 2010-11-15 18:39:49 +0100 | [diff] [blame] | 320 | |
Johan Herland | ad23026 | 2010-11-15 18:39:52 +0100 | [diff] [blame] | 321 | strbuf_release(&msgbuf); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 322 | strbuf_release(&graphbuf); |
Lars Hjemli | aaa24bd | 2006-12-16 14:58:20 +0100 | [diff] [blame] | 323 | cgit_free_commitinfo(info); |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 324 | } |
| 325 | |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 326 | static const char *disambiguate_ref(const char *ref, int *must_free_result) |
Lars Hjemli | a1b01b2 | 2008-12-03 17:34:23 +0100 | [diff] [blame] | 327 | { |
Christian Hesse | de83de2 | 2015-07-28 10:42:01 +0200 | [diff] [blame] | 328 | struct object_id oid; |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 329 | struct strbuf longref = STRBUF_INIT; |
Lars Hjemli | a1b01b2 | 2008-12-03 17:34:23 +0100 | [diff] [blame] | 330 | |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 331 | strbuf_addf(&longref, "refs/heads/%s", ref); |
Christian Hesse | 1a9a75d | 2016-09-29 21:44:41 +0200 | [diff] [blame] | 332 | if (get_oid(longref.buf, &oid) == 0) { |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 333 | *must_free_result = 1; |
| 334 | return strbuf_detach(&longref, NULL); |
| 335 | } |
Lars Hjemli | a1b01b2 | 2008-12-03 17:34:23 +0100 | [diff] [blame] | 336 | |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 337 | *must_free_result = 0; |
| 338 | strbuf_release(&longref); |
Lars Hjemli | a1b01b2 | 2008-12-03 17:34:23 +0100 | [diff] [blame] | 339 | return ref; |
| 340 | } |
Lars Hjemli | 2101e26 | 2006-12-15 18:17:36 +0100 | [diff] [blame] | 341 | |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 342 | static char *next_token(char **src) |
| 343 | { |
| 344 | char *result; |
| 345 | |
| 346 | if (!src || !*src) |
| 347 | return NULL; |
| 348 | while (isspace(**src)) |
| 349 | (*src)++; |
| 350 | if (!**src) |
| 351 | return NULL; |
| 352 | result = *src; |
| 353 | while (**src) { |
| 354 | if (isspace(**src)) { |
| 355 | **src = '\0'; |
| 356 | (*src)++; |
| 357 | break; |
| 358 | } |
| 359 | (*src)++; |
| 360 | } |
| 361 | return result; |
| 362 | } |
| 363 | |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 364 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
Tobias Bieniek | 792f813 | 2012-10-13 16:10:30 +0200 | [diff] [blame] | 365 | char *path, int pager, int commit_graph, int commit_sort) |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 366 | { |
| 367 | struct rev_info rev; |
| 368 | struct commit *commit; |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 369 | struct argv_array rev_argv = ARGV_ARRAY_INIT; |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 370 | int i, columns = commit_graph ? 4 : 3; |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 371 | int must_free_tip = 0; |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 372 | |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 373 | /* rev_argv.argv[0] will be ignored by setup_revisions */ |
| 374 | argv_array_push(&rev_argv, "log_rev_setup"); |
Lars Hjemli | 48dc003 | 2007-05-13 11:27:46 +0200 | [diff] [blame] | 375 | |
Lars Hjemli | cd79c16 | 2007-06-17 14:58:45 +0200 | [diff] [blame] | 376 | if (!tip) |
Lars Hjemli | a1b01b2 | 2008-12-03 17:34:23 +0100 | [diff] [blame] | 377 | tip = ctx.qry.head; |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 378 | tip = disambiguate_ref(tip, &must_free_tip); |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 379 | argv_array_push(&rev_argv, tip); |
Lars Hjemli | cd79c16 | 2007-06-17 14:58:45 +0200 | [diff] [blame] | 380 | |
Johan Herland | 52558a6 | 2010-10-28 17:05:39 +0200 | [diff] [blame] | 381 | if (grep && pattern && *pattern) { |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 382 | pattern = xstrdup(pattern); |
Lars Hjemli | a579fb0 | 2010-06-19 14:32:37 +0200 | [diff] [blame] | 383 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 384 | !strcmp(grep, "committer")) { |
Lukas Fleischer | d76c438 | 2013-11-22 13:30:58 +0100 | [diff] [blame] | 385 | argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern); |
| 386 | } else if (!strcmp(grep, "range")) { |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 387 | char *arg; |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 388 | /* Split the pattern at whitespace and add each token |
| 389 | * as a revision expression. Do not accept other |
| 390 | * rev-list options. Also, replace the previously |
| 391 | * pushed tip (it's no longer relevant). |
| 392 | */ |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 393 | argv_array_pop(&rev_argv); |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 394 | while ((arg = next_token(&pattern))) { |
| 395 | if (*arg == '-') { |
| 396 | fprintf(stderr, "Bad range expr: %s\n", |
| 397 | arg); |
| 398 | break; |
| 399 | } |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 400 | argv_array_push(&rev_argv, arg); |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 401 | } |
| 402 | } |
Lars Hjemli | a579fb0 | 2010-06-19 14:32:37 +0200 | [diff] [blame] | 403 | } |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 404 | |
| 405 | if (!path || !ctx.cfg.enable_follow_links) { |
| 406 | /* |
| 407 | * If we don't have a path, "follow" is a no-op so make sure |
| 408 | * the variable is set to false to avoid needing to check |
| 409 | * both this and whether we have a path everywhere. |
| 410 | */ |
| 411 | ctx.qry.follow = 0; |
| 412 | } |
| 413 | |
| 414 | if (commit_graph && !ctx.qry.follow) { |
Lukas Fleischer | d76c438 | 2013-11-22 13:30:58 +0100 | [diff] [blame] | 415 | argv_array_push(&rev_argv, "--graph"); |
| 416 | argv_array_push(&rev_argv, "--color"); |
Johan Herland | 268b34a | 2010-11-15 18:39:51 +0100 | [diff] [blame] | 417 | graph_set_column_colors(column_colors_html, |
| 418 | COLUMN_COLORS_HTML_MAX); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 419 | } |
Lars Hjemli | 68ca032 | 2007-10-28 15:23:00 +0100 | [diff] [blame] | 420 | |
Lukas Fleischer | d76c438 | 2013-11-22 13:30:58 +0100 | [diff] [blame] | 421 | if (commit_sort == 1) |
| 422 | argv_array_push(&rev_argv, "--date-order"); |
| 423 | else if (commit_sort == 2) |
| 424 | argv_array_push(&rev_argv, "--topo-order"); |
Tobias Bieniek | 792f813 | 2012-10-13 16:10:30 +0200 | [diff] [blame] | 425 | |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 426 | if (path && ctx.qry.follow) |
| 427 | argv_array_push(&rev_argv, "--follow"); |
John Keeping | 4046e8e | 2014-06-28 15:55:06 +0200 | [diff] [blame] | 428 | argv_array_push(&rev_argv, "--"); |
| 429 | if (path) |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 430 | argv_array_push(&rev_argv, path); |
Lars Hjemli | a3c3c04 | 2010-11-09 20:53:36 +0100 | [diff] [blame] | 431 | |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 432 | init_revisions(&rev, NULL); |
| 433 | rev.abbrev = DEFAULT_ABBREV; |
| 434 | rev.commit_format = CMIT_FMT_DEFAULT; |
| 435 | rev.verbose_header = 1; |
| 436 | rev.show_root_diff = 0; |
John Keeping | 4046e8e | 2014-06-28 15:55:06 +0200 | [diff] [blame] | 437 | rev.ignore_missing = 1; |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 438 | rev.simplify_history = 1; |
Lukas Fleischer | 9973ef0 | 2013-11-22 13:24:52 +0100 | [diff] [blame] | 439 | setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); |
Christian Hesse | 1dd53e3 | 2018-01-18 09:19:31 +0100 | [diff] [blame] | 440 | load_ref_decorations(NULL, DECORATE_FULL_REFS); |
Lars Hjemli | ef2dc55 | 2009-01-11 12:16:18 +0100 | [diff] [blame] | 441 | rev.show_decorations = 1; |
Jeff Smith | 86a6d35 | 2017-08-09 19:02:56 -0500 | [diff] [blame] | 442 | rev.grep_filter.ignore_case = 1; |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 443 | |
| 444 | rev.diffopt.detect_rename = 1; |
| 445 | rev.diffopt.rename_limit = ctx.cfg.renamelimit; |
| 446 | if (ctx.qry.ignorews) |
| 447 | DIFF_XDL_SET(&rev.diffopt, IGNORE_WHITESPACE); |
| 448 | |
Lars Hjemli | b7f3378 | 2008-10-05 19:19:59 +0200 | [diff] [blame] | 449 | compile_grep_patterns(&rev.grep_filter); |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 450 | prepare_revision_walk(&rev); |
| 451 | |
John Keeping | 23c17d8 | 2015-08-14 12:47:15 +0100 | [diff] [blame] | 452 | if (pager) { |
| 453 | cgit_print_layout_start(); |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 454 | html("<table class='list nowrap'>"); |
John Keeping | 23c17d8 | 2015-08-14 12:47:15 +0100 | [diff] [blame] | 455 | } |
Lars Hjemli | e189344 | 2007-05-18 13:55:52 +0200 | [diff] [blame] | 456 | |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 457 | html("<tr class='nohover'>"); |
Johan Herland | ad23026 | 2010-11-15 18:39:52 +0100 | [diff] [blame] | 458 | if (commit_graph) |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 459 | html("<th></th>"); |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 460 | else |
| 461 | html("<th class='left'>Age</th>"); |
Johan Herland | 9a8d39c | 2010-11-15 18:39:50 +0100 | [diff] [blame] | 462 | html("<th class='left'>Commit message"); |
Lars Hjemli | 0274b57 | 2008-11-29 18:39:41 +0100 | [diff] [blame] | 463 | if (pager) { |
| 464 | html(" ("); |
Justin Waters | 1383fe3 | 2009-01-09 17:35:10 -0500 | [diff] [blame] | 465 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
| 466 | NULL, ctx.qry.head, ctx.qry.sha1, |
Johan Herland | afc4072 | 2010-06-11 14:50:47 +0200 | [diff] [blame] | 467 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 468 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1, |
| 469 | ctx.qry.follow); |
Lars Hjemli | 0274b57 | 2008-11-29 18:39:41 +0100 | [diff] [blame] | 470 | html(")"); |
| 471 | } |
| 472 | html("</th><th class='left'>Author</th>"); |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 473 | if (rev.graph) |
Johan Herland | c2bfd40 | 2010-11-15 18:39:53 +0100 | [diff] [blame] | 474 | html("<th class='left'>Age</th>"); |
Lars Hjemli | d1f3bbe | 2008-02-16 13:56:09 +0100 | [diff] [blame] | 475 | if (ctx.repo->enable_log_filecount) { |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 476 | html("<th class='left'>Files</th>"); |
| 477 | columns++; |
Julius Plenz | 2e6721e | 2011-03-10 17:03:22 +0100 | [diff] [blame] | 478 | } |
| 479 | if (ctx.repo->enable_log_linecount) { |
| 480 | html("<th class='left'>Lines</th>"); |
| 481 | columns++; |
Lars Hjemli | e189344 | 2007-05-18 13:55:52 +0200 | [diff] [blame] | 482 | } |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 483 | html("</tr>\n"); |
Lars Hjemli | 420712a | 2006-12-14 00:40:34 +0100 | [diff] [blame] | 484 | |
| 485 | if (ofs<0) |
| 486 | ofs = 0; |
| 487 | |
John Keeping | da1d4c7 | 2015-08-12 16:41:34 +0100 | [diff] [blame] | 488 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) { |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 489 | if (show_commit(commit, &rev)) |
| 490 | i++; |
John Keeping | 865afe0 | 2014-07-27 11:56:19 +0100 | [diff] [blame] | 491 | free_commit_buffer(commit); |
Lars Hjemli | 420712a | 2006-12-14 00:40:34 +0100 | [diff] [blame] | 492 | free_commit_list(commit->parents); |
| 493 | commit->parents = NULL; |
| 494 | } |
| 495 | |
John Keeping | da1d4c7 | 2015-08-12 16:41:34 +0100 | [diff] [blame] | 496 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; /* nop */) { |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 497 | /* |
| 498 | * In "follow" mode, we must count the files and lines the |
| 499 | * first time we invoke diff on a given commit, and we need |
| 500 | * to do that to see if the commit touches the path we care |
| 501 | * about, so we do it in show_commit. Hence we must clear |
| 502 | * lines_counted here. |
| 503 | * |
| 504 | * This has the side effect of avoiding running diff twice |
| 505 | * when we are both following renames and showing file |
| 506 | * and/or line counts. |
| 507 | */ |
| 508 | lines_counted = 0; |
| 509 | if (show_commit(commit, &rev)) { |
| 510 | i++; |
| 511 | print_commit(commit, &rev); |
| 512 | } |
John Keeping | 865afe0 | 2014-07-27 11:56:19 +0100 | [diff] [blame] | 513 | free_commit_buffer(commit); |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 514 | free_commit_list(commit->parents); |
| 515 | commit->parents = NULL; |
| 516 | } |
Ondrej Jirman | a922615 | 2007-05-26 03:26:14 +0200 | [diff] [blame] | 517 | if (pager) { |
Lukas Fleischer | b60e6bf | 2013-03-07 08:56:22 +0100 | [diff] [blame] | 518 | html("</table><ul class='pager'>"); |
Ondrej Jirman | a922615 | 2007-05-26 03:26:14 +0200 | [diff] [blame] | 519 | if (ofs > 0) { |
Lukas Fleischer | b60e6bf | 2013-03-07 08:56:22 +0100 | [diff] [blame] | 520 | html("<li>"); |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 521 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
Johan Herland | afc4072 | 2010-06-11 14:50:47 +0200 | [diff] [blame] | 522 | ctx.qry.sha1, ctx.qry.vpath, |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 523 | ofs - cnt, ctx.qry.grep, |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 524 | ctx.qry.search, ctx.qry.showmsg, |
| 525 | ctx.qry.follow); |
Lukas Fleischer | b60e6bf | 2013-03-07 08:56:22 +0100 | [diff] [blame] | 526 | html("</li>"); |
Ondrej Jirman | a922615 | 2007-05-26 03:26:14 +0200 | [diff] [blame] | 527 | } |
Ondrej Jirman | a922615 | 2007-05-26 03:26:14 +0200 | [diff] [blame] | 528 | if ((commit = get_revision(&rev)) != NULL) { |
Lukas Fleischer | b60e6bf | 2013-03-07 08:56:22 +0100 | [diff] [blame] | 529 | html("<li>"); |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 530 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
Johan Herland | afc4072 | 2010-06-11 14:50:47 +0200 | [diff] [blame] | 531 | ctx.qry.sha1, ctx.qry.vpath, |
Lars Hjemli | d14d77f | 2008-02-16 11:53:40 +0100 | [diff] [blame] | 532 | ofs + cnt, ctx.qry.grep, |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 533 | ctx.qry.search, ctx.qry.showmsg, |
| 534 | ctx.qry.follow); |
Lukas Fleischer | b60e6bf | 2013-03-07 08:56:22 +0100 | [diff] [blame] | 535 | html("</li>"); |
Ondrej Jirman | a922615 | 2007-05-26 03:26:14 +0200 | [diff] [blame] | 536 | } |
Lukas Fleischer | b60e6bf | 2013-03-07 08:56:22 +0100 | [diff] [blame] | 537 | html("</ul>"); |
John Keeping | 23c17d8 | 2015-08-14 12:47:15 +0100 | [diff] [blame] | 538 | cgit_print_layout_end(); |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 539 | } else if ((commit = get_revision(&rev)) != NULL) { |
Lukas Fleischer | ef8a97d | 2013-03-05 15:42:14 +0100 | [diff] [blame] | 540 | htmlf("<tr class='nohover'><td colspan='%d'>", columns); |
Johan Herland | afc4072 | 2010-06-11 14:50:47 +0200 | [diff] [blame] | 541 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
John Keeping | 30304d8 | 2015-08-12 15:55:28 +0100 | [diff] [blame] | 542 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg, |
| 543 | ctx.qry.follow); |
Lars Hjemli | 5764fe9 | 2008-04-14 22:13:38 +0200 | [diff] [blame] | 544 | html("</td></tr>\n"); |
Lars Hjemli | 420712a | 2006-12-14 00:40:34 +0100 | [diff] [blame] | 545 | } |
John Keeping | fb3655d | 2013-04-06 10:28:57 +0100 | [diff] [blame] | 546 | |
| 547 | /* If we allocated tip then it is safe to cast away const. */ |
| 548 | if (must_free_tip) |
| 549 | free((char*) tip); |
Lars Hjemli | d14c5f6 | 2006-12-11 17:04:19 +0100 | [diff] [blame] | 550 | } |