Skip to content

diff: add --slide-down option to shift ambiguous hunks downward #2073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charlesgwaldman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

diff: add --slide-down option to shift ambiguous hunks downward #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions diff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@

static int diff_detect_rename_default;
static int diff_indent_heuristic = 1;
static int diff_slide_down;
static int diff_rename_limit_default = 1000;
static int diff_suppress_blank_empty;
static enum git_colorbool diff_use_color_default = GIT_COLOR_UNKNOWN;
Expand Down Expand Up @@ -289,6 +290,8 @@ int git_diff_heuristic_config(const char *var, const char *value,
{
if (!strcmp(var, "diff.indentheuristic"))
diff_indent_heuristic = git_config_bool(var, value);
if (!strcmp(var, "diff.slidedown"))
diff_slide_down = git_config_bool(var, value);
return 0;
}

Expand Down Expand Up @@ -4861,6 +4864,8 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
options->xdl_opts |= diff_algorithm;
if (diff_indent_heuristic)
DIFF_XDL_SET(options, INDENT_HEURISTIC);
if (diff_slide_down)
DIFF_XDL_SET(options, SLIDE_DOWN);

options->orderfile = xstrdup_or_null(diff_order_file_cfg);

Expand Down Expand Up @@ -5910,6 +5915,9 @@ struct option *add_diff_options(const struct option *opts,
OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
N_("heuristic to shift diff hunk boundaries for easy reading"),
XDF_INDENT_HEURISTIC),
OPT_BIT(0, "slide-down", &options->xdl_opts,
N_("slide ambiguous diff hunks downward (append after context)"),
XDF_SLIDE_DOWN),
OPT_CALLBACK_F(0, "patience", options, NULL,
N_("generate diff using the \"patience diff\" algorithm"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
Expand Down
1 change: 1 addition & 0 deletions xdiff/xdiff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ extern "C" {
#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)

#define XDF_INDENT_HEURISTIC (1 << 23)
#define XDF_SLIDE_DOWN (1 << 24)

/* xdemitconf_t.flags */
#define XDL_EMIT_FUNCNAMES (1 << 0)
Expand Down
9 changes: 9 additions & 0 deletions xdiff/xdiffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,15 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {

if (g.end == earliest_end) {
/* no shifting was possible */
} else if (flags & XDF_SLIDE_DOWN) {
/*
* --slide-down: the group is already at the
* furthest-down position. Leave it there.
* This produces diffs where ambiguous hunks
* (e.g., duplicate delimiter lines) appear
* as appended after existing context rather
* than inserted before it.
*/
} else if (end_matching_other != -1) {
/*
* Move the possibly merged group of changes back to
Expand Down
Loading