diff options
author | Bernhard Reutner-Fischer | 2010-12-23 12:47:55 +0100 |
---|---|---|
committer | Lars Hjemli | 2011-02-19 14:41:39 +0100 |
commit | e52040bf90b034aebbfa32756638a24d6b1b3712 (patch) | |
tree | ba2db3037cb486fb40a8c85a62b5a393d5035924 /ui-ssdiff.c | |
parent | 808c685ebb7cd2d24d3881b74e3be2439bd1393b (diff) | |
download | cgit-e52040bf90b034aebbfa32756638a24d6b1b3712.tar.gz cgit-e52040bf90b034aebbfa32756638a24d6b1b3712.tar.bz2 cgit-e52040bf90b034aebbfa32756638a24d6b1b3712.zip |
ssdiff: anchors for ssdiff
Emit anchors to the respective revisions in side-by-side diff view
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-ssdiff.c')
-rw-r--r-- | ui-ssdiff.c | 34 |
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,6 +1,7 @@ | |||
1 | #include "cgit.h" | 1 | #include "cgit.h" |
2 | #include "html.h" | 2 | #include "html.h" |
3 | #include "ui-shared.h" | 3 | #include "ui-shared.h" |
4 | #include "ui-diff.h" | ||
4 | 5 | ||
5 | extern int use_ssdiff; | 6 | extern int use_ssdiff; |
6 | 7 | ||
@@ -191,17 +192,24 @@ static void print_ssdiff_line(char *class, | |||
191 | char *new_line, int individual_chars) | 192 | char *new_line, int individual_chars) |
192 | { | 193 | { |
193 | char *lcs = NULL; | 194 | char *lcs = NULL; |
195 | |||
194 | if (old_line) | 196 | if (old_line) |
195 | old_line = replace_tabs(old_line + 1); | 197 | old_line = replace_tabs(old_line + 1); |
196 | if (new_line) | 198 | if (new_line) |
197 | new_line = replace_tabs(new_line + 1); | 199 | new_line = replace_tabs(new_line + 1); |
198 | if (individual_chars && old_line && new_line) | 200 | if (individual_chars && old_line && new_line) |
199 | lcs = longest_common_subsequence(old_line, new_line); | 201 | lcs = longest_common_subsequence(old_line, new_line); |
200 | html("<tr>"); | 202 | html("<tr>\n"); |
201 | if (old_line_no > 0) | 203 | if (old_line_no > 0) { |
202 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | 204 | struct diff_filespec *old_file = cgit_get_current_old_file(); |
203 | old_line_no, class); | 205 | char *lineno_str = fmt("n%d", old_line_no); |
204 | else if (old_line) | 206 | char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); |
207 | html("<td class='lineno'><a class='no' href='"); | ||
208 | html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str)); | ||
209 | htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); | ||
210 | html("</td>"); | ||
211 | htmlf("<td class='%s'>", class); | ||
212 | } else if (old_line) | ||
205 | htmlf("<td class='lineno'></td><td class='%s'>", class); | 213 | htmlf("<td class='lineno'></td><td class='%s'>", class); |
206 | else | 214 | else |
207 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); | 215 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); |
@@ -212,11 +220,17 @@ static void print_ssdiff_line(char *class, | |||
212 | html_txt(old_line); | 220 | html_txt(old_line); |
213 | } | 221 | } |
214 | 222 | ||
215 | html("</td>"); | 223 | html("</td>\n"); |
216 | if (new_line_no > 0) | 224 | if (new_line_no > 0) { |
217 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | 225 | struct diff_filespec *new_file = cgit_get_current_new_file(); |
218 | new_line_no, class); | 226 | char *lineno_str = fmt("n%d", new_line_no); |
219 | else if (new_line) | 227 | char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); |
228 | html("<td class='lineno'><a class='no' href='"); | ||
229 | html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str)); | ||
230 | htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); | ||
231 | html("</td>"); | ||
232 | htmlf("<td class='%s'>", class); | ||
233 | } else if (new_line) | ||
220 | htmlf("<td class='lineno'></td><td class='%s'>", class); | 234 | htmlf("<td class='lineno'></td><td class='%s'>", class); |
221 | else | 235 | else |
222 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); | 236 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); |