ui-shared: currenturl should take into account leading slash

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 49bd7480c573df06c41abb9d305d1ae8ac3e459c..1cf2ce0c8e32b1a600b855c0d9951297d2fdcafa 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -31,7 +31,7 @@ static struct fileinfo {
        unsigned int removed;
        unsigned long old_size;
        unsigned long new_size;
-       int binary:1;
+       unsigned int binary:1;
 } *items;
 
 static int use_ssdiff = 0;
@@ -311,7 +311,7 @@ static void filepair_cb(struct diff_filepair *pair)
                cgit_ssdiff_footer();
 }
 
-void cgit_print_diff_ctrls()
+void cgit_print_diff_ctrls(void)
 {
        int i, curr;
 
@@ -345,10 +345,11 @@ void cgit_print_diff_ctrls()
        html("</tr><tr>");
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
-       html("<select name='ss' onchange='this.form.submit();'>");
-       curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
+       html("<select name='dt' onchange='this.form.submit();'>");
+       curr = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;
        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
+       html_intoption(2, "stat only", curr);
        html("</select></td></tr>");
        html("<tr><td/><td class='ctrl'>");
        html("<noscript><input type='submit' value='reload'/></noscript>");
@@ -362,6 +363,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
 {
        struct commit *commit, *commit2;
        const unsigned char *old_tree_sha1, *new_tree_sha1;
+       diff_type difftype;
 
        if (!new_rev)
                new_rev = ctx.qry.head;
@@ -420,13 +422,27 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                return;
        }
 
-       use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
+       difftype = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;
+       use_ssdiff = difftype == DIFF_SSDIFF;
 
        if (show_ctrls)
                cgit_print_diff_ctrls();
 
+       /*
+        * Clicking on a link to a file in the diff stat should show a diff
+        * of the file, showing the diff stat limited to a single file is
+        * pretty useless.  All links from this point on will be to
+        * individual files, so we simply reset the difftype in the query
+        * here to avoid propagating DIFF_STATONLY to the individual files.
+        */
+       if (difftype == DIFF_STATONLY)
+               ctx.qry.difftype = ctx.cfg.difftype;
+
        cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 
+       if (difftype == DIFF_STATONLY)
+               return;
+
        if (use_ssdiff) {
                html("<table summary='ssdiff' class='ssdiff'>");
        } else {