| -rw-r--r-- | ui-commit.c | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/ui-commit.c b/ui-commit.c index d489d7c..2679b59 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -13,2 +13,3 @@ static int total_adds, total_rems, max_changes; static int lines_added, lines_removed; +static char *curr_rev; @@ -29,3 +30,2 @@ void print_fileinfo(struct fileinfo *info) { - char *query, *query2; char *class; @@ -77,20 +77,8 @@ void print_fileinfo(struct fileinfo *info) htmlf("</td><td class='%s'>", class); - 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>"); - } + 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); html("</td><td class='right'>"); @@ -147,3 +135,3 @@ void inspect_filepair(struct diff_filepair *pair) -void cgit_print_commit(const char *hex) +void cgit_print_commit(char *hex) { @@ -153,3 +141,2 @@ void cgit_print_commit(const char *hex) unsigned char sha1[20]; - char *query; char *filename; @@ -160,2 +147,3 @@ void cgit_print_commit(const char *hex) hex = cgit_query_head; + curr_rev = hex; @@ -204,7 +192,6 @@ void cgit_print_commit(const char *hex) cgit_query_head, sha1_to_hex(p->item->object.sha1)); - html(" (<a href='"); - 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>"); + html(" ("); + cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, + sha1_to_hex(p->item->object.sha1), NULL); + html(")</td></tr>"); } @@ -235,6 +222,5 @@ void cgit_print_commit(const char *hex) files, total_adds, total_rems); - query = fmt("h=%s", hex); - html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); - html("show diff</a>)"); - html("</div>"); + cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex, + NULL, NULL); + html(")</div>"); } |