* [PATCH v3] install_branch_config: simplify verbose diagnostic logic
@ 2014-03-11 13:26 Paweł Wawruch
2014-03-11 19:56 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Paweł Wawruch @ 2014-03-11 13:26 UTC (permalink / raw)
To: git
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.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/243502
[2]: http://thread.gmane.org/gmane.comp.version-control.git/243849
branch.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
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.")
+ }}};
+ const char *name = remote_is_branch ? remote : shortname;
+ int message_number;
if (remote_is_branch
&& !strcmp(local, shortname)
@@ -77,29 +92,12 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
strbuf_release(&key);
if (flag & BRANCH_CONFIG_VERBOSE) {
- if (remote_is_branch && origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track remote branch %s from %s by rebasing.") :
- _("Branch %s set up to track remote branch %s from %s."),
- local, shortname, origin);
- else if (remote_is_branch && !origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track local branch %s by rebasing.") :
- _("Branch %s set up to track local branch %s."),
- local, shortname);
- else if (!remote_is_branch && origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track remote ref %s by rebasing.") :
- _("Branch %s set up to track remote ref %s."),
- local, remote);
- else if (!remote_is_branch && !origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track local ref %s by rebasing.") :
- _("Branch %s set up to track local ref %s."),
- local, remote);
+ if (origin && remote_is_branch)
+ printf_ln(_(messages[!remote_is_branch][!origin][!rebasing]),
+ local, name, origin);
else
- die("BUG: impossible combination of %d and %p",
- remote_is_branch, origin);
+ printf_ln(_(messages[!remote_is_branch][!origin][!rebasing]),
+ local, name);
}
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] install_branch_config: simplify verbose diagnostic logic
2014-03-11 13:26 [PATCH v3] install_branch_config: simplify verbose diagnostic logic Paweł Wawruch
@ 2014-03-11 19:56 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2014-03-11 19:56 UTC (permalink / raw)
To: Paweł Wawruch; +Cc: git
Paweł Wawruch <pawlo@aleg.pl> writes:
> 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.
> 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?
> + 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[][][] = {
{
{
...,
...
},
{
...,
...
},
},
...
};
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-11 19:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-11 13:26 [PATCH v3] install_branch_config: simplify verbose diagnostic logic Paweł Wawruch
2014-03-11 19:56 ` Junio C Hamano
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).