aboutsummaryrefslogtreecommitdiffstats
path: root/ui-log.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c56
1 files changed, 37 insertions, 19 deletions
diff --git a/ui-log.c b/ui-log.c
index f3132c9..41b5225 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -33,7 +33,8 @@ void inspect_files(struct diff_filepair *pair)
33 files++; 33 files++;
34 if (ctx.repo->enable_log_linecount) 34 if (ctx.repo->enable_log_linecount)
35 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 35 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
36 &new_size, &binary, count_lines); 36 &new_size, &binary, 0, ctx.qry.ignorews,
37 count_lines);
37} 38}
38 39
39void show_commit_decorations(struct commit *commit) 40void show_commit_decorations(struct commit *commit)
@@ -46,8 +47,9 @@ void show_commit_decorations(struct commit *commit)
46 while (deco) { 47 while (deco) {
47 if (!prefixcmp(deco->name, "refs/heads/")) { 48 if (!prefixcmp(deco->name, "refs/heads/")) {
48 strncpy(buf, deco->name + 11, sizeof(buf) - 1); 49 strncpy(buf, deco->name + 11, sizeof(buf) - 1);
49 cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, 50 cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
50 0, NULL, NULL, ctx.qry.showmsg); 51 ctx.qry.vpath, 0, NULL, NULL,
52 ctx.qry.showmsg);
51 } 53 }
52 else if (!prefixcmp(deco->name, "tag: refs/tags/")) { 54 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
53 strncpy(buf, deco->name + 15, sizeof(buf) - 1); 55 strncpy(buf, deco->name + 15, sizeof(buf) - 1);
@@ -60,13 +62,15 @@ void show_commit_decorations(struct commit *commit)
60 else if (!prefixcmp(deco->name, "refs/remotes/")) { 62 else if (!prefixcmp(deco->name, "refs/remotes/")) {
61 strncpy(buf, deco->name + 13, sizeof(buf) - 1); 63 strncpy(buf, deco->name + 13, sizeof(buf) - 1);
62 cgit_log_link(buf, NULL, "remote-deco", NULL, 64 cgit_log_link(buf, NULL, "remote-deco", NULL,
63 sha1_to_hex(commit->object.sha1), NULL, 65 sha1_to_hex(commit->object.sha1),
64 0, NULL, NULL, ctx.qry.showmsg); 66 ctx.qry.vpath, 0, NULL, NULL,
67 ctx.qry.showmsg);
65 } 68 }
66 else { 69 else {
67 strncpy(buf, deco->name, sizeof(buf) - 1); 70 strncpy(buf, deco->name, sizeof(buf) - 1);
68 cgit_commit_link(buf, NULL, "deco", ctx.qry.head, 71 cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
69 sha1_to_hex(commit->object.sha1)); 72 sha1_to_hex(commit->object.sha1),
73 ctx.qry.vpath, 0);
70 } 74 }
71 deco = deco->next; 75 deco = deco->next;
72 } 76 }
@@ -82,14 +86,14 @@ void print_commit(struct commit *commit)
82 htmlf("<tr%s><td>", 86 htmlf("<tr%s><td>",
83 ctx.qry.showmsg ? " class='logheader'" : ""); 87 ctx.qry.showmsg ? " class='logheader'" : "");
84 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 88 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
85 tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); 89 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
86 html_link_open(tmp, NULL, NULL); 90 html_link_open(tmp, NULL, NULL);
87 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 91 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
88 html_link_close(); 92 html_link_close();
89 htmlf("</td><td%s>", 93 htmlf("</td><td%s>",
90 ctx.qry.showmsg ? " class='logsubject'" : ""); 94 ctx.qry.showmsg ? " class='logsubject'" : "");
91 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 95 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
92 sha1_to_hex(commit->object.sha1)); 96 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
93 show_commit_decorations(commit); 97 show_commit_decorations(commit);
94 html("</td><td>"); 98 html("</td><td>");
95 html_txt(info->author); 99 html_txt(info->author);
@@ -107,6 +111,9 @@ void print_commit(struct commit *commit)
107 } 111 }
108 html("</td></tr>\n"); 112 html("</td></tr>\n");
109 if (ctx.qry.showmsg) { 113 if (ctx.qry.showmsg) {
114 struct strbuf notes = STRBUF_INIT;
115 format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
116
110 if (ctx.repo->enable_log_filecount) { 117 if (ctx.repo->enable_log_filecount) {
111 cols++; 118 cols++;
112 if (ctx.repo->enable_log_linecount) 119 if (ctx.repo->enable_log_linecount)
@@ -116,6 +123,15 @@ void print_commit(struct commit *commit)
116 cols); 123 cols);
117 html_txt(info->msg); 124 html_txt(info->msg);
118 html("</td></tr>\n"); 125 html("</td></tr>\n");
126 if (notes.len != 0) {
127 html("<tr class='nohover'>");
128 html("<td class='lognotes-label'>Notes:</td>");
129 htmlf("<td colspan='%d' class='lognotes'>",
130 cols);
131 html_txt(notes.buf);
132 html("</td></tr>\n");
133 }
134 strbuf_release(&notes);
119 } 135 }
120 cgit_free_commitinfo(info); 136 cgit_free_commitinfo(info);
121} 137}
@@ -146,10 +162,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
146 162
147 argv[1] = disambiguate_ref(tip); 163 argv[1] = disambiguate_ref(tip);
148 164
149 if (grep && pattern && (!strcmp(grep, "grep") || 165 if (grep && pattern) {
150 !strcmp(grep, "author") || 166 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
151 !strcmp(grep, "committer"))) 167 !strcmp(grep, "committer"))
152 argv[argc++] = fmt("--%s=%s", grep, pattern); 168 argv[argc++] = fmt("--%s=%s", grep, pattern);
169 if (!strcmp(grep, "range"))
170 argv[1] = pattern;
171 }
153 172
154 if (path) { 173 if (path) {
155 argv[argc++] = "--"; 174 argv[argc++] = "--";
@@ -176,7 +195,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
176 html(" ("); 195 html(" (");
177 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, 196 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
178 NULL, ctx.qry.head, ctx.qry.sha1, 197 NULL, ctx.qry.head, ctx.qry.sha1,
179 ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, 198 ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
180 ctx.qry.search, ctx.qry.showmsg ? 0 : 1); 199 ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
181 html(")"); 200 html(")");
182 } 201 }
@@ -209,26 +228,25 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
209 commit->parents = NULL; 228 commit->parents = NULL;
210 } 229 }
211 if (pager) { 230 if (pager) {
212 htmlf("</table><div class='pager'>", 231 html("</table><div class='pager'>");
213 columns);
214 if (ofs > 0) { 232 if (ofs > 0) {
215 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, 233 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
216 ctx.qry.sha1, ctx.qry.path, 234 ctx.qry.sha1, ctx.qry.vpath,
217 ofs - cnt, ctx.qry.grep, 235 ofs - cnt, ctx.qry.grep,
218 ctx.qry.search, ctx.qry.showmsg); 236 ctx.qry.search, ctx.qry.showmsg);
219 html("&nbsp;"); 237 html("&nbsp;");
220 } 238 }
221 if ((commit = get_revision(&rev)) != NULL) { 239 if ((commit = get_revision(&rev)) != NULL) {
222 cgit_log_link("[next]", NULL, NULL, ctx.qry.head, 240 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
223 ctx.qry.sha1, ctx.qry.path, 241 ctx.qry.sha1, ctx.qry.vpath,
224 ofs + cnt, ctx.qry.grep, 242 ofs + cnt, ctx.qry.grep,
225 ctx.qry.search, ctx.qry.showmsg); 243 ctx.qry.search, ctx.qry.showmsg);
226 } 244 }
227 html("</div>"); 245 html("</div>");
228 } else if ((commit = get_revision(&rev)) != NULL) { 246 } else if ((commit = get_revision(&rev)) != NULL) {
229 html("<tr class='nohover'><td colspan='3'>"); 247 html("<tr class='nohover'><td colspan='3'>");
230 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, 248 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
231 NULL, NULL, ctx.qry.showmsg); 249 ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
232 html("</td></tr>\n"); 250 html("</td></tr>\n");
233 } 251 }
234} 252}