X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/5764fe95469f65fdee285467f0f87d188fc1a780..d529c6fbdca7ce3782e75b3a74baad21ef2f92c3:/ui-log.c diff --git a/ui-log.c b/ui-log.c index 9b2ffb6..d212984 100644 --- a/ui-log.c +++ b/ui-log.c @@ -34,10 +34,15 @@ 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)); @@ -59,18 +64,31 @@ void print_commit(struct commit *commit) 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; + + 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, 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") || @@ -87,10 +105,8 @@ 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); - } + rev.grep_filter.regflags |= REG_ICASE; + compile_grep_patterns(&rev.grep_filter); prepare_revision_walk(&rev); if (pager)