Merge branch 'br/misc'

* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link

1 files changed, 24 insertions, 10 deletions

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 408e620..2481585 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,51 +1,52 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-diff.h"
 
 extern int use_ssdiff;
 
 static int current_old_line, current_new_line;
 
 struct deferred_lines {
 	int line_no;
 	char *line;
 	struct deferred_lines *next;
 };
 
 static struct deferred_lines *deferred_old, *deferred_old_last;
 static struct deferred_lines *deferred_new, *deferred_new_last;
 
 static char *longest_common_subsequence(char *A, char *B)
 {
 	int i, j, ri;
 	int m = strlen(A);
 	int n = strlen(B);
 	int L[m + 1][n + 1];
 	int tmp1, tmp2;
 	int lcs_length;
 	char *result;
 
 	for (i = m; i >= 0; i--) {
 		for (j = n; j >= 0; j--) {
 			if (A[i] == '\0' || B[j] == '\0') {
 				L[i][j] = 0;
 			} else if (A[i] == B[j]) {
 				L[i][j] = 1 + L[i + 1][j + 1];
 			} else {
 				tmp1 = L[i + 1][j];
 				tmp2 = L[i][j + 1];
 				L[i][j] = (tmp1 > tmp2 ? tmp1 : tmp2);
 			}
 		}
 	}
 
 	lcs_length = L[0][0];
 	result = xmalloc(lcs_length + 2);
 	memset(result, 0, sizeof(*result) * (lcs_length + 2));
 
 	ri = 0;
 	i = 0;
 	j = 0;
 	while (i < m && j < n) {
 		if (A[i] == B[j]) {
 			result[ri] = A[i];
@@ -146,122 +147,135 @@ static void deferred_old_add(char *line, int line_no)
 
 static void deferred_new_add(char *line, int line_no)
 {
 	struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
 	item->line = xstrdup(line);
 	item->line_no = line_no;
 	item->next = NULL;
 	if (deferred_new) {
 		deferred_new_last->next = item;
 		deferred_new_last = item;
 	} else {
 		deferred_new = deferred_new_last = item;
 	}
 }
 
 static void print_part_with_lcs(char *class, char *line, char *lcs)
 {
 	int line_len = strlen(line);
 	int i, j;
 	char c[2] = " ";
 	int same = 1;
 
 	j = 0;
 	for (i = 0; i < line_len; i++) {
 		c[0] = line[i];
 		if (same) {
 			if (line[i] == lcs[j])
 				j += 1;
 			else {
 				same = 0;
 				htmlf("<span class='%s'>", class);
 			}
 		} else if (line[i] == lcs[j]) {
 			same = 1;
 			htmlf("</span>");
 			j += 1;
 		}
 		html_txt(c);
 	}
 }
 
 static void print_ssdiff_line(char *class,
 			      int old_line_no,
 			      char *old_line,
 			      int new_line_no,
 			      char *new_line, int individual_chars)
 {
 	char *lcs = NULL;
+
 	if (old_line)
 		old_line = replace_tabs(old_line + 1);
 	if (new_line)
 		new_line = replace_tabs(new_line + 1);
 	if (individual_chars && old_line && new_line)
 		lcs = longest_common_subsequence(old_line, new_line);
-	html("<tr>");
-	if (old_line_no > 0)
-		htmlf("<td class='lineno'>%d</td><td class='%s'>",
-		      old_line_no, class);
-	else if (old_line)
+	html("<tr>\n");
+	if (old_line_no > 0) {
+		struct diff_filespec *old_file = cgit_get_current_old_file();
+		char *lineno_str = fmt("n%d", old_line_no);
+		char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
+		html("<td class='lineno'><a class='no' href='");
+		html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
+		htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+		html("</td>");
+		htmlf("<td class='%s'>", class);
+	} else if (old_line)
 		htmlf("<td class='lineno'></td><td class='%s'>", class);
 	else
 		htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 	if (old_line) {
 		if (lcs)
 			print_part_with_lcs("del", old_line, lcs);
 		else
 			html_txt(old_line);
 	}
 
-	html("</td>");
-	if (new_line_no > 0)
-		htmlf("<td class='lineno'>%d</td><td class='%s'>",
-		      new_line_no, class);
-	else if (new_line)
+	html("</td>\n");
+	if (new_line_no > 0) {
+		struct diff_filespec *new_file = cgit_get_current_new_file();
+		char *lineno_str = fmt("n%d", new_line_no);
+		char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
+		html("<td class='lineno'><a class='no' href='");
+		html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
+		htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+		html("</td>");
+		htmlf("<td class='%s'>", class);
+	} else if (new_line)
 		htmlf("<td class='lineno'></td><td class='%s'>", class);
 	else
 		htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 	if (new_line) {
 		if (lcs)
 			print_part_with_lcs("add", new_line, lcs);
 		else
 			html_txt(new_line);
 	}
 
 	html("</td></tr>");
 	if (lcs)
 		free(lcs);
 	if (new_line)
 		free(new_line);
 	if (old_line)
 		free(old_line);
 }
 
 static void print_deferred_old_lines()
 {
 	struct deferred_lines *iter_old, *tmp;
 	iter_old = deferred_old;
 	while (iter_old) {
 		print_ssdiff_line("del", iter_old->line_no,
 				  iter_old->line, -1, NULL, 0);
 		tmp = iter_old->next;
 		free(iter_old);
 		iter_old = tmp;
 	}
 }
 
 static void print_deferred_new_lines()
 {
 	struct deferred_lines *iter_new, *tmp;
 	iter_new = deferred_new;
 	while (iter_new) {
 		print_ssdiff_line("add", -1, NULL,
 				  iter_new->line_no, iter_new->line, 0);
 		tmp = iter_new->next;
 		free(iter_new);
 		iter_new = tmp;
 	}
 }
 
 static void print_deferred_changed_lines()
 {
 	struct deferred_lines *iter_old, *iter_new, *tmp;