From 4a0be586662843382ecfa53af34a13b291312bc0 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 17 Jun 2007 18:12:03 +0200
Subject: Add cgit_diff_link()

This adds a new function used to generate links to the diff page and uses
it everywhere such links appear (expect for single files in the diffstat
displayed on the commit page: this is now a link to the tree page).

The updated diff-page now expects zero, one or two revision specifiers, in
parameters head, id and id2. Id defaults to head unless otherwise specified,
while head (as usual) defaults to repo.defbranch. If id2 isn't specified, it
defaults to the first parent of id1.

The most important change is of course that now all repo pages (summary, log,
tree, commit and diff) has support for passing on the current branch and
revision, i.e. the road is now open for a 'static' menu with links to all
of these pages.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 ui-commit.c | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

(limited to 'ui-commit.c')

diff --git a/ui-commit.c b/ui-commit.c
index d489d7c..2679b59 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -11,6 +11,7 @@
 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;
@@ -27,7 +28,6 @@ static struct fileinfo {
 
 void print_fileinfo(struct fileinfo *info)
 {
-	char *query, *query2;
 	char *class;
 
 	switch (info->status) {
@@ -75,24 +75,12 @@ void print_fileinfo(struct fileinfo *info)
 		html("]</span>");
 	}
 	htmlf("</td><td class='%s'>", class);
-	query = fmt("id=%s&amp;id2=%s&amp;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'>");
 	htmlf("%d", info->added + info->removed);
 	html("</td><td class='graph'>");
@@ -145,19 +133,19 @@ void inspect_filepair(struct diff_filepair *pair)
 }
 
 
-void cgit_print_commit(const char *hex)
+void cgit_print_commit(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;
+	curr_rev = hex;
 
 	if (get_sha1(hex, sha1)) {
 		cgit_print_error(fmt("Bad object id: %s", hex));
@@ -202,11 +190,10 @@ void cgit_print_commit(const char *hex)
 		     "<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>");
+		html(" (");
+		cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
+			       sha1_to_hex(p->item->object.sha1), NULL);
+		html(")</td></tr>");
 	}
 	if (cgit_repo->snapshots) {
 		htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
@@ -233,10 +220,9 @@ void cgit_print_commit(const char *hex)
 		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_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
+			       NULL, NULL);
+		html(")</div>");
 	}
 	cgit_free_commitinfo(info);
 }
-- 
cgit v1.2.3-59-g8ed1b