git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	David Aguilar <davvid@gmail.com>,
	Jeff Hostetler <git@jeffhostetler.com>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v5 4/7] mergetool--lib: create gui_mode function
Date: Mon, 29 Apr 2019 02:21:11 -0400	[thread overview]
Message-ID: <27a59e1e275f24a857435d3974f1a24fa6a475cd.1556518203.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1556518203.git.liu.denton@gmail.com>

Before, in `get_configured_merge_tool`, we would test the value of the
first argument directly, which corresponded to whether we were using
guitool. However, since `$GIT_MERGETOOL_GUI` is available as an
environment variable, create the `gui_mode` function which increases the
clarify of functions which use it.

While we're at it, add a space before `()` in function definitions to
fix the style.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 git-mergetool--lib.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index b928179a2e..4ca170c8a7 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -80,14 +80,18 @@ show_tool_names () {
 	}
 }
 
-diff_mode() {
+diff_mode () {
 	test "$TOOL_MODE" = diff
 }
 
-merge_mode() {
+merge_mode () {
 	test "$TOOL_MODE" = merge
 }
 
+gui_mode () {
+	test "$GIT_MERGETOOL_GUI" = true
+}
+
 translate_merge_tool_path () {
 	echo "$1"
 }
@@ -350,8 +354,7 @@ guess_merge_tool () {
 }
 
 get_configured_merge_tool () {
-	# If first argument is true, find the guitool instead
-	if test "$1" = true
+	if gui_mode
 	then
 		gui_prefix=gui
 	fi
@@ -405,7 +408,7 @@ get_merge_tool_path () {
 get_merge_tool () {
 	is_guessed=false
 	# Check if a merge tool has been configured
-	merge_tool=$(get_configured_merge_tool $GIT_MERGETOOL_GUI)
+	merge_tool=$(get_configured_merge_tool)
 	# Try to guess an appropriate merge tool if no tool has been set.
 	if test -z "$merge_tool"
 	then
-- 
2.21.0.1033.g0e8cc1100c


  parent reply	other threads:[~2019-04-29  6:21 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-22  5:07 [PATCH 0/5] difftool and mergetool improvements Denton Liu
2019-04-22  5:07 ` [PATCH 1/5] t7610: add mergetool --gui tests Denton Liu
2019-04-22  5:07 ` [PATCH 2/5] mergetool: use get_merge_tool function Denton Liu
2019-04-22  7:07   ` Eric Sunshine
2019-04-22  8:35     ` Denton Liu
2019-04-22  5:07 ` [PATCH 3/5] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-22  5:07 ` [PATCH 4/5] difftool: make --gui, --tool and --extcmd exclusive Denton Liu
2019-04-22  7:03   ` Eric Sunshine
2019-04-22  5:07 ` [PATCH 5/5] difftool: fallback on merge.guitool Denton Liu
2019-04-22 18:18   ` Jeff Hostetler
2019-04-22 18:33     ` Denton Liu
2019-04-23  8:53 ` [PATCH v2 0/5] difftool and mergetool improvements Denton Liu
2019-04-23  8:53   ` [PATCH v2 1/5] t7610: add mergetool --gui tests Denton Liu
2019-04-24  7:07     ` Junio C Hamano
2019-04-23  8:54   ` [PATCH v2 2/5] mergetool: use get_merge_tool_guessed function Denton Liu
2019-04-24  7:27     ` Junio C Hamano
2019-04-23  8:54   ` [PATCH v2 3/5] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-23  8:54   ` [PATCH v2 4/5] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-23  8:54   ` [PATCH v2 5/5] difftool: fallback on merge.guitool Denton Liu
2019-04-24 22:46   ` [PATCH v3 0/6] difftool and mergetool improvements Denton Liu
2019-04-24 22:46     ` [PATCH v3 1/6] t7610: unsuppress output Denton Liu
2019-04-25  2:31       ` Junio C Hamano
2019-04-24 22:46     ` [PATCH v3 2/6] t7610: add mergetool --gui tests Denton Liu
2019-04-24 22:47     ` [PATCH v3 3/6] mergetool: use get_merge_tool function Denton Liu
2019-04-25  2:36       ` Junio C Hamano
2019-04-24 22:47     ` [PATCH v3 4/6] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-25  3:02       ` Junio C Hamano
2019-04-25  5:16         ` Denton Liu
2019-04-24 22:47     ` [PATCH v3 5/6] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-24 22:47     ` [PATCH v3 6/6] difftool: fallback on merge.guitool Denton Liu
2019-04-25  3:10       ` Junio C Hamano
2019-04-25  9:54     ` [PATCH v4 0/6] difftool and mergetool improvements Denton Liu
2019-04-25  9:54       ` [PATCH v4 1/6] t7610: unsuppress output Denton Liu
2019-04-25  9:54       ` [PATCH v4 2/6] t7610: add mergetool --gui tests Denton Liu
2019-04-25  9:54       ` [PATCH v4 3/6] mergetool: use get_merge_tool function Denton Liu
2019-04-28 23:52         ` David Aguilar
2019-04-25  9:54       ` [PATCH v4 4/6] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-28 23:56         ` David Aguilar
2019-04-25  9:54       ` [PATCH v4 5/6] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-25  9:54       ` [PATCH v4 6/6] difftool: fallback on merge.guitool Denton Liu
2019-04-29  6:20       ` [PATCH v5 0/7] difftool and mergetool improvements Denton Liu
2019-04-29  6:21         ` [PATCH v5 1/7] t7610: unsuppress output Denton Liu
2019-04-29  6:21         ` [PATCH v5 2/7] t7610: add mergetool --gui tests Denton Liu
2019-04-29  6:21         ` [PATCH v5 3/7] mergetool: use get_merge_tool function Denton Liu
2019-04-29  6:21         ` Denton Liu [this message]
2019-04-29  6:21         ` [PATCH v5 5/7] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-29  6:21         ` [PATCH v5 6/7] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-29  6:21         ` [PATCH v5 7/7] difftool: fallback on merge.guitool Denton Liu

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=27a59e1e275f24a857435d3974f1a24fa6a475cd.1556518203.git.liu.denton@gmail.com \
    --to=liu.denton@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=davvid@gmail.com \
    --cc=git@jeffhostetler.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sunshine@sunshineco.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).