make cgitrc.5.txt asciidoc manpage compatible

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 12e78b157a59651efce90718e6a2b16633abc6fa..21967451e3fdb5adc462210616b8df6065fe817b 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -16,7 +16,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,6 +27,9 @@ 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;
 
 


@@ -80,13 +82,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);

        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 +118,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, count_diff_lines);

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


@@ -131,6 +142,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;


@@ -142,7 +156,10 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
 {
        int i;
 
 {
        int i;
 

-       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);
+       html("</div>");

        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);


@@ -231,6 +248,10 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 
 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;
+

        header(pair->one->sha1, pair->one->path, pair->one->mode,
               pair->two->sha1, pair->two->path, pair->two->mode);
        if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
        header(pair->one->sha1, pair->one->path, pair->one->mode,
               pair->two->sha1, pair->two->path, pair->two->mode);
        if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {


@@ -240,8 +261,11 @@ static void filepair_cb(struct diff_filepair *pair)
                        print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                return;
        }
                        print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                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, print_line))

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

+       if (binary)
+               html("Binary files differ");

 }
 
 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)