From: <lin.sun@zoom.us>
To: "'Đoàn Trần Công Danh'" <congdanhqx@gmail.com>,
"'David Aguilar'" <davvid@gmail.com>
Cc: "'Pratyush Yadav'" <me@yadavpratyush.com>,
"'sunlin via GitGitGadget'" <gitgitgadget@gmail.com>,
<git@vger.kernel.org>
Subject: RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior
Date: Mon, 29 Jun 2020 17:08:02 +0800 [thread overview]
Message-ID: <bfc401d64df4$cd189e70$6749db50$@zoom.us> (raw)
In-Reply-To: <20200628103755.GB26319@danh.dev>
[-- Attachment #1: Type: text/plain, Size: 716 bytes --]
Hi Danh,
> It seems like only David Aguilar (Cc-ed) works on that file.
>Look into b12d04503b (mergetools/meld: make usage of `--output` configurable and more robust, 2014-10-15), it looks like we need to check if --auto-merge option is available in meld.
>Someone still live with the ancient tools ;).
>meld has known --output for a long time but we still have a check for it.
Thank you for your hints, I changed the patch for checking the option "--auto-merge" in meld and use this option only if it's available.
The last patch is appended in attachment, or https://github.com/git/git/commit/3b70fd0bfc4086a08e27c869ff7492d567e8fdc2
Look forward it can be merged this time.
Thanks
Regards
Lin
[-- Attachment #2: 0001-Enable-auto-merge-for-meld-to-follow-the-vim-diff-be.patch --]
[-- Type: application/octet-stream, Size: 2118 bytes --]
From 3b70fd0bfc4086a08e27c869ff7492d567e8fdc2 Mon Sep 17 00:00:00 2001
From: "lin.sun" <lin.sun@zoom.us>
Date: Thu, 7 May 2020 07:31:14 +0800
Subject: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
The mergetool "meld" does NOT merge the no-conflict changes, while the
mergetool "vimdiff" will merge the no-conflict parts and highlight the
conflict parts.
This patch will make the mergetool "meld" similar to "vimdiff",
auto-merge the no-conflict parts, highlight conflict parts.
Signed-off-by: Lin Sun <lin.sun@zoom.us>
---
mergetools/meld | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/mergetools/meld b/mergetools/meld
index 7a08470..91b65ff 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -7,13 +7,23 @@ merge_cmd () {
then
check_meld_for_output_version
fi
+ if test -z "${meld_has_auto_merge_option:+set}"
+ then
+ check_meld_for_auto_merge_version
+ fi
+
+ option_auto_merge=
+ if test "$meld_has_auto_merge_option" = true
+ then
+ 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
}
@@ -34,3 +44,21 @@ check_meld_for_output_version () {
meld_has_output_option=false
fi
}
+
+# Check whether we should use 'meld --auto-merge ...'
+check_meld_for_auto_merge_version () {
+ meld_path="$(git config mergetool.meld.path)"
+ meld_path="${meld_path:-meld}"
+
+ if meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
+ then
+ : use configured value
+ elif "$meld_path" --help 2>&1 |
+ grep -e '--auto-merge' -e '\[OPTION\.\.\.\]' >/dev/null
+ then
+ : old ones mention --auto-merge and new ones just say OPTION...
+ meld_has_auto_merge_option=true
+ else
+ meld_has_auto_merge_option=false
+ fi
+}
--
2.2.0
next prev parent reply other threads:[~2020-06-29 20:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 3:33 [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior lin.sun
2020-06-28 6:23 ` lin.sun
2020-06-28 10:37 ` Đoàn Trần Công Danh
2020-06-29 9:08 ` lin.sun [this message]
2020-06-30 6:48 ` David Aguilar
2020-06-30 15:55 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 1:25 [PATCH] " sunlin via GitGitGadget
2020-06-09 3:19 ` [PATCH v2] " sunlin via GitGitGadget
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='bfc401d64df4$cd189e70$6749db50$@zoom.us' \
--to=lin.sun@zoom.us \
--cc=congdanhqx@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@yadavpratyush.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).