X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/a4d1ca1dc6ff8171694d9e2280b6075a1beced0c..a8305a9543969206aa7cec03948c5a19950eedb9:/ui-log.c diff --git a/ui-log.c b/ui-log.c index 60c9269..746f40b 100644 --- a/ui-log.c +++ b/ui-log.c @@ -34,39 +34,45 @@ void inspect_files(struct diff_filepair *pair) void print_commit(struct commit *commit) { struct commitinfo *info; + char *tmp; info = cgit_parse_commit(commit); html(""); + 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_link_close(); html(""); cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, sha1_to_hex(commit->object.sha1)); + 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 (ctx.repo->enable_log_linecount) { - html(""); + html(""); htmlf("-%d/+%d", rem_lines, add_lines); } } - html(""); - html_txt(info->author); html("\n"); cgit_free_commitinfo(info); } -void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) +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}; int argc = 2; - int i; + int i, columns = 3; if (!tip) argv[1] = ctx.qry.head; @@ -92,16 +98,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern } prepare_revision_walk(&rev); - html(""); - html("" - ""); + if (pager) + html("
AgeMessage
"); + html("" + "" + ""); if (ctx.repo->enable_log_filecount) { - html(""); - if (ctx.repo->enable_log_linecount) - html(""); + html(""); + columns++; + if (ctx.repo->enable_log_linecount) { + html(""); + columns++; + } } - html("\n"); + html("\n"); if (ofs<0) ofs = 0; @@ -120,10 +131,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern free_commit_list(commit->parents); commit->parents = NULL; } - html("
AgeCommit messageAuthorFilesLinesFilesLinesAuthor
\n"); - if (pager) { - html("
"); + htmlf("
", + columns); if (ofs > 0) { cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.path, @@ -138,5 +148,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern ctx.qry.search); } html("
"); + } else if ((commit = get_revision(&rev)) != NULL) { + html(""); + cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, + NULL, NULL); + html("\n"); } }