From: "Paweł Wawruch" <pawlo@aleg.pl>
To: git@vger.kernel.org
Subject: [PATCH v3] install_branch_config: simplify verbose diagnostic logic
Date: Tue, 11 Mar 2014 14:26:52 +0100 [thread overview]
Message-ID: <1394544412-28409-1-git-send-email-pawlo@aleg.pl> (raw)
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
next reply other threads:[~2014-03-11 13:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 13:26 Paweł Wawruch [this message]
2014-03-11 19:56 ` [PATCH v3] install_branch_config: simplify verbose diagnostic logic Junio C Hamano
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=1394544412-28409-1-git-send-email-pawlo@aleg.pl \
--to=pawlo@aleg.pl \
--cc=git@vger.kernel.org \
/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).