Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 99 |
1 files changed, 91 insertions, 8 deletions
@@ -366,16 +366,30 @@ static void cgit_print_ref_select(const char *name, const char *selected) html("</select>"); } +/* + * The number of commits to step back from the selected ref, so that any + * ancestor of a branch or tag can be picked without typing a rev into + * the url by hand. + */ +static void cgit_print_ref_offset(const char *name, int value) +{ + html(" <input type='text' size='2' name='"); + html_attr(name); + html("' title='N commits back from the selected ref'"); + if (value) + htmlf(" value='%d'", value); + html("> <span class='hint'>back</span>"); +} + void cgit_print_diff_ctrls(void) { int i, curr; - html("<div class='cgit-panel'>"); - html("<b>diff options</b>"); - html("<form method='get'>"); + html("<form class='diff-ctrls' method='get'>"); /* * Emit the same hidden fields as cgit_add_hidden_formfields(), except - * id/id2, which are carried by the ref-picker selects below. + * id/id2, which are carried by the ref-picker selects below. One + * form wraps both panels so any submission carries all controls. */ if (!ctx.cfg.virtual_root) { struct strbuf url = STRBUF_INIT; @@ -391,24 +405,79 @@ void cgit_print_diff_ctrls(void) if (ctx.qry.showmsg) html_hidden("showmsg", "1"); + html("<div class='cgit-panel'>"); + html("<b>diff refs</b>"); html("<table>"); html("<tr><td colspan='2'/></tr>"); /* ref pickers: compare any two refs (branches/tags) */ { - const char *new_ref = ctx.qry.oid ? ctx.qry.oid : ctx.qry.head; + const char *new_ref = ctx.qry.oid && *ctx.qry.oid ? + ctx.qry.oid : ctx.qry.head; const char *old_ref = ctx.qry.oid2; 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); html("</td></tr><tr>"); html("<td class='label'>to:</td>"); html("<td class='ctrl'>"); cgit_print_ref_select("id", new_ref); + cgit_print_ref_offset("idoff", ctx.qry.idoff); + html("</td></tr>"); + + 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; + } html("</td></tr>"); } + html("</table>"); + html("</div>"); + + html("<div class='cgit-panel'>"); + html("<b>diff options</b>"); + html("<table>"); + html("<tr><td colspan='2'/></tr>"); html("<tr>"); html("<td class='label'>context:</td>"); @@ -443,8 +512,8 @@ void cgit_print_diff_ctrls(void) html("<tr><td/><td class='ctrl'>"); html("<noscript><input type='submit' value='reload'/></noscript>"); html("</td></tr></table>"); - html("</form>"); html("</div>"); + html("</form>"); } void cgit_print_diff(const char *new_rev, const char *old_rev, @@ -452,6 +521,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, { struct commit *commit, *commit2; const struct object_id *old_tree_oid, *new_tree_oid; + struct strbuf new_refbuf = STRBUF_INIT, old_refbuf = STRBUF_INIT; diff_type difftype; /* @@ -466,8 +536,16 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, current_prefix = NULL; } - if (!new_rev) + /* + * An empty rev is the same as no rev; a zero offset means the ref + * itself. + */ + if (!new_rev || !*new_rev) new_rev = ctx.qry.head; + if (ctx.qry.idoff) { + strbuf_addf(&new_refbuf, "%s~%d", new_rev, ctx.qry.idoff); + new_rev = new_refbuf.buf; + } if (repo_get_oid(the_repository, new_rev, new_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad object name: %s", new_rev); @@ -481,7 +559,12 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, } new_tree_oid = get_commit_tree_oid(commit); - if (old_rev) { + if (old_rev && *old_rev) { + if (ctx.qry.id2off) { + strbuf_addf(&old_refbuf, "%s~%d", old_rev, + ctx.qry.id2off); + old_rev = old_refbuf.buf; + } if (repo_get_oid(the_repository, old_rev, old_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad object name: %s", old_rev); |