[PATCH v15] Support auto-merge for meld to follow the vim-diff behavior
- From
- sunlin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jul 12, 2020, 08:39 UTC
- Message-ID
- <pull.781.v15.git.git.1594543148959.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.781.v14.git.git.1594268906195.gitgitgadget@gmail.com>
From: Lin Sun <lin.sun@zoom.us>
Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when `mergetool.meld.useAutoMerge` is configured with `true`, or `auto` for detecting the `--auto-merge` option automatically.
Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Lin Sun <lin.sun@zoom.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Enable auto-merge for meld to follow the vimdiff beharior
Hi, the mergetool "meld" does NOT merge the no-conflict changes, while
the mergetool "vimdiff" will merge the no-conflict changes and highlight
the conflict parts. This patch will make the mergetool "meld" similar to
"vimdiff", auto-merge the no-conflict changes, highlight conflict parts.Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v15 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v15 Pull-Request: https://github.com/git/git/pull/781
Range-diff vs v14:
1: ce4e4cbfc0 ! 1: 02d849784f Support auto-merge for meld to follow the vim-diff behavior
@@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
After performing a merge, the original file with conflict markers
can be saved as a file with a `.orig` extension. If this variable
+ ## builtin/config.c ##
+@@ builtin/config.c: static int show_scope;
+ #define TYPE_PATH 4
+ #define TYPE_EXPIRY_DATE 5
+ #define TYPE_COLOR 6
++#define TYPE_BOOL_OR_STR 7
+
+ #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
+ { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
+@@ builtin/config.c: static int option_parse_type(const struct option *opt, const char *arg,
+ new_type = TYPE_INT;
+ else if (!strcmp(arg, "bool-or-int"))
+ new_type = TYPE_BOOL_OR_INT;
++ else if (!strcmp(arg, "bool-or-str"))
++ new_type = TYPE_BOOL_OR_STR;
+ else if (!strcmp(arg, "path"))
+ new_type = TYPE_PATH;
+ else if (!strcmp(arg, "expiry-date"))
+@@ builtin/config.c: static struct option builtin_config_options[] = {
+ OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
+ OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
+ OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
++ OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
+ OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
+ OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
+ OPT_GROUP(N_("Other")),
+@@ builtin/config.c: static int format_config(struct strbuf *buf, const char *key_, const char *value
+ strbuf_addstr(buf, v ? "true" : "false");
+ else
+ strbuf_addf(buf, "%d", v);
++ } else if (type == TYPE_BOOL_OR_STR) {
++ int is_bool, v;
++ v = git_config_bool_or_str(NULL, key_, value_, &is_bool);
++ if (is_bool)
++ strbuf_addstr(buf, v ? "true" : "false");
++ else
++ strbuf_addstr(buf, value_);
+ } else if (type == TYPE_PATH) {
+ const char *v;
+ if (git_config_pathname(&v, key_, value_) < 0)
+@@ builtin/config.c: static char *normalize_value(const char *key, const char *value)
+ else
+ return xstrdup(v ? "true" : "false");
+ }
++ if (type == TYPE_BOOL_OR_STR) {
++ int is_bool, v;
++ v = git_config_bool_or_str(NULL, key, value, &is_bool);
++ if (!is_bool)
++ return xstrdup(value);
++ else
++ return xstrdup(v ? "true" : "false");
++ }
+ if (type == TYPE_COLOR) {
+ char v[COLOR_MAXLEN];
+ if (git_config_color(v, key, value))
+
+ ## config.c ##
+@@ config.c: int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
+ return git_config_int(name, value);
+ }
+
++int git_config_bool_or_str(const char **dest, const char *name, const char *value, int *is_bool)
++{
++ int v = git_parse_maybe_bool_text(value);
++ if (0 <= v) {
++ *is_bool = 1;
++ return v;
++ }
++ *is_bool = 0;
++ if (dest != NULL)
++ return git_config_string(dest, name, value);
++ else
++ return 0;
++}
++
+ int git_config_bool(const char *name, const char *value)
+ {
+ int discard;
+
+ ## config.h ##
+@@ config.h: ssize_t git_config_ssize_t(const char *, const char *);
+ */
+ int git_config_bool_or_int(const char *, const char *, int *);
+
++/**
++ * Same as `git_config_bool`, except that `is_bool` flag is unset, then if
++ * `dest` parameter is non-NULL, it allocates and copies the value string
++ * into the `dest`, if `dest` is NULL and `is_bool` flag is unset it return 0.
++ */
++int git_config_bool_or_str(const char **, const char *, const char *, int *);
++
+ /**
+ * Parse a string into a boolean value, respecting keywords like "true" and
+ * "false". Integer values are converted into true/false values (when they
+
## mergetools/meld ##
@@ mergetools/meld: diff_cmd () {
}
@@ mergetools/meld: diff_cmd () {
- meld_has_output_option=true
- else
- meld_has_output_option=false
-+ meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
++ meld_use_auto_merge_option=$(
++ git --bool-or-str config mergetool.meld.useAutoMerge)
+ case "$meld_use_auto_merge_option" in
+ true|false)
+ : use well formatted boolean value
@@ mergetools/meld: diff_cmd () {
+ esac
+ ;;
+ *)
-+ # try other boolean value with git
-+ if meld_use_auto_merge_option=$(
-+ git config --bool mergetool.meld.useAutoMerge)
-+ then
-+ : use normalized boolean value
-+ else
-+ meld_use_auto_merge_option=false
-+ fi
++ meld_use_auto_merge_option=false
+ ;;
+ esac
fiDocumentation/config/mergetool.txt | 10 ++++ builtin/config.c | 19 +++++++ config.c | 14 ++++++ config.h | 7 +++ mergetools/meld | 81 ++++++++++++++++++++++++------ 5 files changed, 115 insertions(+), 16 deletions(-)
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt index 09ed31dbfa..16a27443a3 100644 --- a/Documentation/config/mergetool.txt +++ b/Documentation/config/mergetool.txt @@ -30,6 +30,16 @@ mergetool.meld.hasOutput:: to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`. +mergetool.meld.useAutoMerge:: + When the `--auto-merge` is given, meld will merge all non-conflicting + parts automatically, highlight the conflicting parts and wait for + user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells + Git to unconditionally use the `--auto-merge` option with `meld`. + Setting this value to `auto` makes git detect whether `--auto-merge` + is supported and will only use `--auto-merge` when available. A + value of `false` avoids using `--auto-merge` altogether, and is the + default value. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable diff --git a/builtin/config.c b/builtin/config.c index ee4aef6a35..6f2ddadc80 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -65,6 +65,7 @@ static int show_scope; #define TYPE_PATH 4 #define TYPE_EXPIRY_DATE 5 #define TYPE_COLOR 6 +#define TYPE_BOOL_OR_STR 7 #define OPT_CALLBACK_VALUE(s, l, v, h, i) \ { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \ @@ -94,6 +95,8 @@ static int option_parse_type(const struct option *opt, const char *arg, new_type = TYPE_INT; else if (!strcmp(arg, "bool-or-int")) new_type = TYPE_BOOL_OR_INT; + else if (!strcmp(arg, "bool-or-str")) + new_type = TYPE_BOOL_OR_STR; else if (!strcmp(arg, "path")) new_type = TYPE_PATH; else if (!strcmp(arg, "expiry-date")) @@ -149,6 +152,7 @@ static struct option builtin_config_options[] = { OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL), OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT), OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT), + OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR), OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH), OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE), OPT_GROUP(N_("Other")), @@ -250,6 +254,13 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value strbuf_addstr(buf, v ? "true" : "false"); else strbuf_addf(buf, "%d", v); + } else if (type == TYPE_BOOL_OR_STR) { + int is_bool, v; + v = git_config_bool_or_str(NULL, key_, value_, &is_bool); + if (is_bool) + strbuf_addstr(buf, v ? "true" : "false"); + else + strbuf_addstr(buf, value_); } else if (type == TYPE_PATH) { const char *v; if (git_config_pathname(&v, key_, value_) < 0) @@ -411,6 +422,14 @@ static char *normalize_value(const char *key, const char *value) else return xstrdup(v ? "true" : "false"); } + if (type == TYPE_BOOL_OR_STR) { + int is_bool, v; + v = git_config_bool_or_str(NULL, key, value, &is_bool); + if (!is_bool) + return xstrdup(value); + else + return xstrdup(v ? "true" : "false"); + } if (type == TYPE_COLOR) { char v[COLOR_MAXLEN]; if (git_config_color(v, key, value)) diff --git a/config.c b/config.c index 8db9c77098..4c6c06d10b 100644 --- a/config.c +++ b/config.c @@ -1100,6 +1100,20 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool) return git_config_int(name, value); } +int git_config_bool_or_str(const char **dest, const char *name, const char *value, int *is_bool) +{ + int v = git_parse_maybe_bool_text(value); + if (0 <= v) { + *is_bool = 1; + return v; + } + *is_bool = 0; + if (dest != NULL) + return git_config_string(dest, name, value); + else + return 0; +} + int git_config_bool(const char *name, const char *value) { int discard; diff --git a/config.h b/config.h index 060874488f..175b88d9c5 100644 --- a/config.h +++ b/config.h @@ -217,6 +217,13 @@ ssize_t git_config_ssize_t(const char *, const char *); */ int git_config_bool_or_int(const char *, const char *, int *); +/** + * Same as `git_config_bool`, except that `is_bool` flag is unset, then if + * `dest` parameter is non-NULL, it allocates and copies the value string + * into the `dest`, if `dest` is NULL and `is_bool` flag is unset it return 0. + */ +int git_config_bool_or_str(const char **, const char *, const char *, int *); + /** * Parse a string into a boolean value, respecting keywords like "true" and * "false". Integer values are converted into true/false values (when they diff --git a/mergetools/meld b/mergetools/meld index 7a08470f88..1838a8c35b 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -3,34 +3,83 @@ diff_cmd () { } merge_cmd () { - if test -z "${meld_has_output_option:+set}" + check_meld_for_features + + option_auto_merge= + if test "$meld_use_auto_merge_option" = true then - check_meld_for_output_version + option_auto_merge="--auto-merge" fi if test "$meld_has_output_option" = true then - "$merge_tool_path" --output="$MERGED" \ + "$merge_tool_path" $option_auto_merge --output="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else - "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" + "$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE" fi } -# Check whether we should use 'meld --output <file>' -check_meld_for_output_version () { - meld_path="$(git config mergetool.meld.path)" - meld_path="${meld_path:-meld}" +# Get meld help message +init_meld_help_msg () { + if test -z "$meld_help_msg" + then + meld_path="$(git config mergetool.meld.path || echo meld)" + meld_help_msg=$("$meld_path" --help 2>&1) + fi +} - if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) +# Check the features and set flags +check_meld_for_features () { + # Check whether we should use 'meld --output <file>' + if test -z "$meld_has_output_option" then - : use configured value - elif "$meld_path" --help 2>&1 | - grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null + meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) + case "$meld_has_output_option" in + true|false) + : use configured value + ;; + *) + : empty or invalid configured value, detecting "--output" automatically + init_meld_help_msg + + case "$meld_help_msg" in + *"--output="*|*'[OPTION...]'*) + # All version that has [OPTION...] supports --output + meld_has_output_option=true + ;; + *) + meld_has_output_option=false + ;; + esac + ;; + esac + fi + # Check whether we should use 'meld --auto-merge ...' + if test -z "$meld_use_auto_merge_option" then - : old ones mention --output and new ones just say OPTION... - meld_has_output_option=true - else - meld_has_output_option=false + meld_use_auto_merge_option=$( + git --bool-or-str config mergetool.meld.useAutoMerge) + case "$meld_use_auto_merge_option" in + true|false) + : use well formatted boolean value + ;; + auto) + # testing the "--auto-merge" option only if config is "auto" + init_meld_help_msg + + case "$meld_help_msg" in + *"--auto-merge"*|*'[OPTION...]'*) + meld_use_auto_merge_option=true + ;; + *) + meld_use_auto_merge_option=false + ;; + esac + ;; + *) + meld_use_auto_merge_option=false + ;; + esac fi } base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17
-- gitgitgadget