From: Junio C Hamano <gitster@pobox.com>
To: "Tao Klerks via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Tao Klerks <tao@klerks.biz>
Subject: Re: [PATCH] mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Date: Thu, 13 Oct 2022 14:58:20 -0700 [thread overview]
Message-ID: <xmqqedvbcrnn.fsf@gitster.g> (raw)
In-Reply-To: <pull.1381.git.1665590389045.gitgitgadget@gmail.com> (Tao Klerks via GitGitGadget's message of "Wed, 12 Oct 2022 15:59:48 +0000")
"Tao Klerks via GitGitGadget" <gitgitgadget@gmail.com> writes:
> +enum difftool_gui_mode {
> + GUI_DISABLED = -1,
> + GUI_BY_CONFIG = 0,
> + GUI_ENABLED = 1
> +};
> +
> +static int difftool_opt_gui(const struct option *opt,
> + const char *optarg, int unset)
> +{
> + enum difftool_gui_mode *mode;
> + mode = opt->value;
> +
> + BUG_ON_OPT_ARG(optarg);
> +
> + if (unset)
> + *mode = GUI_DISABLED;
> + else
> + *mode = GUI_ENABLED;
> + return 0;
> +}
> +
> int cmd_difftool(int argc, const char **argv, const char *prefix)
> {
> - int use_gui_tool = 0, dir_diff = 0, prompt = -1, symlinks = 0,
> - tool_help = 0, no_index = 0;
> + int dir_diff = 0, prompt = -1, symlinks = 0, tool_help = 0,
> + no_index = 0;
> + enum difftool_gui_mode gui_mode;
This is left uninitialized ...
> static char *difftool_cmd = NULL, *extcmd = NULL;
> struct option builtin_difftool_options[] = {
> - OPT_BOOL('g', "gui", &use_gui_tool,
> - N_("use `diff.guitool` instead of `diff.tool`")),
> + OPT_CALLBACK_F('g', "gui", &gui_mode, NULL,
> + N_("use `diff.guitool` instead of `diff.tool`"),
> + PARSE_OPT_NOARG, difftool_opt_gui),
... and its address is used here. When "--no-gui" or "--gui" option
is given, the callback function will fill either _DISABLED or _ENABLED
to it.
But without any command line argument? Isn't gui_mode variable ...
> OPT_BOOL('d', "dir-diff", &dir_diff,
> N_("perform a full-directory diff")),
> OPT_SET_INT_F('y', "no-prompt", &prompt,
> @@ -732,13 +755,16 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
> } else if (dir_diff)
> die(_("options '%s' and '%s' cannot be used together"), "--dir-diff", "--no-index");
>
... still uninitialized here? The old use_gui_tool was initialized
to 0 so it wouldn't have had this problem.
> - die_for_incompatible_opt3(use_gui_tool, "--gui",
> + die_for_incompatible_opt3(gui_mode == GUI_ENABLED, "--gui",
> !!difftool_cmd, "--tool",
> !!extcmd, "--extcmd");
>
> - if (use_gui_tool)
> + if (gui_mode == GUI_ENABLED)
> setenv("GIT_MERGETOOL_GUI", "true", 1);
I suspect that there is no need to introduce a enum. The flow would
probably be
* git_config(difftool_config) would learn to parse the .guiDefault
option and initialize use_gui_tool to -1 when set to "auto" (and
to 0 with "false", to 1 with "true").
* Call to parse_options() then overwrites use_gui_tool with either
0 or 1 when --no-gui or --gui is given.
* After parse_options() returns, use_gui_tool can be examined and
when it is 0 or 1, then nothing need to change. The current code
before this patch is doing what the user wants when an explicit
command line option is given.
* When use_gui_tool is -1, we need a new code that sets it to
either 0 or 1 depending on the running environment.
But what is curious is that nothing in C code even looks at .guiDefault
configuration, so I am not sure why you would even need to change
anything in builtin/difftool.c file at all.
Puzzled.
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 9f99201bcca..8dbd04e5c5c 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -97,7 +97,33 @@ merge_mode () {
> test "$TOOL_MODE" = merge
> }
>
> +get_gui_default () {
> + if diff_mode
> + then
> + GUI_DEFAULT_KEY="difftool.guiDefault"
> + else
> + GUI_DEFAULT_KEY="mergetool.guiDefault"
> + fi
> + GUI_DEFAULT_CONFIG_LCASE=$(git config --default false --get $GUI_DEFAULT_KEY | tr '[:upper:]' '[:lower:]')
Avoid [:class:] when 'A-Z' 'a-z' is sufficient. Easier to read and
you do not even need to worry about portability that way.
> + if [ "$GUI_DEFAULT_CONFIG_LCASE" = "auto" ]
> + then
> + if [ -n "$DISPLAY" ]
> + then
> + GUI_DEFAULT=true
> + else
> + GUI_DEFAULT=false
> + fi
> + else
> + GUI_DEFAULT=$(git config --default false --bool --get $GUI_DEFAULT_KEY)
> + fi
> + echo $GUI_DEFAULT
> +}
Check Documentation/CodingGuidelines with special attention to the
"for shell scripts" section?
next prev parent reply other threads:[~2022-10-13 21:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 15:59 [PATCH] mergetool: new config guiDefault supports auto-toggling gui by DISPLAY Tao Klerks via GitGitGadget
2022-10-12 16:08 ` Tao Klerks
2022-10-12 18:12 ` Junio C Hamano
2022-10-13 6:49 ` Tao Klerks
2022-10-13 21:58 ` Junio C Hamano [this message]
2022-10-14 4:53 ` Tao Klerks
2022-10-14 9:10 ` Junio C Hamano
2022-10-14 12:32 ` Tao Klerks
2022-10-14 15:37 ` Junio C Hamano
2022-10-16 20:07 ` Tao Klerks
2022-10-14 8:00 ` [PATCH v2] RFC: " Tao Klerks via GitGitGadget
2022-10-14 8:24 ` Eric Sunshine
2022-10-14 9:11 ` Tao Klerks
2022-10-14 15:45 ` Junio C Hamano
2022-10-16 20:19 ` Tao Klerks
2022-10-17 5:50 ` Junio C Hamano
2022-10-18 6:54 ` [PATCH v3] " Tao Klerks via GitGitGadget
2023-02-17 10:59 ` Tao Klerks
2023-03-18 15:27 ` [PATCH v4] " Tao Klerks via GitGitGadget
2023-04-04 9:46 ` David Aguilar
2023-04-04 14:50 ` Tao Klerks
2023-04-04 20:35 ` Junio C Hamano
2023-04-06 3:33 ` David Aguilar
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=xmqqedvbcrnn.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=tao@klerks.biz \
/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).