|
diff --git a/ui-log.c b/ui-log.c index f3132c9..41b5225 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -35,3 +35,4 @@ void inspect_files(struct diff_filepair *pair) |
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 | } |
@@ -48,4 +49,5 @@ void show_commit_decorations(struct commit *commit) |
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 | } |
@@ -62,4 +64,5 @@ void show_commit_decorations(struct commit *commit) |
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 | } |
@@ -68,3 +71,4 @@ void show_commit_decorations(struct commit *commit) |
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 | } |
@@ -84,3 +88,3 @@ void print_commit(struct commit *commit) |
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); |
@@ -91,3 +95,3 @@ void print_commit(struct commit *commit) |
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); |
@@ -109,2 +113,5 @@ void print_commit(struct commit *commit) |
109 | if (ctx.qry.showmsg) { |
113 | if (ctx.qry.showmsg) { |
| |
114 | struct strbuf notes = STRBUF_INIT; |
| |
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
| |
116 | |
110 | if (ctx.repo->enable_log_filecount) { |
117 | if (ctx.repo->enable_log_filecount) { |
@@ -118,2 +125,11 @@ void print_commit(struct commit *commit) |
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(¬es); |
119 | } |
135 | } |
@@ -148,6 +164,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
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 | |
@@ -178,3 +197,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
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); |
@@ -211,7 +230,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
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, |
@@ -222,3 +240,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
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, |
@@ -229,4 +247,4 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
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"); |
|