From: <lin.sun@zoom.us>
To: "'Đoàn Trần Công Danh'" <congdanhqx@gmail.com>,
"'sunlin via GitGitGadget'" <gitgitgadget@gmail.com>
Cc: <git@vger.kernel.org>
Subject: RE: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior
Date: Thu, 2 Jul 2020 06:02:27 +0800 [thread overview]
Message-ID: <17eba01d64ff3$50ea2de0$f2be89a0$@zoom.us> (raw)
In-Reply-To: <1764101d64fbc$ccf9d7a0$66ed86e0$@zoom.us>
Hi Danh,
I'll push the patch to GitGitGadget so that it's will sending from the system mail. Sorry for this noise.
Regards
Lin
-----Original Message-----
From: lin.sun@zoom.us <lin.sun@zoom.us>
Sent: Wednesday, July 1, 2020 23:32
To: 'Đoàn Trần Công Danh' <congdanhqx@gmail.com>; 'sunlin via GitGitGadget' <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org; 'Lin Sun' <lin.sun@zoom.us>
Subject: RE: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior
Hi Danh,
Thank you for your comments, and changes apply to the last patch with your suggestions. Please refer the attachment for [PATH v6].
Thank you.
Regards
Lin
-----Original Message-----
From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Sent: Wednesday, July 1, 2020 22:18
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 v5] Enable auto-merge for meld to follow the vim-diff beharior
On 2020-07-01 07:06:46+0000, sunlin via GitGitGadget <gitgitgadget@gmail.com> wrote:
> From: Lin Sun <lin.sun@zoom.us>
>
> Make the mergetool used with "meld" backend behave similarly to how
> "vimdiff" behavior by telling it to auto-merge parts without conflicts
> and highlight the parts with conflicts when configuring
> `mergetool.meld.hasAutoMerge` with `true`, or `auto` for automatically
> detecting the option.
>
> Signed-off-by: Lin Sun <lin.sun@zoom.us>
> ---
> diff --git a/Documentation/config/mergetool.txt
> b/Documentation/config/mergetool.txt
> index 09ed31dbfa..9a74bd98dc 100644
> --- a/Documentation/config/mergetool.txt
> +++ b/Documentation/config/mergetool.txt
> @@ -30,6 +30,14 @@ mergetool.meld.hasOutput::
> to `true` tells Git to unconditionally use the `--output` option,
> and `false` avoids using `--output`.
>
> +mergetool.meld.hasAutoMerge::
> + Older versions of `meld` do not support the `--auto-merge` option.
> + Setting `mergetool.meld.hasOutput` to `true` tells Git to
s/hasOutput/hasAutoMerge/
Bikeshed opinion: I don't know if hasAutoMerge is a good name :)
> + unconditionally use the `--auto-merge` option, and `false` avoids using
> + `--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
> + by inspecting the output of `meld --help`, otherwise, follow meld's
> + default behavior.
> +
> 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/mergetools/meld b/mergetools/meld index
> 7a08470f88..9ee835b1e5 100644
> --- a/mergetools/meld
> +++ b/mergetools/meld
> @@ -3,34 +3,74 @@ diff_cmd () {
> }
>
> merge_cmd () {
> - if test -z "${meld_has_output_option:+set}"
> + check_meld_for_features
> +
> + option_auto_merge=
> + if test "$meld_has_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
> +get_meld_help_msg () {
> + meld_path="$(git config mergetool.meld.path || echo meld)"
> + $meld_path --help 2>&1
> +}
I'm actually prefer this change in 2 separated patches to reduce noise.
But given that mergetool/meld doesn't attract much attention, I don't know.
>
> - 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:+set}"
> 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)
> + if test "$meld_has_output_option" = true -o \
> + "$meld_has_output_option" = false
The coding guideline seems to not like "test -o".
I think it's acceptable in this case since we control its input.
The output is comming out of "git config --bool" anyway, so meld_has_output_option must be either "", "true", or "false"
I think we're better to do this instead:
if test -n "$meld_has_output_option"
then
: use configured output
else
: messing with help
fi
> + then
> + : use configured value
> + else
> + # treat meld_has_output_option as "auto"
> + if test -z "$meld_help_msg"
> + then
> + meld_help_msg="$(get_meld_help_msg)"
> + fi
If I were writing this patch, I probably changed get_meld_help_msg to
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
}
And call init_meld_help_msg unconditionally here, (and in --auto-merge arm below, maybe other arms in the future).
I'm writing without much thought into this, please take my word with a grain of salt :)
> +}
> +
> + case "$meld_help_msg" in
> + *"--output="* | *"[OPTION"???"]"*)
I think Git project prefer aligning case arm with case, IOW, move left 1 TAB.
> + # old ones mention --output and new ones just say OPTION...
> + meld_has_output_option=true ;;
It's nice to see this update, good.
The comment is no longer correct, though.
The version 3.20.2 has --output but not OPTIONS.
It's not introduced by your change, but I think it's better to say:
# All versions that has [OPTIONS???] supports --output
> + *)
> + meld_has_output_option=false ;;
> + esac
> + fi
> + fi
> + # Check whether we should use 'meld --auto-merge ...'
> + if test -z "${meld_has_auto_merge_option:+set}"
> then
> - : old ones mention --output and new ones just say OPTION...
> - meld_has_output_option=true
> - else
> - meld_has_output_option=false
> + meld_has_auto_merge_option=$(git config mergetool.meld.hasAutoMerge)
> + if test "$meld_has_auto_merge_option" = auto
Since we don't canonicallise to bool output of mergetool.meld.hasAutoMerge, I think we would need:
case "$meld_has_auto_merge_option" in
[Tt]rue|[Yy]es|[Oo]n)
meld_has_auto_merge_option=true ;;
auto)
: this shenanigan ;;
esac
But, that's a bit messy. Let's see other's opinions.
> + then
> + # testing the "--auto-merge" option only if config is "auto"
> + if test -z "$meld_help_msg"
> + then
> + meld_help_msg="$(get_meld_help_msg)"
> + fi
> +
> + case "$meld_help_msg" in
> + *"--auto-merge"*)
> + : old ones mention --output and new ones just say OPTION...
This comment doesn't apply here.
> + meld_has_auto_merge_option=true ;;
> + *)
> + meld_has_auto_merge_option=false ;;
> + esac
> + fi
> fi
> }
>
> base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17
> --
> gitgitgadget
--
Danh
next prev parent reply other threads:[~2020-07-01 22:02 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 [this message]
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
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='17eba01d64ff3$50ea2de0$f2be89a0$@zoom.us' \
--to=lin.sun@zoom.us \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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).