Re: [PATCH v3] install_branch_config: simplify verbose diagnostic logic

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 11, 2014, 19:56 UTC
Message-ID: <xmqqiorkpl0u.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1394544412-28409-1-git-send-email-pawlo@aleg.pl>

Paweł Wawruch <pawlo@aleg.pl> writes:

Show 6 quoted lines

> Replace the chain of if statements with table of strings.
>
> Signed-off-by: Paweł Wawruch <pawlo@aleg.pl>
> ---
> I changed the commit message. Logic of table has changed. To make it more
> clear I added three dimensions of the table.

I am not sure if the message is "diagnostic"; it looks more like reminder text to me.

Show 21 quoted lines

> diff --git a/branch.c b/branch.c
> index 723a36b..741551a 100644
> --- a/branch.c
> +++ b/branch.c
> @@ -53,6 +53,21 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
>  	int remote_is_branch = starts_with(remote, "refs/heads/");
>  	struct strbuf key = STRBUF_INIT;
>  	int rebasing = should_setup_rebase(origin);
> +	const char *message[][2][2] = {{{
> +			N_("Branch %s set up to track remote branch %s from %s by rebasing."),
> +			N_("Branch %s set up to track remote branch %s from %s."),
> +		},{
> +			N_("Branch %s set up to track local branch %s by rebasing."),
> +			N_("Branch %s set up to track local branch %s."),
> +		}},{{
> +			N_("Branch %s set up to track remote ref %s by rebasing."),
> +			N_("Branch %s set up to track remote ref %s."),
> +		},{
> +			N_("Branch %s set up to track local ref %s by rebasing."),
> +			N_("Branch %s set up to track local ref %s.")
> +	}}};

I almost agree with the above use of a strange brace opening/closing convention in order to reduce the indentation levels [*1*] but then perhaps the above can be dedented even further?

Show 13 quoted lines

> +	const char *message[][2][2] = {{{
> +		N_("Branch %s set up to track remote branch %s from %s by rebasing."),
> +		N_("Branch %s set up to track remote branch %s from %s."),
> +		}, {
> +		N_("Branch %s set up to track local branch %s by rebasing."),
> +		N_("Branch %s set up to track local branch %s."),
> +		}}, {{
> +		N_("Branch %s set up to track remote ref %s by rebasing."),
> +		N_("Branch %s set up to track remote ref %s."),
> +		}, {
> +		N_("Branch %s set up to track local ref %s by rebasing."),
> +		N_("Branch %s set up to track local ref %s.")
> +	}}};

> +	const char *name = remote_is_branch ? remote : shortname;
> +	int message_number;

Do you still need this variable after making it a multi-dimentional array?

[Footnote]

*1* i.e. otherwise we would need something like

	message[][][] = {
				{
					{
                                        	...,
                                                ...
					},
					{
                                        	...,
                                                ...
					},
				},
                                ...
			};