author | Ragnar Ouchterlony <ragnar@lysator.liu.se> | 2009-09-13 17:36:35 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-09-16 18:17:56 (UTC) |
commit | 40e174d5364910750413d94b5417e57d108190ef (patch) (unidiff) | |
tree | 21d71be66e1b058cecc45b861523c071fb4ee126 /ui-diff.c | |
parent | 27479ac54c99584612f7246c9456119e88621eaa (diff) | |
download | cgit-40e174d5364910750413d94b5417e57d108190ef.zip cgit-40e174d5364910750413d94b5417e57d108190ef.tar.gz cgit-40e174d5364910750413d94b5417e57d108190ef.tar.bz2 |
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>
-rw-r--r-- | ui-diff.c | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -6,12 +6,13 @@ | |||
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
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 | ||
13 | unsigned char old_rev_sha1[20]; | 14 | unsigned char old_rev_sha1[20]; |
14 | unsigned char new_rev_sha1[20]; | 15 | unsigned char new_rev_sha1[20]; |
15 | 16 | ||
16 | static int files, slots; | 17 | static int files, slots; |
17 | static int total_adds, total_rems, max_changes; | 18 | static int total_adds, total_rems, max_changes; |
@@ -29,12 +30,13 @@ static struct fileinfo { | |||
29 | unsigned int removed; | 30 | unsigned int removed; |
30 | unsigned long old_size; | 31 | unsigned long old_size; |
31 | unsigned long new_size; | 32 | unsigned long new_size; |
32 | int binary:1; | 33 | int binary:1; |
33 | } *items; | 34 | } *items; |
34 | 35 | ||
36 | static int use_ssdiff = 0; | ||
35 | 37 | ||
36 | static void print_fileinfo(struct fileinfo *info) | 38 | static void print_fileinfo(struct fileinfo *info) |
37 | { | 39 | { |
38 | char *class; | 40 | char *class; |
39 | 41 | ||
40 | switch (info->status) { | 42 | switch (info->status) { |
@@ -241,34 +243,43 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
241 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, | 243 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
242 | sha1_to_hex(new_rev_sha1), path2); | 244 | sha1_to_hex(new_rev_sha1), path2); |
243 | else | 245 | else |
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 | ||
249 | static void filepair_cb(struct diff_filepair *pair) | 253 | static void filepair_cb(struct diff_filepair *pair) |
250 | { | 254 | { |
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); |
260 | if (S_ISGITLINK(pair->two->mode)) | 269 | if (S_ISGITLINK(pair->two->mode)) |
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 | ||
271 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) | 282 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
272 | { | 283 | { |
273 | enum object_type type; | 284 | enum object_type type; |
274 | unsigned long size; | 285 | unsigned long size; |