From: Junio C Hamano <gitster@pobox.com>
To: "sunlin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, sunlin <sunlin7@yahoo.com>,
Lin Sun <lin.sun@zoom.us>
Subject: Re: [PATCH v9] Support auto-merge for meld to follow the vim-diff behavior
Date: Mon, 06 Jul 2020 15:31:29 -0700 [thread overview]
Message-ID: <xmqqzh8c8eda.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.781.v9.git.git.1594002423685.gitgitgadget@gmail.com> (sunlin via GitGitGadget's message of "Mon, 06 Jul 2020 02:27:03 +0000")
"sunlin via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 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.
This reads well.
> +mergetool.meld.useAutoMerge::
> + When the `--auto-merge` is given, meld will merge all non-conflicting
> + parts automatically, highlight the conflicting parts and waiting for
s/waiting/wait/, I presume, i.e. "merge", "highlight" and "wait" all
share the "meld will" that starts the sentence.
> + 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.
Other than that, this reads well, too.
> diff --git a/mergetools/meld b/mergetools/meld
> index 7a08470f88..ba6607a088 100644
> --- a/mergetools/meld
> +++ b/mergetools/meld
> @@ -3,34 +3,88 @@ diff_cmd () {
> }
>
> merge_cmd () {
> + check_meld_for_features
> +
> + option_auto_merge=
> + if test "$meld_use_auto_merge_option" = true
> then
> + option_auto_merge="--auto-merge"
> fi
>
> if test "$meld_has_output_option" = true
> then
> + "$merge_tool_path" $option_auto_merge --output="$MERGED" \
> "$LOCAL" "$BASE" "$REMOTE"
> else
> + "$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
> fi
> }
OK.
> +# 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
> +}
OK.
> +# 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
> + meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
> + case "$meld_has_output_option" in
> + true|false)
> + : use configured value
> + ;;
I think the assignment before "case" would have yielded a non-zero
exist status, so that would be another way to tell if we got a
proper boolean value, but this is also good.
> + *)
> + : 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
> + ;;
OK.
> + esac
> + fi
> + # Check whether we should use 'meld --auto-merge ...'
> + if test -z "$meld_use_auto_merge_option"
> then
> + meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
> + case "$meld_use_auto_merge_option" in
> + "")
> + meld_use_auto_merge_option=false
This is wrong, isn't it? I have
[rerere] enabled
in my .git/config and I'd certainly get an empty string if you ask
about it in a non-bool context:
$ o=$(git config --bool rerere.enabled); echo $o
true
$ o=$(git config rerere.enabled); echo $o
$
In short, I think you can just drop this test for an empty string here.
> + ;;
> + [Aa]uto)
Does any other configuration variable that takes "auto" take "Auto",
"AUTO", etc. as syonyms? It's not like we said "you must create a
file whose name is auto to trigger this feature" and some people
live on a case insensitive filesystem that may make it impossible
for them to do so, so I do not see much point in doing this.
> + # testing the "--auto-merge" option only if config is "[Aa]uto"
> + init_meld_help_msg
> +
> + case "$meld_help_msg" in
> + *"--auto-merge"*)
> + meld_use_auto_merge_option=true
> + ;;
> + *)
> + meld_use_auto_merge_option=false
> + ;;
> + esac
I didn't notice this until now, but for "--auto-merge", the "if your
meld is new enough, the option name may not appear and you would
only see [OPTION...]" rule we had for the "--output" does not apply?
I am not a meld user, and "yes, my code is correct" is a perfectly
good answer (in other word, the above question is NOT a rhetorical
one that points out an error in the code being reviewed).
> + ;;
> + *)
> + bool_value=$(git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
> + if test -n "$bool_value"
> + then
> + meld_use_auto_merge_option="$bool_value"
> + else
> + meld_use_auto_merge_option=false
> + fi
> + ;;
Perhaps the whole thing is easier to read if it is structured more
like so:
varname=mergetool.meld.useAutoMerge
if meld_use_auto_merge_option=$(git config --bool "$varname" 2>/dev/null)
then
: happy
else
# not a boolean. Is it 'auto'?
val=$(git config "$varname")
case "$val" in
auto)
;;
*)
die "unrecognized value '$val' for $varname"
;;;
esac
... here we auto detect ...
fi
Thanks.
next prev parent reply other threads:[~2020-07-06 22:31 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 1:25 [PATCH] Enable auto-merge for meld to follow the vim-diff beharior sunlin via GitGitGadget
2020-06-08 9:49 ` Pratyush Yadav
2020-06-09 3:19 ` [PATCH v2] " sunlin via GitGitGadget
2020-06-29 7:07 ` [PATCH v3] " sunlin via GitGitGadget
2020-06-29 12:32 ` Fwd: " Git Gadget
2020-06-30 0:06 ` Junio C Hamano
2020-06-30 7:42 ` David Aguilar
2020-06-30 11:25 ` lin.sun
2020-06-30 11:37 ` lin.sun
2020-06-30 15:51 ` Junio C Hamano
2020-06-30 11:26 ` [PATCH v4] " sunlin via GitGitGadget
2020-06-30 16:23 ` Đoàn Trần Công Danh
2020-06-30 23:01 ` Đoàn Trần Công Danh
2020-07-01 7:06 ` [PATCH v5] " sunlin via GitGitGadget
2020-07-01 7:23 ` lin.sun
2020-07-01 18:19 ` David Aguilar
2020-07-01 14:17 ` Đoàn Trần Công Danh
2020-07-01 15:32 ` lin.sun
2020-07-01 22:02 ` lin.sun
2020-07-01 23:06 ` Đoàn Trần Công Danh
2020-07-01 19:51 ` Junio C Hamano
2020-07-02 0:20 ` lin.sun
2020-07-02 0:44 ` [PATCH v6] Support auto-merge for meld to follow the vim-diff behavior sunlin via GitGitGadget
2020-07-02 2:35 ` lin.sun
2020-07-03 1:50 ` Junio C Hamano
2020-07-03 3:53 ` lin.sun
2020-07-03 15:58 ` Đoàn Trần Công Danh
2020-07-06 6:23 ` Junio C Hamano
2020-07-03 3:26 ` [PATCH v7] " sunlin via GitGitGadget
2020-07-03 4:50 ` Junio C Hamano
2020-07-04 1:18 ` lin.sun
2020-07-06 2:36 ` lin.sun
2020-07-04 1:16 ` [PATCH v8] " sunlin via GitGitGadget
2020-07-06 2:27 ` [PATCH v9] " sunlin via GitGitGadget
2020-07-06 22:31 ` Junio C Hamano [this message]
2020-07-07 6:34 ` lin.sun
2020-07-07 16:43 ` Junio C Hamano
2020-07-08 1:20 ` lin.sun
2020-07-08 1:51 ` Junio C Hamano
2020-07-07 6:17 ` [PATCH v10] " sunlin via GitGitGadget
2020-07-07 6:25 ` Junio C Hamano
2020-07-07 6:38 ` lin.sun
2020-07-07 6:44 ` lin.sun
2020-07-07 7:13 ` [PATCH v11] " sunlin via GitGitGadget
2020-07-07 15:31 ` Đoàn Trần Công Danh
2020-07-08 0:57 ` lin.sun
2020-07-08 3:25 ` [PATCH v12] " sunlin via GitGitGadget
2020-07-08 3:31 ` lin.sun
2020-07-08 15:42 ` Đoàn Trần Công Danh
2020-07-08 15:47 ` lin.sun
2020-07-09 0:35 ` [PATCH v13] " sunlin via GitGitGadget
2020-07-09 0:39 ` lin.sun
2020-07-09 2:42 ` Junio C Hamano
2020-07-09 2:56 ` Junio C Hamano
2020-07-09 3:24 ` lin.sun
2020-07-09 4:49 ` Junio C Hamano
2020-07-09 5:31 ` Junio C Hamano
2020-07-12 14:07 ` lin.sun
2020-07-12 23:38 ` lin.sun
2020-07-09 4:28 ` [PATCH v14] " sunlin via GitGitGadget
2020-07-12 8:39 ` [PATCH v15] " sunlin via GitGitGadget
2020-07-12 9:08 ` [PATCH v16] " sunlin via GitGitGadget
2020-07-12 18:04 ` Junio C Hamano
2020-07-12 23:26 ` lin.sun
2020-07-13 5:14 ` Junio C Hamano
2020-07-13 6:58 ` lin.sun
2020-07-12 23:32 ` [PATCH v17] " sunlin via GitGitGadget
2020-07-24 0:58 ` Junio C Hamano
2020-09-03 21:48 ` Junio C Hamano
[not found] ` <C35AC799-B4F6-4A5E-92FA-21065310B379@hxcore.ol>
2020-09-09 1:31 ` Lin Sun
2020-09-09 20:43 ` Junio C Hamano
2020-09-12 7:21 ` [PATCH v18] " sunlin via GitGitGadget
2020-09-14 20:07 ` Junio C Hamano
2020-09-15 0:55 ` Lin Sun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzh8c8eda.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=lin.sun@zoom.us \
--cc=sunlin7@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).