author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
commit | 979c460e7f71d153ae79da67b8b21c3412f0fe02 (patch) (unidiff) | |
tree | 6da9ffb66ed0a68205e6644cb7e2b4652d6684be /ui-diff.c | |
parent | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (diff) | |
parent | 0141b9f889bbaa1fe474f9a98dd377138ac73054 (diff) | |
download | cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.zip cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.gz cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.bz2 |
Merge branch 'br/misc'
* br/misc:
Use transparent background for the cgit logo
ssdiff: anchors for ssdiff
implement repo.logo and repo.logo-link
-rw-r--r-- | ui-diff.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -33,8 +33,19 @@ static struct fileinfo { | |||
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; |
@@ -283,8 +294,9 @@ static void filepair_cb(struct diff_filepair *pair) | |||
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 | } |