Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 118 |
1 files changed, 18 insertions, 100 deletions
@@ -1,17 +1,11 @@ /* ui-diff.c: show diff between two blobs * * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com> - * Copyright (C) 2026 Saya Andy <saya.andy@posteo.com> - * - * Modified 2026 by Saya Andy: - * Select variable refs from web ui for diff * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" #include "ui-diff.h" #include "html.h" @@ -103,8 +97,8 @@ static void print_fileinfo(struct fileinfo *info) html("]</span>"); } htmlf("</td><td class='%s'>", class); - cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid, - ctx.qry.oid2, info->new_path); + cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, + ctx.qry.sha2, info->new_path); if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { htmlf(" (%s from ", info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); @@ -200,8 +194,8 @@ static void cgit_print_diffstat(const struct object_id *old_oid, int i; html("<div class='diffstat-header'>"); - cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid, - ctx.qry.oid2, NULL); + cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, + ctx.qry.sha2, NULL); if (prefix) { html(" (limited to '"); html_txt(prefix); @@ -264,8 +258,8 @@ static void header(const struct object_id *oid1, char *path1, int mode1, htmlf("<br/>deleted file mode %.6o", mode1); if (!subproject) { - abbrev1 = xstrdup(repo_find_unique_abbrev(the_repository, oid1, DEFAULT_ABBREV)); - abbrev2 = xstrdup(repo_find_unique_abbrev(the_repository, oid2, DEFAULT_ABBREV)); + abbrev1 = xstrdup(find_unique_abbrev(oid1, DEFAULT_ABBREV)); + abbrev2 = xstrdup(find_unique_abbrev(oid2, DEFAULT_ABBREV)); htmlf("<br/>index %s..%s", abbrev1, abbrev2); free(abbrev1); free(abbrev2); @@ -340,92 +334,16 @@ static void filepair_cb(struct diff_filepair *pair) cgit_ssdiff_footer(); } -static int print_ref_option(const struct reference *ref, void *cb_data) -{ - const char **sel = (const char **)cb_data; - - html_option(ref->name, ref->name, sel[0]); - return 0; -} - -static void cgit_print_ref_select(const char *name, const char *selected) -{ - /* - * Offer every branch and tag so that any two refs can be compared. - */ - html("<select name='"); - html_attr(name); - html("' onchange='this.form.submit();'>"); - refs_for_each_branch_ref(get_main_ref_store(the_repository), - print_ref_option, (void *)&selected); - if (ctx.repo->enable_remote_branches) - refs_for_each_remote_ref(get_main_ref_store(the_repository), - print_ref_option, (void *)&selected); - refs_for_each_tag_ref(get_main_ref_store(the_repository), - print_ref_option, (void *)&selected); - html("</select>"); -} - void cgit_print_diff_ctrls(void) { int i, curr; - 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. One - * form wraps both panels so any submission carries all controls. - */ - if (!ctx.cfg.virtual_root) { - struct strbuf url = STRBUF_INIT; - strbuf_addf(&url, "%s/%s", ctx.qry.repo, ctx.qry.page); - if (ctx.qry.vpath) - strbuf_addf(&url, "/%s", ctx.qry.vpath); - html_hidden("url", url.buf); - strbuf_release(&url); - } - if (ctx.qry.head && ctx.repo->defbranch && - strcmp(ctx.qry.head, ctx.repo->defbranch)) - html_hidden("h", ctx.qry.head); - 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 *old_ref = ctx.qry.oid2; - - html("<tr>"); - html("<td class='label'>from:</td>"); - html("<td class='ctrl'>"); - cgit_print_ref_select("id2", old_ref); - html("</td></tr><tr>"); - html("<td class='label'>to:</td>"); - html("<td class='ctrl'>"); - cgit_print_ref_select("id", new_ref); - html("</td></tr>"); - - html("<tr><td/><td class='ctrl'>"); - cgit_diff_link("flip", "swap from and to", "button", - ctx.qry.head, - is_null_oid(old_rev_oid) ? NULL : - oid_to_hex(old_rev_oid), - new_ref, ctx.qry.path); - html("</td></tr>"); - } - html("</table>"); - html("</div>"); - html("<div class='cgit-panel'>"); html("<b>diff options</b>"); + html("<form method='get'>"); + cgit_add_hidden_formfields(1, 0, ctx.qry.page); html("<table>"); html("<tr><td colspan='2'/></tr>"); - html("<tr>"); html("<td class='label'>context:</td>"); html("<td class='ctrl'>"); @@ -459,8 +377,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("</div>"); html("</form>"); + html("</div>"); } void cgit_print_diff(const char *new_rev, const char *old_rev, @@ -475,7 +393,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, * entire commit to detect renames so we must limit the paths in our * own callbacks and not pass the prefix to the diff machinery. */ - if (ctx.qry.follow && ctx.repo->enable_follow_links) { + if (ctx.qry.follow && ctx.cfg.enable_follow_links) { current_prefix = prefix; prefix = ""; } else { @@ -484,21 +402,21 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, if (!new_rev) new_rev = ctx.qry.head; - if (repo_get_oid(the_repository, new_rev, new_rev_oid)) { + if (get_oid(new_rev, new_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad object name: %s", new_rev); return; } commit = lookup_commit_reference(the_repository, new_rev_oid); - if (!commit || repo_parse_commit(the_repository, commit)) { + if (!commit || parse_commit(commit)) { cgit_print_error_page(404, "Not found", "Bad commit: %s", oid_to_hex(new_rev_oid)); return; } - new_tree_oid = get_commit_tree_oid(commit); + new_tree_oid = &commit->maybe_tree->object.oid; if (old_rev) { - if (repo_get_oid(the_repository, old_rev, old_rev_oid)) { + if (get_oid(old_rev, old_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad object name: %s", old_rev); return; @@ -506,17 +424,17 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, } else if (commit->parents && commit->parents->item) { oidcpy(old_rev_oid, &commit->parents->item->object.oid); } else { - oidclr(old_rev_oid, the_repository->hash_algo); + oidclr(old_rev_oid); } if (!is_null_oid(old_rev_oid)) { commit2 = lookup_commit_reference(the_repository, old_rev_oid); - if (!commit2 || repo_parse_commit(the_repository, commit2)) { + if (!commit2 || parse_commit(commit2)) { cgit_print_error_page(404, "Not found", "Bad commit: %s", oid_to_hex(old_rev_oid)); return; } - old_tree_oid = get_commit_tree_oid(commit2); + old_tree_oid = &commit2->maybe_tree->object.oid; } else { old_tree_oid = NULL; } @@ -524,7 +442,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, if (raw) { struct diff_options diffopt; - repo_diff_setup(the_repository, &diffopt); + diff_setup(&diffopt); diffopt.output_format = DIFF_FORMAT_PATCH; diffopt.flags.recursive = 1; diff_setup_done(&diffopt); |