Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 78 |
1 files changed, 38 insertions, 40 deletions
@@ -415,12 +415,34 @@ void cgit_print_diff_ctrls(void) const char *new_ref = ctx.qry.oid && *ctx.qry.oid ? ctx.qry.oid : ctx.qry.head; const char *old_ref = ctx.qry.oid2; + const char *disp_old_ref; + int idoff = ctx.qry.idoff; + int id2off = ctx.qry.id2off; + int disp_id2off; + + if (old_ref && *old_ref) { + disp_old_ref = old_ref; + disp_id2off = id2off; + } else if (!is_null_oid(old_rev_oid)) { + /* + * No from ref given: the diff compares the (stepped) + * to rev against its parent, i.e. new_ref~(idoff+1); + * show that instead of leaving the picker empty. Keep + * the ref name rather than a materialized parent sha. + */ + disp_old_ref = new_ref; + disp_id2off = idoff + 1; + } else { + /* to rev is the root: diff against the empty tree */ + disp_old_ref = NULL; + disp_id2off = 0; + } html("<tr>"); html("<td class='label'>from:</td>"); html("<td class='ctrl'>"); - cgit_print_ref_select("id2", old_ref); - cgit_print_ref_offset("id2off", ctx.qry.id2off); + cgit_print_ref_select("id2", disp_old_ref); + cgit_print_ref_offset("id2off", disp_id2off); html("</td></tr><tr>"); html("<td class='label'>to:</td>"); html("<td class='ctrl'>"); @@ -431,44 +453,20 @@ void cgit_print_diff_ctrls(void) html("<tr><td/><td class='ctrl'>"); html("<input type='submit' value='apply'>"); html(" | "); - { - const char *flip_new_ref; - int flip_idoff; - int idoff = ctx.qry.idoff; - int id2off = ctx.qry.id2off; - - if (old_ref && *old_ref) { - /* explicit from ref */ - flip_new_ref = old_ref; - flip_idoff = id2off; - } else if (!is_null_oid(old_rev_oid)) { - /* - * The from rev is the parent of the (stepped) - * to rev, i.e. new_ref~(idoff+1); keep the - * ref name in the url instead of a materialized - * parent sha. - */ - flip_new_ref = new_ref; - flip_idoff = idoff + 1; - } else { - /* root: no from rev to flip to */ - flip_new_ref = NULL; - flip_idoff = 0; - } - - /* - * cgit_diff_link() emits the offsets from ctx.qry; - * swap them around the call so they follow the refs. - */ - ctx.qry.idoff = flip_idoff; - ctx.qry.id2off = idoff; - cgit_diff_link("flip", "swap from and to", "button", - ctx.qry.head, - flip_new_ref, new_ref, - ctx.qry.path); - ctx.qry.idoff = idoff; - ctx.qry.id2off = id2off; - } + /* + * The flip link swaps the displayed refs, so the displayed + * from ref becomes the to ref. cgit_diff_link() emits the + * offsets from ctx.qry; swap them around the call so they + * follow the refs. + */ + ctx.qry.idoff = disp_id2off; + ctx.qry.id2off = idoff; + cgit_diff_link("flip", "swap from and to", "button", + ctx.qry.head, + disp_old_ref, new_ref, + ctx.qry.path); + ctx.qry.idoff = idoff; + ctx.qry.id2off = id2off; html("</td></tr>"); } html("</table>"); |