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 /ui-diff.c | |
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-- | ui-diff.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -25,24 +25,35 @@ static struct fileinfo { | |||
25 | unsigned short old_mode; | 25 | unsigned short old_mode; |
26 | unsigned short new_mode; | 26 | unsigned short new_mode; |
27 | char *old_path; | 27 | char *old_path; |
28 | char *new_path; | 28 | char *new_path; |
29 | unsigned int added; | 29 | unsigned int added; |
30 | unsigned int removed; | 30 | unsigned int removed; |
31 | unsigned long old_size; | 31 | unsigned long old_size; |
32 | unsigned long new_size; | 32 | unsigned long new_size; |
33 | int binary:1; | 33 | int binary:1; |
34 | } *items; | 34 | } *items; |
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) |
39 | { | 50 | { |
40 | char *class; | 51 | char *class; |
41 | 52 | ||
42 | switch (info->status) { | 53 | switch (info->status) { |
43 | case DIFF_STATUS_ADDED: | 54 | case DIFF_STATUS_ADDED: |
44 | class = "add"; | 55 | class = "add"; |
45 | break; | 56 | break; |
46 | case DIFF_STATUS_COPIED: | 57 | case DIFF_STATUS_COPIED: |
47 | class = "cpy"; | 58 | class = "cpy"; |
48 | break; | 59 | break; |
@@ -275,24 +286,25 @@ static void print_ssdiff_link() | |||
275 | ctx.qry.head, ctx.qry.sha1, | 286 | ctx.qry.head, ctx.qry.sha1, |
276 | ctx.qry.sha2, ctx.qry.path, 1); | 287 | ctx.qry.sha2, ctx.qry.path, 1); |
277 | } | 288 | } |
278 | } | 289 | } |
279 | 290 | ||
280 | static void filepair_cb(struct diff_filepair *pair) | 291 | static void filepair_cb(struct diff_filepair *pair) |
281 | { | 292 | { |
282 | unsigned long old_size = 0; | 293 | unsigned long old_size = 0; |
283 | unsigned long new_size = 0; | 294 | unsigned long new_size = 0; |
284 | int binary = 0; | 295 | int binary = 0; |
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(); |
289 | print_line_fn = cgit_ssdiff_line_cb; | 301 | print_line_fn = cgit_ssdiff_line_cb; |
290 | } | 302 | } |
291 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 303 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
292 | pair->two->sha1, pair->two->path, pair->two->mode); | 304 | pair->two->sha1, pair->two->path, pair->two->mode); |
293 | if (use_ssdiff) | 305 | if (use_ssdiff) |
294 | cgit_ssdiff_header_end(); | 306 | cgit_ssdiff_header_end(); |
295 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 307 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
296 | if (S_ISGITLINK(pair->one->mode)) | 308 | if (S_ISGITLINK(pair->one->mode)) |
297 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 309 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
298 | if (S_ISGITLINK(pair->two->mode)) | 310 | if (S_ISGITLINK(pair->two->mode)) |