Merge branch 'lh/range-search'

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 0c6f8d75dfe85fded1271a98993e6ce53de73946..e0a72f757e79eb904e1fdf512fc876518f04d2df 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -85,7 +85,7 @@ static void print_fileinfo(struct fileinfo *info)
        }
        htmlf("</td><td class='%s'>", class);
        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
        }
        htmlf("</td><td class='%s'>", class);
        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,

-                      ctx.qry.sha2, info->new_path);
+                      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",
        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                htmlf(" (%s from %s)",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",


@@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair)
        lines_added = 0;
        lines_removed = 0;
        cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
        lines_added = 0;
        lines_removed = 0;
        cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,

-                       &binary, count_diff_lines);
+                       &binary, 0, count_diff_lines);

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


@@ -154,17 +154,27 @@ 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'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,

-                      ctx.qry.sha2, NULL);
+                      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("</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
        html("</div>");
        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);

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


@@ -246,8 +256,19 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                        html_txt(path2);
        }
        html("</div>");
                        html_txt(path2);
        }
        html("</div>");

-       if (use_ssdiff)
-               cgit_ssdiff_header();
+}
+
+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)


@@ -257,24 +278,32 @@ static void filepair_cb(struct diff_filepair *pair)
        int binary = 0;
        linediff_fn print_line_fn = print_line;
 
        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) {
        if (use_ssdiff) {

-               cgit_ssdiff_header();
+               cgit_ssdiff_header_begin();

                print_line_fn = cgit_ssdiff_line_cb;
        }
                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);
+       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;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,

-                           &new_size, &binary, print_line_fn))
+                           &new_size, &binary, ctx.qry.context, print_line_fn))

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

-       if (binary)
-               html("Binary files differ");
+       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();
 }
        if (use_ssdiff)
                cgit_ssdiff_footer();
 }


@@ -314,11 +343,21 @@ 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>");
+       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);
        cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);

-       html("</td></tr>");
+       if (!use_ssdiff)
+               html("</td></tr>");

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