Change "ss" diff flag to an enum

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 49bd7480c573df06c41abb9d305d1ae8ac3e459c..a4ade4dd2e032c215c24355f66fb7afd159cf55f 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -345,8 +345,8 @@ void cgit_print_diff_ctrls()
        html("</tr><tr>");
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
        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("</select></td></tr>");
        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
        html("</select></td></tr>");


@@ -362,6 +362,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;
 {
        struct commit *commit, *commit2;
        const unsigned char *old_tree_sha1, *new_tree_sha1;

+       diff_type difftype;

 
        if (!new_rev)
                new_rev = ctx.qry.head;
 
        if (!new_rev)
                new_rev = ctx.qry.head;


@@ -420,7 +421,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                return;
        }
 
                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();
 
        if (show_ctrls)
                cgit_print_diff_ctrls();