Merge branch 'stable'

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 12e78b157a59651efce90718e6a2b16633abc6fa..0dcabe90b9931e4b53e009a89b9853dcf3ab8c76 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,7 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #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];
 
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];


@@ -16,7 +17,6 @@ unsigned char new_rev_sha1[20];
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;

-static char *curr_rev;

 
 static struct fileinfo {
        char status;
 
 static struct fileinfo {
        char status;


@@ -28,8 +28,12 @@ static struct fileinfo {
        char *new_path;
        unsigned int added;
        unsigned int removed;
        char *new_path;
        unsigned int added;
        unsigned int removed;

+       unsigned long old_size;
+       unsigned long new_size;
+       int binary:1;

 } *items;
 
 } *items;
 

+static int use_ssdiff = 0;

 
 static void print_fileinfo(struct fileinfo *info)
 {
 
 static void print_fileinfo(struct fileinfo *info)
 {


@@ -80,13 +84,18 @@ static void print_fileinfo(struct fileinfo *info)
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);

-       cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
-                      NULL, info->new_path);
+       cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                      ctx.qry.sha2, info->new_path, 0);

        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                htmlf(" (%s from %s)",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
                      info->old_path);
        html("</td><td class='right'>");
        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                htmlf(" (%s from %s)",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
                      info->old_path);
        html("</td><td class='right'>");

+       if (info->binary) {
+               htmlf("bin</td><td class='graph'>%d -> %d bytes",
+                     info->old_size, info->new_size);
+               return;
+       }

        htmlf("%d", info->added + info->removed);
        html("</td><td class='graph'>");
        htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
        htmlf("%d", info->added + info->removed);
        html("</td><td class='graph'>");
        htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));


@@ -111,10 +120,14 @@ static void count_diff_lines(char *line, int len)
 
 static void inspect_filepair(struct diff_filepair *pair)
 {
 
 static void inspect_filepair(struct diff_filepair *pair)
 {

+       int binary = 0;
+       unsigned long old_size = 0;
+       unsigned long new_size = 0;

        files++;
        lines_added = 0;
        lines_removed = 0;
        files++;
        lines_added = 0;
        lines_removed = 0;

-       cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
+       cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
+                       &binary, 0, ctx.qry.ignorews, count_diff_lines);

        if (files >= slots) {
                if (slots == 0)
                        slots = 4;
        if (files >= slots) {
                if (slots == 0)
                        slots = 4;


@@ -131,6 +144,9 @@ static void inspect_filepair(struct diff_filepair *pair)
        items[files-1].new_path = xstrdup(pair->two->path);
        items[files-1].added = lines_added;
        items[files-1].removed = lines_removed;
        items[files-1].new_path = xstrdup(pair->two->path);
        items[files-1].added = lines_added;
        items[files-1].removed = lines_removed;

+       items[files-1].old_size = old_size;
+       items[files-1].new_size = new_size;
+       items[files-1].binary = binary;

        if (lines_added + lines_removed > max_changes)
                max_changes = lines_added + lines_removed;
        total_adds += lines_added;
        if (lines_added + lines_removed > max_changes)
                max_changes = lines_added + lines_removed;
        total_adds += lines_added;


@@ -138,14 +154,33 @@ static void inspect_filepair(struct diff_filepair *pair)
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,

-                        const unsigned char *new_sha1)
+                        const unsigned char *new_sha1, const char *prefix)

 {
 {

-       int i;
+       int i, save_context = ctx.qry.context;

 
 

-       html("<div class='diffstat-header'>Diffstat</div>");
+       html("<div class='diffstat-header'>");
+       cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                      ctx.qry.sha2, NULL, 0);
+       if (prefix)
+               htmlf(" (limited to '%s')", prefix);
+       html(" (");
+       ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
+       cgit_self_link("more", NULL, NULL, &ctx);
+       html("/");
+       ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
+       cgit_self_link("less", NULL, NULL, &ctx);
+       ctx.qry.context = save_context;
+       html(" context)");
+       html(" (");
+       ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+       cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
+       ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+       html(" whitespace changes)");
+       html("</div>");

        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;

-       cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
+       cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
+                      ctx.qry.ignorews);

        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);
        html("</table>");
        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);
        html("</table>");


@@ -229,19 +264,55 @@ static void header(unsigned char *sha1, char *path1, int mode1,
        html("</div>");
 }
 
        html("</div>");
 }
 

+static void print_ssdiff_link()
+{
+       if (!strcmp(ctx.qry.page, "diff")) {
+               if (use_ssdiff)
+                       cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
+                                      ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
+               else
+                       cgit_diff_link("Side-by-side diff", NULL, NULL,
+                                      ctx.qry.head, ctx.qry.sha1,
+                                      ctx.qry.sha2, ctx.qry.path, 1);
+       }
+}
+

 static void filepair_cb(struct diff_filepair *pair)
 {
 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;
+
+       if (use_ssdiff) {
+               cgit_ssdiff_header_begin();
+               print_line_fn = cgit_ssdiff_line_cb;
+       }

        header(pair->one->sha1, pair->one->path, pair->one->mode,
               pair->two->sha1, pair->two->path, pair->two->mode);
        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_end();

        if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
                if (S_ISGITLINK(pair->one->mode))
        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);
+                       print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);

                if (S_ISGITLINK(pair->two->mode))
                if (S_ISGITLINK(pair->two->mode))

-                       print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+                       print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+               if (use_ssdiff)
+                       cgit_ssdiff_footer();

                return;
        }
                return;
        }

-       if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
+       if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+                           &new_size, &binary, ctx.qry.context,
+                           ctx.qry.ignorews, print_line_fn))

                cgit_print_error("Error running diff");
                cgit_print_error("Error running diff");

+       if (binary) {
+               if (use_ssdiff)
+                       html("<tr><td colspan='4'>Binary files differ</td></tr>");
+               else
+                       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)
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)


@@ -279,11 +350,22 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                if (!commit2 || parse_commit(commit2))
                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
        }
                if (!commit2 || parse_commit(commit2))
                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
        }

-       cgit_print_diffstat(old_rev_sha1, new_rev_sha1);

 
 

-       html("<table summary='diff' class='diff'>");
-       html("<tr><td>");
-       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
-       html("</td></tr>");
+       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+               use_ssdiff = 1;
+
+       print_ssdiff_link();
+       cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
+
+       if (use_ssdiff) {
+               html("<table summary='ssdiff' class='ssdiff'>");
+       } else {
+               html("<table summary='diff' class='diff'>");
+               html("<tr><td>");
+       }
+       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
+                      ctx.qry.ignorews);
+       if (!use_ssdiff)
+               html("</td></tr>");

        html("</table>");
 }
        html("</table>");
 }