| -rw-r--r-- | cgit.css | 2 | ||||
| -rw-r--r-- | ui-diff.c | 12 | ||||
| -rw-r--r-- | ui-diff.h | 6 | ||||
| -rw-r--r-- | ui-ssdiff.c | 34 |
4 files changed, 43 insertions, 11 deletions
@@ -272,13 +272,13 @@ table.blob td.linenumbers { } table.blob pre { padding: 0; margin: 0; } -table.blob a.no { +table.blob a.no, table.ssdiff a.no { color: gray; text-align: right; text-decoration: none; } table.blob a.no a:hover { @@ -31,12 +31,23 @@ static struct fileinfo { unsigned long old_size; unsigned long new_size; int binary:1; } *items; static int use_ssdiff = 0; +static struct diff_filepair *current_filepair; + +struct diff_filespec *cgit_get_current_old_file(void) +{ + return current_filepair->one; +} + +struct diff_filespec *cgit_get_current_new_file(void) +{ + return current_filepair->two; +} static void print_fileinfo(struct fileinfo *info) { char *class; switch (info->status) { @@ -281,12 +292,13 @@ static void filepair_cb(struct diff_filepair *pair) { unsigned long old_size = 0; unsigned long new_size = 0; int binary = 0; linediff_fn print_line_fn = print_line; + current_filepair = pair; if (use_ssdiff) { cgit_ssdiff_header_begin(); print_line_fn = cgit_ssdiff_line_cb; } header(pair->one->sha1, pair->one->path, pair->one->mode, pair->two->sha1, pair->two->path, pair->two->mode); @@ -4,7 +4,13 @@ extern void cgit_print_diffstat(const unsigned char *old_sha1, const unsigned char *new_sha1); extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); +extern struct diff_filespec *cgit_get_current_old_file(void); +extern struct diff_filespec *cgit_get_current_new_file(void); + +extern unsigned char old_rev_sha1[20]; +extern unsigned char new_rev_sha1[20]; + #endif /* UI_DIFF_H */ diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 408e620..2481585 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -1,9 +1,10 @@ #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 { @@ -188,38 +189,51 @@ 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); |