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) (side-by-side diff) | |
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 @@ * (see COPYING for full license text) */ #include "cgit.h" #include "html.h" #include "ui-shared.h" +#include "ui-ssdiff.h" unsigned char old_rev_sha1[20]; unsigned char new_rev_sha1[20]; static int files, slots; static int total_adds, total_rems, max_changes; @@ -29,12 +30,13 @@ static struct fileinfo { unsigned int removed; unsigned long old_size; unsigned long new_size; int binary:1; } *items; +static int use_ssdiff = 0; static void print_fileinfo(struct fileinfo *info) { char *class; switch (info->status) { @@ -241,34 +243,43 @@ static void header(unsigned char *sha1, char *path1, int mode1, cgit_tree_link(path2, NULL, NULL, ctx.qry.head, sha1_to_hex(new_rev_sha1), path2); else html_txt(path2); } html("</div>"); + if (use_ssdiff) + cgit_ssdiff_header(); } static void filepair_cb(struct diff_filepair *pair) { unsigned long old_size = 0; unsigned long new_size = 0; int binary = 0; + linediff_fn print_line_fn = print_line; header(pair->one->sha1, pair->one->path, pair->one->mode, pair->two->sha1, pair->two->path, pair->two->mode); + if (use_ssdiff) { + cgit_ssdiff_header(); + print_line_fn = cgit_ssdiff_line_cb; + } if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { if (S_ISGITLINK(pair->one->mode)) print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); if (S_ISGITLINK(pair->two->mode)) print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); return; } - if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, - &new_size, &binary, print_line)) + if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, + &new_size, &binary, print_line_fn)) cgit_print_error("Error running diff"); if (binary) html("Binary files differ"); + if (use_ssdiff) + cgit_ssdiff_footer(); } void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) { enum object_type type; unsigned long size; |