# RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior 6 messages from 2020-06-09 to 2020-06-30. Participants: lin.sun@zoom.us, Đoàn Trần Công Danh, David Aguilar, Junio C Hamano. Thread: https://gitlist.dev/t/53640 ## lin.sun@zoom.us, 2020-06-09 03:33 Subject: RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: <311401d63e0e$b1ffe490$15ffadb0$@zoom.us> URL: https://gitlist.dev/e/311401d63e0e%24b1ffe490%2415ffadb0%24%40zoom.us ``` Hi Pratyush, Yes, you're totally right, it's my typo, and it's fixed by my last commit [PATCH v2]. I tried git merge-tool with meld and found there is "auto-merge" option for better experience. The "auto-merge" was added since meld 1.7 (Year 2012). Here're some documents for it. https://meldmerge.org/features.html https://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html Regards Lin -----Original Message----- From: Pratyush Yadav Sent: Monday, June 8, 2020 17:50 To: sunlin via GitGitGadget Cc: git@vger.kernel.org; sunlin ; lin.sun Subject: Re: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior Hi Lin, I'm not familiar with the code so I'll let someone else comment on that. But... On 08/05/20 01:25AM, sunlin via GitGitGadget wrote: > From: "lin.sun" > > 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 ... your name and email in "From:" and "Signed-off-by:" should be the same. So either use "lin.sun" in both places or use Lin Sun in both. -- Regards, Pratyush Yadav ``` ## lin.sun@zoom.us, 2020-06-28 06:23 Subject: RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: <0c2401d64d14$aeafa680$0c0ef380$@zoom.us> URL: https://gitlist.dev/e/0c2401d64d14%24aeafa680%240c0ef380%24%40zoom.us In-Reply-To: <311401d63e0e$b1ffe490$15ffadb0$@zoom.us> ``` Hi Pratyush, Could you help to review and merge this patch? Or do you know who can review and merge this patch please? Regards Lin -----Original Message----- From: lin.sun@zoom.us Sent: Tuesday, June 9, 2020 11:33 To: 'Pratyush Yadav' ; 'sunlin via GitGitGadget' Cc: git@vger.kernel.org; 'sunlin' Subject: RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Hi Pratyush, Yes, you're totally right, it's my typo, and it's fixed by my last commit [PATCH v2]. I tried git merge-tool with meld and found there is "auto-merge" option for better experience. The "auto-merge" was added since meld 1.7 (Year 2012). Here're some documents for it. https://meldmerge.org/features.html https://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html Regards Lin -----Original Message----- From: Pratyush Yadav Sent: Monday, June 8, 2020 17:50 To: sunlin via GitGitGadget Cc: git@vger.kernel.org; sunlin ; lin.sun Subject: Re: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior Hi Lin, I'm not familiar with the code so I'll let someone else comment on that. But... On 08/05/20 01:25AM, sunlin via GitGitGadget wrote: > From: "lin.sun" > > 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 ... your name and email in "From:" and "Signed-off-by:" should be the same. So either use "lin.sun" in both places or use Lin Sun in both. -- Regards, Pratyush Yadav ``` ## Đoàn Trần Công Danh, 2020-06-28 10:37 Subject: Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: <20200628103755.GB26319@danh.dev> URL: https://gitlist.dev/e/20200628103755.GB26319%40danh.dev In-Reply-To: <0c2401d64d14$aeafa680$0c0ef380$@zoom.us> ``` On 2020-06-28 14:23:43+0800, lin.sun@zoom.us wrote: > Hi Pratyush, > > Could you help to review and merge this patch? > Or do you know who can review and merge this patch please? 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. -- Danh ``` ## lin.sun@zoom.us, 2020-06-29 09:08 Subject: RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: URL: https://gitlist.dev/e/bfc401d64df4%24cd189e70%246749db50%24%40zoom.us In-Reply-To: <20200628103755.GB26319@danh.dev> ``` 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 From 3b70fd0bfc4086a08e27c869ff7492d567e8fdc2 Mon Sep 17 00:00:00 2001 From: "lin.sun" 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 --- 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 ``` ## David Aguilar, 2020-06-30 06:48 Subject: Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: <20200630064800.GB1962986@gmail.com> URL: https://gitlist.dev/e/20200630064800.GB1962986%40gmail.com In-Reply-To: ``` On Mon, Jun 29, 2020 at 05:08:02PM +0800, lin.sun@zoom.us wrote: > 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 Hello, thank you for making this change and keeping the checks around for the older versions. One comment on the patch -- it looks like it duplicates the version check logic. Would it be possible to coalesce the version check so that we only exec meld once for the two version checks? The changes look good nonetheless, and perhaps combining the checks would make it too complex, so this looks good to me. Can you please submit the patch to the list here? Once you do, please feel free to add my sign-off: Signed-off-by: David Aguilar cheers, -- David ``` ## Junio C Hamano, 2020-06-30 15:55 Subject: Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: URL: https://gitlist.dev/e/xmqqwo3oeefm.fsf%40gitster.c.googlers.com In-Reply-To: <20200630064800.GB1962986@gmail.com> ``` David Aguilar writes: > Can you please submit the patch to the list here? > Once you do, please feel free to add my sign-off: > > Signed-off-by: David Aguilar Thanks, but you didn't write a single line of new code in the patch, and you are not relaying Sun Lin's patch on the author's behalf, so Sob is probably not what you meant---it would either be Reviewed-by (I've gone through the patch with fine toothed comb, I can answer any questions about the change as well as the author could, and I can stand behind it with confidence) or Acked-by (I've seen the patch, didn't see anything outrageously wrong in it, and agree with its general direction---I appreciate the author tacking the issue). ```