aboutsummaryrefslogtreecommitdiffstats
path: root/ui-diff.c
diff options
context:
space:
mode:
authorGravatar Ragnar Ouchterlony <ragnar@lysator.liu.se>2009-09-14 02:36:35 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2009-09-17 03:17:56 (JST)
commit40e174d5364910750413d94b5417e57d108190ef (patch)
tree21d71be66e1b058cecc45b861523c071fb4ee126 /ui-diff.c
parent27479ac54c99584612f7246c9456119e88621eaa (diff)
downloadcgit-40e174d5364910750413d94b5417e57d108190ef.zip
cgit-40e174d5364910750413d94b5417e57d108190ef.tar.gz
First version of side-by-side diff.
This constitutes the first prototype of a side-by-side diff. It is not possible to switch between unidiff and side-by-side diff at all at this stage. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 2196745..0c6f8d7 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,7 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12#include "ui-ssdiff.h"
12 13
13unsigned char old_rev_sha1[20]; 14unsigned char old_rev_sha1[20];
14unsigned char new_rev_sha1[20]; 15unsigned char new_rev_sha1[20];
@@ -32,6 +33,7 @@ static struct fileinfo {
32 int binary:1; 33 int binary:1;
33} *items; 34} *items;
34 35
36static int use_ssdiff = 0;
35 37
36static void print_fileinfo(struct fileinfo *info) 38static void print_fileinfo(struct fileinfo *info)
37{ 39{
@@ -244,6 +246,8 @@ static void header(unsigned char *sha1, char *path1, int mode1,
244 html_txt(path2); 246 html_txt(path2);
245 } 247 }
246 html("</div>"); 248 html("</div>");
249 if (use_ssdiff)
250 cgit_ssdiff_header();
247} 251}
248 252
249static void filepair_cb(struct diff_filepair *pair) 253static void filepair_cb(struct diff_filepair *pair)
@@ -251,9 +255,14 @@ static void filepair_cb(struct diff_filepair *pair)
251 unsigned long old_size = 0; 255 unsigned long old_size = 0;
252 unsigned long new_size = 0; 256 unsigned long new_size = 0;
253 int binary = 0; 257 int binary = 0;
258 linediff_fn print_line_fn = print_line;
254 259
255 header(pair->one->sha1, pair->one->path, pair->one->mode, 260 header(pair->one->sha1, pair->one->path, pair->one->mode,
256 pair->two->sha1, pair->two->path, pair->two->mode); 261 pair->two->sha1, pair->two->path, pair->two->mode);
262 if (use_ssdiff) {
263 cgit_ssdiff_header();
264 print_line_fn = cgit_ssdiff_line_cb;
265 }
257 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 266 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
258 if (S_ISGITLINK(pair->one->mode)) 267 if (S_ISGITLINK(pair->one->mode))
259 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 268 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
@@ -261,11 +270,13 @@ static void filepair_cb(struct diff_filepair *pair)
261 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 270 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
262 return; 271 return;
263 } 272 }
264 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 273 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
265 &new_size, &binary, print_line)) 274 &new_size, &binary, print_line_fn))
266 cgit_print_error("Error running diff"); 275 cgit_print_error("Error running diff");
267 if (binary) 276 if (binary)
268 html("Binary files differ"); 277 html("Binary files differ");
278 if (use_ssdiff)
279 cgit_ssdiff_footer();
269} 280}
270 281
271void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) 282void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)