Diffstat (limited to 'ui-commit.c')
| -rw-r--r-- | ui-commit.c | 78 |
1 files changed, 46 insertions, 32 deletions
diff --git a/ui-commit.c b/ui-commit.c index 90e09ed..1d12bbb 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -11,7 +11,6 @@ static int files, slots; static int total_adds, total_rems, max_changes; static int lines_added, lines_removed; -static char *curr_rev; static struct fileinfo { char status; @@ -28,6 +27,7 @@ static struct fileinfo { void print_fileinfo(struct fileinfo *info) { + char *query, *query2; char *class; switch (info->status) { @@ -75,12 +75,24 @@ void print_fileinfo(struct fileinfo *info) html("]</span>"); } htmlf("</td><td class='%s'>", class); - cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, - info->new_path); - if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) - htmlf(" (%s from %s)", - info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", - info->old_path); + query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), + sha1_to_hex(info->new_sha1), info->new_path); + html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), + NULL, NULL); + if (info->status == DIFF_STATUS_COPIED || + info->status == DIFF_STATUS_RENAMED) { + html_txt(info->new_path); + htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? + "copied" : "renamed"); + query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); + html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), + NULL, NULL); + html_txt(info->old_path); + html("</a>)"); + } else { + html_txt(info->new_path); + html("</a>"); + } html("</td><td class='right'>"); htmlf("%d", info->added + info->removed); html("</td><td class='graph'>"); @@ -133,19 +145,16 @@ void inspect_filepair(struct diff_filepair *pair) } -void cgit_print_commit(char *hex) +void cgit_print_commit(const char *hex) { struct commit *commit, *parent; struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; - char *tmp; + char *query; + char *filename; int i; - if (!hex) - hex = cgit_query_head; - curr_rev = hex; - if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return; @@ -172,11 +181,11 @@ void cgit_print_commit(char *hex) html("</td><td class='right'>"); cgit_print_date(info->committer_date, FMT_LONGDATE); html("</td></tr>\n"); - html("<tr><th>tree</th><td colspan='2' class='sha1'>"); - tmp = xstrdup(hex); - cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, - cgit_query_head, tmp, NULL); - html("</td></tr>\n"); + html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); + query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), + sha1_to_hex(commit->tree->object.sha1)); + html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); + htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); for (p = commit->parents; p ; p = p->next) { parent = lookup_commit_reference(p->item->object.sha1); if (!parent) { @@ -186,19 +195,23 @@ void cgit_print_commit(char *hex) continue; } html("<tr><th>parent</th>" - "<td colspan='2' class='sha1'>"); - cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, - cgit_query_head, sha1_to_hex(p->item->object.sha1)); - html(" ("); - cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, - sha1_to_hex(p->item->object.sha1), NULL); - html(")</td></tr>"); + "<td colspan='2' class='sha1'>" + "<a href='"); + query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); + html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); + htmlf("'>%s</a> (<a href='", + sha1_to_hex(p->item->object.sha1)); + query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), + sha1_to_hex(commit->tree->object.sha1)); + html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); + html("'>diff</a>)</td></tr>"); } if (cgit_repo->snapshots) { - html("<tr><th>download</th><td colspan='2' class='sha1'>"); - cgit_print_snapshot_links(cgit_query_repo, cgit_query_head, - hex, cgit_repo->snapshots); - html("</td></tr>"); + htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); + filename = fmt("%s-%s.zip", cgit_query_repo, hex); + html_attr(cgit_pageurl(cgit_query_repo, "snapshot", + fmt("id=%s&name=%s", hex, filename))); + htmlf("'>%s</a></td></tr>", filename); } html("</table>\n"); html("<div class='commit-subject'>"); @@ -218,9 +231,10 @@ void cgit_print_commit(char *hex) html("<div class='diffstat-summary'>"); htmlf("%d files changed, %d insertions, %d deletions (", files, total_adds, total_rems); - cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex, - NULL, NULL); - html(")</div>"); + query = fmt("h=%s", hex); + html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); + html("show diff</a>)"); + html("</div>"); } cgit_free_commitinfo(info); } |