X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/d14d77fe95c3b6224b40df9b101dded0deea913c..4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e:/ui-log.c?ds=sidebyside diff --git a/ui-log.c b/ui-log.c index a39474b..f3132c9 100644 --- a/ui-log.c +++ b/ui-log.c @@ -7,6 +7,8 @@ */ #include "cgit.h" +#include "html.h" +#include "ui-shared.h" int files, add_lines, rem_lines; @@ -24,50 +26,125 @@ void count_lines(char *line, int size) void inspect_files(struct diff_filepair *pair) { + unsigned long old_size = 0; + unsigned long new_size = 0; + int binary = 0; + files++; - if (cgit_repo->enable_log_linecount) - cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); + if (ctx.repo->enable_log_linecount) + cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, + &new_size, &binary, count_lines); +} + +void show_commit_decorations(struct commit *commit) +{ + struct name_decoration *deco; + static char buf[1024]; + + buf[sizeof(buf) - 1] = 0; + deco = lookup_decoration(&name_decoration, &commit->object); + while (deco) { + if (!prefixcmp(deco->name, "refs/heads/")) { + strncpy(buf, deco->name + 11, sizeof(buf) - 1); + cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, + 0, NULL, NULL, ctx.qry.showmsg); + } + else if (!prefixcmp(deco->name, "tag: refs/tags/")) { + strncpy(buf, deco->name + 15, sizeof(buf) - 1); + cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); + } + else if (!prefixcmp(deco->name, "refs/tags/")) { + strncpy(buf, deco->name + 10, sizeof(buf) - 1); + cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); + } + else if (!prefixcmp(deco->name, "refs/remotes/")) { + strncpy(buf, deco->name + 13, sizeof(buf) - 1); + cgit_log_link(buf, NULL, "remote-deco", NULL, + sha1_to_hex(commit->object.sha1), NULL, + 0, NULL, NULL, ctx.qry.showmsg); + } + else { + strncpy(buf, deco->name, sizeof(buf) - 1); + cgit_commit_link(buf, NULL, "deco", ctx.qry.head, + sha1_to_hex(commit->object.sha1)); + } + deco = deco->next; + } } void print_commit(struct commit *commit) { struct commitinfo *info; + char *tmp; + int cols = 2; info = cgit_parse_commit(commit); - html(""); + htmlf("", + ctx.qry.showmsg ? " class='logheader'" : ""); + tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); + tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); + html_link_open(tmp, NULL, NULL); cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); - html(""); + html_link_close(); + htmlf("", + ctx.qry.showmsg ? " class='logsubject'" : ""); cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, sha1_to_hex(commit->object.sha1)); - if (cgit_repo->enable_log_filecount) { + show_commit_decorations(commit); + html(""); + html_txt(info->author); + if (ctx.repo->enable_log_filecount) { files = 0; add_lines = 0; rem_lines = 0; cgit_diff_commit(commit, inspect_files); - html(""); + html(""); htmlf("%d", files); - if (cgit_repo->enable_log_linecount) { - html(""); + if (ctx.repo->enable_log_linecount) { + html(""); htmlf("-%d/+%d", rem_lines, add_lines); } } - html(""); - html_txt(info->author); html("\n"); + if (ctx.qry.showmsg) { + if (ctx.repo->enable_log_filecount) { + cols++; + if (ctx.repo->enable_log_linecount) + cols++; + } + htmlf("", + cols); + html_txt(info->msg); + html("\n"); + } cgit_free_commitinfo(info); } +static const char *disambiguate_ref(const char *ref) +{ + unsigned char sha1[20]; + const char *longref; + + longref = fmt("refs/heads/%s", ref); + if (get_sha1(longref, sha1) == 0) + return longref; -void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) + return ref; +} + +void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, + char *path, int pager) { struct rev_info rev; struct commit *commit; - const char *argv[] = {NULL, tip, NULL, NULL, NULL}; + const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; int argc = 2; - int i; + int i, columns = 3; if (!tip) - argv[1] = ctx.qry.head; + tip = ctx.qry.head; + + argv[1] = disambiguate_ref(tip); if (grep && pattern && (!strcmp(grep, "grep") || !strcmp(grep, "author") || @@ -84,22 +161,35 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern rev.verbose_header = 1; rev.show_root_diff = 0; setup_revisions(argc, argv, &rev, NULL); - if (rev.grep_filter) { - rev.grep_filter->regflags |= REG_ICASE; - compile_grep_patterns(rev.grep_filter); - } + load_ref_decorations(DECORATE_FULL_REFS); + rev.show_decorations = 1; + rev.grep_filter.regflags |= REG_ICASE; + compile_grep_patterns(&rev.grep_filter); prepare_revision_walk(&rev); - html(""); - html("" - ""); + if (pager) + html("
AgeMessage
"); - if (cgit_repo->enable_log_filecount) { - html(""); - if (cgit_repo->enable_log_linecount) - html(""); + html("" + "\n"); + html(""); + if (ctx.repo->enable_log_filecount) { + html(""); + columns++; + if (ctx.repo->enable_log_linecount) { + html(""); + columns++; + } + } + html("\n"); if (ofs<0) ofs = 0; @@ -118,23 +208,27 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern free_commit_list(commit->parents); commit->parents = NULL; } - html("
FilesLines
AgeCommit message"); + if (pager) { + html(" ("); + cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, + NULL, ctx.qry.head, ctx.qry.sha1, + ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, + ctx.qry.search, ctx.qry.showmsg ? 0 : 1); + html(")"); } - html("Author
AuthorFilesLines
\n"); - if (pager) { - html("
"); + htmlf("
", + columns); if (ofs > 0) { cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.path, ofs - cnt, ctx.qry.grep, - ctx.qry.search); + ctx.qry.search, ctx.qry.showmsg); html(" "); } if ((commit = get_revision(&rev)) != NULL) { cgit_log_link("[next]", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.path, ofs + cnt, ctx.qry.grep, - ctx.qry.search); + ctx.qry.search, ctx.qry.showmsg); } html("
"); + } else if ((commit = get_revision(&rev)) != NULL) { + html(""); + cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, + NULL, NULL, ctx.qry.showmsg); + html("\n"); } }