| -rw-r--r-- | ui-log.c | 56 |
1 files changed, 37 insertions, 19 deletions
@@ -35,3 +35,4 @@ void inspect_files(struct diff_filepair *pair) cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, - &new_size, &binary, count_lines); + &new_size, &binary, 0, ctx.qry.ignorews, + count_lines); } @@ -48,4 +49,5 @@ void show_commit_decorations(struct commit *commit) strncpy(buf, deco->name + 11, sizeof(buf) - 1); - cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, - 0, NULL, NULL, ctx.qry.showmsg); + cgit_log_link(buf, NULL, "branch-deco", buf, NULL, + ctx.qry.vpath, 0, NULL, NULL, + ctx.qry.showmsg); } @@ -62,4 +64,5 @@ void show_commit_decorations(struct commit *commit) cgit_log_link(buf, NULL, "remote-deco", NULL, - sha1_to_hex(commit->object.sha1), NULL, - 0, NULL, NULL, ctx.qry.showmsg); + sha1_to_hex(commit->object.sha1), + ctx.qry.vpath, 0, NULL, NULL, + ctx.qry.showmsg); } @@ -68,3 +71,4 @@ void show_commit_decorations(struct commit *commit) cgit_commit_link(buf, NULL, "deco", ctx.qry.head, - sha1_to_hex(commit->object.sha1)); + sha1_to_hex(commit->object.sha1), + ctx.qry.vpath, 0); } @@ -84,3 +88,3 @@ void print_commit(struct commit *commit) tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); - tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); + tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); html_link_open(tmp, NULL, NULL); @@ -91,3 +95,3 @@ void print_commit(struct commit *commit) cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, - sha1_to_hex(commit->object.sha1)); + sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); show_commit_decorations(commit); @@ -109,2 +113,5 @@ void print_commit(struct commit *commit) if (ctx.qry.showmsg) { + struct strbuf notes = STRBUF_INIT; + format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); + if (ctx.repo->enable_log_filecount) { @@ -118,2 +125,11 @@ void print_commit(struct commit *commit) html("</td></tr>\n"); + if (notes.len != 0) { + html("<tr class='nohover'>"); + html("<td class='lognotes-label'>Notes:</td>"); + htmlf("<td colspan='%d' class='lognotes'>", + cols); + html_txt(notes.buf); + html("</td></tr>\n"); + } + strbuf_release(¬es); } @@ -148,6 +164,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern - if (grep && pattern && (!strcmp(grep, "grep") || - !strcmp(grep, "author") || - !strcmp(grep, "committer"))) - argv[argc++] = fmt("--%s=%s", grep, pattern); + if (grep && pattern) { + if (!strcmp(grep, "grep") || !strcmp(grep, "author") || + !strcmp(grep, "committer")) + argv[argc++] = fmt("--%s=%s", grep, pattern); + if (!strcmp(grep, "range")) + argv[1] = pattern; + } @@ -178,3 +197,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern NULL, ctx.qry.head, ctx.qry.sha1, - ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, + ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, 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 if (pager) { - htmlf("</table><div class='pager'>", - columns); + html("</table><div class='pager'>"); if (ofs > 0) { cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, - ctx.qry.sha1, ctx.qry.path, + ctx.qry.sha1, ctx.qry.vpath, ofs - cnt, ctx.qry.grep, @@ -222,3 +240,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern cgit_log_link("[next]", NULL, NULL, ctx.qry.head, - ctx.qry.sha1, ctx.qry.path, + ctx.qry.sha1, ctx.qry.vpath, ofs + cnt, ctx.qry.grep, @@ -229,4 +247,4 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern html("<tr class='nohover'><td colspan='3'>"); - cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, - NULL, NULL, ctx.qry.showmsg); + cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, + ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); html("</td></tr>\n"); |