Re: [ANNOUNCE] Git v2.11.0-rc0
From: Junio C Hamano <hidden>
Date: 2016-11-01 21:38:27
Junio C Hamano [off-list ref] writes:
If it involves renaming and swapping, however, we may be talking about a change that we cannot deliver with confidence in less than a week before -rc1, which sounds, eh, suboptimal. FWIW, here is how the removal of compaction without renaming looks like.
And here is _with_ renaming. I think "compaction heuristics" is a much better phrase to call "heuristics used during the diff hunk compaction process" without specifying how that heuristics work (like taking hints in the indentation levels). If we are to retire one while keeping the other, compaction-heuristics should be the name we give and keep for the surviving one. I have not much confidence in the conversion result, though. Documentation/diff-config.txt | 1 - Documentation/diff-heuristic-options.txt | 2 -- builtin/blame.c | 3 +-- diff.c | 25 ++++----------------- git-add--interactive.perl | 5 +---- t/t4061-diff-indent.sh | 38 ++++++++++++++++---------------- xdiff/xdiff.h | 1 - xdiff/xdiffi.c | 17 +------------- 8 files changed, 26 insertions(+), 66 deletions(-)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 58f4bd6afa..0c79e48d9d 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt@@ -171,7 +171,6 @@ diff.tool:: include::mergetools-diff.txt[] -diff.indentHeuristic:: diff.compactionHeuristic:: Set one of these options to `true` to enable one of two experimental heuristics that shift diff hunk boundaries to
diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt
index 36cb549df9..3cb024aa22 100644
--- a/Documentation/diff-heuristic-options.txt
+++ b/Documentation/diff-heuristic-options.txt@@ -1,5 +1,3 @@ ---indent-heuristic:: ---no-indent-heuristic:: --compaction-heuristic:: --no-compaction-heuristic:: These are to help debugging and tuning experimental heuristics
diff --git a/builtin/blame.c b/builtin/blame.c
index 4ddfadb71f..395d4011fb 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c@@ -2596,7 +2596,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix) * and are only included here to get included in the "-h" * output: */ - { OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental indent-based heuristic to improve diffs"), PARSE_OPT_NOARG, parse_opt_unknown_cb }, { OPTION_LOWLEVEL_CALLBACK, 0, "compaction-heuristic", NULL, NULL, N_("Use an experimental blank-line-based heuristic to improve diffs"), PARSE_OPT_NOARG, parse_opt_unknown_cb }, OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
@@ -2645,7 +2644,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) } parse_done: no_whole_file_rename = !DIFF_OPT_TST(&revs.diffopt, FOLLOW_RENAMES); - xdl_opts |= revs.diffopt.xdl_opts & (XDF_COMPACTION_HEURISTIC | XDF_INDENT_HEURISTIC); + xdl_opts |= revs.diffopt.xdl_opts & XDF_COMPACTION_HEURISTIC; DIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES); argc = parse_options_end(&ctx);
diff --git a/diff.c b/diff.c
index 8981477c43..f1b01f5b1e 100644
--- a/diff.c
+++ b/diff.c@@ -27,7 +27,6 @@ #endif static int diff_detect_rename_default; -static int diff_indent_heuristic; /* experimental */ static int diff_compaction_heuristic; /* experimental */ static int diff_rename_limit_default = 400; static int diff_suppress_blank_empty;
@@ -223,16 +222,8 @@ void init_diff_ui_defaults(void) int git_diff_heuristic_config(const char *var, const char *value, void *cb) { - if (!strcmp(var, "diff.indentheuristic")) { - diff_indent_heuristic = git_config_bool(var, value); - if (diff_indent_heuristic) - diff_compaction_heuristic = 0; - } - if (!strcmp(var, "diff.compactionheuristic")) { + if (!strcmp(var, "diff.compactionheuristic")) diff_compaction_heuristic = git_config_bool(var, value); - if (diff_compaction_heuristic) - diff_indent_heuristic = 0; - } return 0; }
@@ -3378,9 +3369,7 @@ void diff_setup(struct diff_options *options) options->use_color = diff_use_color_default; options->detect_rename = diff_detect_rename_default; options->xdl_opts |= diff_algorithm; - if (diff_indent_heuristic) - DIFF_XDL_SET(options, INDENT_HEURISTIC); - else if (diff_compaction_heuristic) + if (diff_compaction_heuristic) DIFF_XDL_SET(options, COMPACTION_HEURISTIC); options->orderfile = diff_order_file_cfg;
@@ -3876,15 +3865,9 @@ int diff_opt_parse(struct diff_options *options, DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL); else if (!strcmp(arg, "--ignore-blank-lines")) DIFF_XDL_SET(options, IGNORE_BLANK_LINES); - else if (!strcmp(arg, "--indent-heuristic")) { - DIFF_XDL_SET(options, INDENT_HEURISTIC); - DIFF_XDL_CLR(options, COMPACTION_HEURISTIC); - } else if (!strcmp(arg, "--no-indent-heuristic")) - DIFF_XDL_CLR(options, INDENT_HEURISTIC); - else if (!strcmp(arg, "--compaction-heuristic")) { + else if (!strcmp(arg, "--compaction-heuristic")) DIFF_XDL_SET(options, COMPACTION_HEURISTIC); - DIFF_XDL_CLR(options, INDENT_HEURISTIC); - } else if (!strcmp(arg, "--no-compaction-heuristic")) + else if (!strcmp(arg, "--no-compaction-heuristic")) DIFF_XDL_CLR(options, COMPACTION_HEURISTIC); else if (!strcmp(arg, "--patience")) options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index ee3d812695..642cce1ac6 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl@@ -45,7 +45,6 @@ my $normal_color = $repo->get_color("", "reset"); my $diff_algorithm = $repo->config('diff.algorithm'); -my $diff_indent_heuristic = $repo->config_bool('diff.indentheuristic'); my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic'); my $diff_filter = $repo->config('interactive.difffilter');
@@ -751,9 +750,7 @@ sub parse_diff { if (defined $diff_algorithm) { splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}"; } - if ($diff_indent_heuristic) { - splice @diff_cmd, 1, 0, "--indent-heuristic"; - } elsif ($diff_compaction_heuristic) { + if ($diff_compaction_heuristic) { splice @diff_cmd, 1, 0, "--compaction-heuristic"; } if (defined $patch_mode_revision) {
diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 556450609b..30f809d0d3 100755
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh@@ -1,6 +1,6 @@ #!/bin/sh -test_description='Test diff indent heuristic. +test_description='Test diff compaction heuristic. ' . ./test-lib.sh
@@ -157,28 +157,28 @@ test_expect_success 'diff: ugly spaces' ' compare_diff spaces-expect out ' -test_expect_success 'diff: nice spaces with --indent-heuristic' ' - git diff --indent-heuristic old new -- spaces.txt >out-compacted && +test_expect_success 'diff: nice spaces with --compaction-heuristic' ' + git diff --compaction-heuristic old new -- spaces.txt >out-compacted && compare_diff spaces-compacted-expect out-compacted ' -test_expect_success 'diff: nice spaces with diff.indentHeuristic' ' - git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 && +test_expect_success 'diff: nice spaces with diff.compactionHeuristic' ' + git -c diff.compactionHeuristic=true diff old new -- spaces.txt >out-compacted2 && compare_diff spaces-compacted-expect out-compacted2 ' -test_expect_success 'diff: --no-indent-heuristic overrides config' ' - git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 && +test_expect_success 'diff: --no-compaction-heuristic overrides config' ' + git -c diff.compactionHeuristic=true diff --no-compaction-heuristic old new -- spaces.txt >out2 && compare_diff spaces-expect out2 ' -test_expect_success 'diff: --indent-heuristic with --patience' ' - git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 && +test_expect_success 'diff: --compaction-heuristic with --patience' ' + git diff --compaction-heuristic --patience old new -- spaces.txt >out-compacted3 && compare_diff spaces-compacted-expect out-compacted3 ' -test_expect_success 'diff: --indent-heuristic with --histogram' ' - git diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 && +test_expect_success 'diff: --compaction-heuristic with --histogram' ' + git diff --compaction-heuristic --histogram old new -- spaces.txt >out-compacted4 && compare_diff spaces-compacted-expect out-compacted4 '
@@ -187,8 +187,8 @@ test_expect_success 'diff: ugly functions' ' compare_diff functions-expect out ' -test_expect_success 'diff: nice functions with --indent-heuristic' ' - git diff --indent-heuristic old new -- functions.c >out-compacted && +test_expect_success 'diff: nice functions with --compaction-heuristic' ' + git diff --compaction-heuristic old new -- functions.c >out-compacted && compare_diff functions-compacted-expect out-compacted '
@@ -197,18 +197,18 @@ test_expect_success 'blame: ugly spaces' ' compare_blame spaces-expect out-blame ' -test_expect_success 'blame: nice spaces with --indent-heuristic' ' - git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted && +test_expect_success 'blame: nice spaces with --compaction-heuristic' ' + git blame --compaction-heuristic old..new -- spaces.txt >out-blame-compacted && compare_blame spaces-compacted-expect out-blame-compacted ' -test_expect_success 'blame: nice spaces with diff.indentHeuristic' ' - git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 && +test_expect_success 'blame: nice spaces with diff.compactionHeuristic' ' + git -c diff.compactionHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 && compare_blame spaces-compacted-expect out-blame-compacted2 ' -test_expect_success 'blame: --no-indent-heuristic overrides config' ' - git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame2 && +test_expect_success 'blame: --no-compaction-heuristic overrides config' ' + git -c diff.compactionHeuristic=true blame --no-compaction-heuristic old..new -- spaces.txt >out-blame2 && git blame old..new -- spaces.txt >out-blame && compare_blame spaces-expect out-blame2 '
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 8db16d4ae6..7423f77fc8 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h@@ -42,7 +42,6 @@ extern "C" { #define XDF_IGNORE_BLANK_LINES (1 << 7) #define XDF_COMPACTION_HEURISTIC (1 << 8) -#define XDF_INDENT_HEURISTIC (1 << 9) #define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_FUNCCONTEXT (1 << 2)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 760fbb6db7..6cb96219cb 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c@@ -906,22 +906,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { if (group_previous(xdfo, &go)) xdl_bug("group sync broken sliding to match"); } - } else if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) { - /* - * Compaction heuristic: if it is possible to shift the - * group to make its bottom line a blank line, do so. - * - * As we already shifted the group forward as far as - * possible in the earlier loop, we only need to handle - * backward shifts, not forward ones. - */ - while (!is_blank_line(xdf->recs[g.end - 1], flags)) { - if (group_slide_up(xdf, &g, flags)) - xdl_bug("blank line disappeared"); - if (group_previous(xdfo, &go)) - xdl_bug("group sync broken sliding to blank line"); - } - } else if (flags & XDF_INDENT_HEURISTIC) { + } else if (flags & XDF_COMPACTION_HEURISTIC) { /* * Indent heuristic: a group of pure add/delete lines * implies two splits, one between the end of the "before"