Add URL parameter 'context' for changing the number of context lines in diffs

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index b21c2c16a2c6e8a33465c550704ad36e3ce46e82..d3a3b2c8bd04977232baa77004ec2e7015eb51b6 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -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,19 @@ 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;
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, NULL, 0);
 {
        int i;
 
        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("</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>");


@@ -253,11 +255,11 @@ static void print_ssdiff_link()
        if (!strcmp(ctx.qry.page, "diff")) {
                if (use_ssdiff)
                        cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
        if (!strcmp(ctx.qry.page, "diff")) {
                if (use_ssdiff)
                        cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,

-                                      ctx.qry.sha1, ctx.qry.sha2, NULL, 1);
+                                      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,
                else
                        cgit_diff_link("Side-by-side diff", NULL, NULL,
                                       ctx.qry.head, ctx.qry.sha1,

-                                      ctx.qry.sha2, NULL, 1);
+                                      ctx.qry.sha2, ctx.qry.path, 1);

        }
 }
 
        }
 }
 


@@ -281,13 +283,19 @@ static void filepair_cb(struct diff_filepair *pair)
                        print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                if (S_ISGITLINK(pair->two->mode))
                        print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                        print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                if (S_ISGITLINK(pair->two->mode))
                        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)
-               print_line_fn(" Binary files differ", 20);
+       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();
 }


@@ -332,7 +340,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                use_ssdiff = 1;
 
        print_ssdiff_link();
                use_ssdiff = 1;
 
        print_ssdiff_link();

-       cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
+       cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);

 
        if (use_ssdiff) {
                html("<table summary='ssdiff' class='ssdiff'>");
 
        if (use_ssdiff) {
                html("<table summary='ssdiff' class='ssdiff'>");