author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-12-23 11:47:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:41:39 (UTC) |
commit | e52040bf90b034aebbfa32756638a24d6b1b3712 (patch) (unidiff) | |
tree | ba2db3037cb486fb40a8c85a62b5a393d5035924 | |
parent | 808c685ebb7cd2d24d3881b74e3be2439bd1393b (diff) | |
download | cgit-e52040bf90b034aebbfa32756638a24d6b1b3712.zip cgit-e52040bf90b034aebbfa32756638a24d6b1b3712.tar.gz cgit-e52040bf90b034aebbfa32756638a24d6b1b3712.tar.bz2 |
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>
-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
@@ -276,5 +276,5 @@ table.blob pre { | |||
276 | } | 276 | } |
277 | 277 | ||
278 | table.blob a.no { | 278 | table.blob a.no, table.ssdiff a.no { |
279 | color: gray; | 279 | color: gray; |
280 | text-align: right; | 280 | text-align: right; |
@@ -35,4 +35,15 @@ static struct fileinfo { | |||
35 | 35 | ||
36 | static int use_ssdiff = 0; | 36 | static int use_ssdiff = 0; |
37 | static struct diff_filepair *current_filepair; | ||
38 | |||
39 | struct diff_filespec *cgit_get_current_old_file(void) | ||
40 | { | ||
41 | return current_filepair->one; | ||
42 | } | ||
43 | |||
44 | struct diff_filespec *cgit_get_current_new_file(void) | ||
45 | { | ||
46 | return current_filepair->two; | ||
47 | } | ||
37 | 48 | ||
38 | static void print_fileinfo(struct fileinfo *info) | 49 | static void print_fileinfo(struct fileinfo *info) |
@@ -285,4 +296,5 @@ static void filepair_cb(struct diff_filepair *pair) | |||
285 | linediff_fn print_line_fn = print_line; | 296 | linediff_fn print_line_fn = print_line; |
286 | 297 | ||
298 | current_filepair = pair; | ||
287 | if (use_ssdiff) { | 299 | if (use_ssdiff) { |
288 | cgit_ssdiff_header_begin(); | 300 | cgit_ssdiff_header_begin(); |
@@ -8,3 +8,9 @@ extern void cgit_print_diff(const char *new_hex, const char *old_hex, | |||
8 | const char *prefix); | 8 | const char *prefix); |
9 | 9 | ||
10 | extern struct diff_filespec *cgit_get_current_old_file(void); | ||
11 | extern struct diff_filespec *cgit_get_current_new_file(void); | ||
12 | |||
13 | extern unsigned char old_rev_sha1[20]; | ||
14 | extern unsigned char new_rev_sha1[20]; | ||
15 | |||
10 | #endif /* UI_DIFF_H */ | 16 | #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 | |||
@@ -2,4 +2,5 @@ | |||
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; |
@@ -192,4 +193,5 @@ static void print_ssdiff_line(char *class, | |||
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); |
@@ -198,9 +200,15 @@ static void print_ssdiff_line(char *class, | |||
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 |
@@ -213,9 +221,15 @@ static void print_ssdiff_line(char *class, | |||
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 |