mirror/zx2c4.cgit
1
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2025-08-31 06:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change "ss" diff flag to an enum

Browse source 
This will allow us to introduce a new "stat only" diff mode without
needing an explosion of mutually incompatible flags.

The old "ss" query parameter is still accepted in order to avoid
breaking saved links, but we no longer generate any URIs using it;
instead the new "dt" (diff type) parameter is used.

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2014-10-05 10:59:04 +01:00 • committed by Lukas Fleischer
parent 03f537f1a1
commit 1830271c59
4 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ui-diff.c
View file

@ -345,8 +345,8 @@ 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("</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;
diff_type difftype;
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;
}
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();