ui-commit: use cgit_commit_link() for parent links

This replaces the old cgit_pageurl() function with the brand new
cgit_commit_link() function, making parent links in commit view preserve
the current branch.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/ui-commit.c b/ui-commit.c
index 8864fc6..d489d7c 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -106,139 +106,137 @@ void print_fileinfo(struct fileinfo *info)
         html("</tr></table></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
 {
         if (line && (len > 0)) {
                 if (line[0] == '+')
                         lines_added++;
                 else if (line[0] == '-')
                         lines_removed++;
         }
 }
 
 void inspect_filepair(struct diff_filepair *pair)
 {
         files++;
         lines_added = 0;
         lines_removed = 0;
         cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
         if (files >= slots) {
                 if (slots == 0)
                         slots = 4;
                 else
                         slots = slots * 2;
                 items = xrealloc(items, slots * sizeof(struct fileinfo));
         }
         items[files-1].status = pair->status;
         hashcpy(items[files-1].old_sha1, pair->one->sha1);
         hashcpy(items[files-1].new_sha1, pair->two->sha1);
         items[files-1].old_mode = pair->one->mode;
         items[files-1].new_mode = pair->two->mode;
         items[files-1].old_path = xstrdup(pair->one->path);
         items[files-1].new_path = xstrdup(pair->two->path);
         items[files-1].added = lines_added;
         items[files-1].removed = lines_removed;
         if (lines_added + lines_removed > max_changes)
                 max_changes = lines_added + lines_removed;
         total_adds += lines_added;
         total_rems += lines_removed;
 }
 
 
 void cgit_print_commit(const char *hex)
 {
         struct commit *commit, *parent;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *query;
         char *filename;
         char *tmp;
         int i;
 
         if (!hex)
                 hex = cgit_query_head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
 
         html("<table class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
         html(" ");
         html_txt(info->author_email);
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE);
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
         html(" ");
         html_txt(info->committer_email);
         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");
               for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
                 if (!parent) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
                         html("</td></tr>");
                         continue;
                 }
                 html("<tr><th>parent</th>"
-                     "<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));
+                     "<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(" (<a href='");
                 query = fmt("id=%s&amp;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) {
                 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&amp;name=%s", hex, filename)));
                 htmlf("'>%s</a></td></tr>", filename);
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
         html_txt(info->subject);
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         html("</div>");
         if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
                 html("<div class='diffstat-header'>Diffstat</div>");
                 html("<table class='diffstat'>");
                 max_changes = 0;
                 cgit_diff_commit(commit, inspect_filepair);
                 for(i = 0; i<files; i++)
                         print_fileinfo(&items[i]);
                 html("</table>");
                 html("<div class='diffstat-summary'>");
                 htmlf("%d files changed, %d insertions, %d deletions (",
                       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_free_commitinfo(info);
 }