aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Plenz2012-10-30 13:56:01 +0100
committerJason A. Donenfeld2012-11-15 01:03:50 +0100
commitc6fe94e02a3963d4fddaf09cfc3e3dc1e186a881 (patch)
tree493fea8b9d300a73a67f9a12a3585bfb0ba8fb16
parent62a40c78fed772e795eca8d4e7d6f6ead4d9a125 (diff)
downloadcgit-c6fe94e02a3963d4fddaf09cfc3e3dc1e186a881.tar.gz
cgit-c6fe94e02a3963d4fddaf09cfc3e3dc1e186a881.tar.bz2
cgit-c6fe94e02a3963d4fddaf09cfc3e3dc1e186a881.zip
ssdiff: point line links at exact blob by prepending "id="
Previously, the id_str (i.e. the current or diffed-against commit's SHA1 ID) was simply concatenated to the URL. Now, prepend an "id=" string so that the links actually point to the right blobs and thus the exact lines. Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--ui-ssdiff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 0cff4b8..7108779 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -230,7 +230,7 @@ static void print_ssdiff_line(char *class,
230 if (old_line_no > 0) { 230 if (old_line_no > 0) {
231 struct diff_filespec *old_file = cgit_get_current_old_file(); 231 struct diff_filespec *old_file = cgit_get_current_old_file();
232 char *lineno_str = fmt("n%d", old_line_no); 232 char *lineno_str = fmt("n%d", old_line_no);
233 char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); 233 char *id_str = fmt("id=%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
234 html("<td class='lineno'><a class='no' href='"); 234 html("<td class='lineno'><a class='no' href='");
235 html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str)); 235 html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
236 htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); 236 htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
@@ -251,7 +251,7 @@ static void print_ssdiff_line(char *class,
251 if (new_line_no > 0) { 251 if (new_line_no > 0) {
252 struct diff_filespec *new_file = cgit_get_current_new_file(); 252 struct diff_filespec *new_file = cgit_get_current_new_file();
253 char *lineno_str = fmt("n%d", new_line_no); 253 char *lineno_str = fmt("n%d", new_line_no);
254 char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); 254 char *id_str = fmt("id=%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
255 html("<td class='lineno'><a class='no' href='"); 255 html("<td class='lineno'><a class='no' href='");
256 html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str)); 256 html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
257 htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); 257 htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);