From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH 2/9] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
Date: Fri, 2 Oct 2015 23:08:59 +0530 [thread overview]
Message-ID: <1443807546-5985-3-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1443807546-5985-1-git-send-email-Karthik.188@gmail.com>
Implement %(if:equals=<string>) wherein the if condition is only
satisfied if the value obtained between the %(if:...) and %(then) atom
is the same as the given '<string>'.
Similarly, implement (if:notequals=<string>) wherein the if condition
is only satisfied if the value obtained between the %(if:...) and
%(then) atom is differnt from the given '<string>'.
Add tests and Documentation for the same.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
Documentation/git-for-each-ref.txt | 4 +++-
ref-filter.c | 28 ++++++++++++++++++++++++----
t/t6302-for-each-ref-filter.sh | 18 ++++++++++++++++++
3 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 768a512..5c12c2f 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -141,7 +141,9 @@ if::
If there is an atom with value or string literal after the
%(if) then everything after the %(then) is printed, else if
the %(else) atom is used, then everything after %(else) is
- printed.
+ printed. Append ":equals=<string>" or ":notequals=<string>" to
+ compare the value between the %(if:...) and %(then) atoms with the
+ given string.
In addition to the above, for commit and tag objects, the header
field names (`tree`, `parent`, `object`, `type`, and `tag`) can
diff --git a/ref-filter.c b/ref-filter.c
index 93b07f5..da7723b 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -73,6 +73,8 @@ struct contents {
};
struct if_then_else {
+ const char *if_equals,
+ *not_equals;
unsigned int if_atom : 1,
then_atom : 1,
else_atom : 1,
@@ -277,8 +279,16 @@ static void if_atom_handler(struct atom_value *atomv, struct ref_formatting_stat
{
struct ref_formatting_stack *new;
struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
+ const char *valp;
if_then_else->if_atom = 1;
+ if (skip_prefix(atomv->s, "equals=", &valp))
+ if_then_else->if_equals = valp;
+ else if (skip_prefix(atomv->s, "notequals=", &valp))
+ if_then_else->not_equals = valp;
+ else if (atomv->s[0])
+ die(_("format: unknown format if:%s"), atomv->s);
+
push_stack_element(&state->stack);
new = state->stack;
new->at_end = if_then_else_handler;
@@ -302,11 +312,19 @@ static void then_atom_handler(struct atom_value *atomv, struct ref_formatting_st
if (!if_then_else)
die(_("format: %%(then) atom used without an %%(if) atom"));
if_then_else->then_atom = 1;
+
/*
- * If there exists non-empty string between the 'if' and
- * 'then' atom then the 'if' condition is satisfied.
+ * If the 'equals' or 'notequals' attribute is used then
+ * perform the required comparison. If not, only non-empty
+ * strings satisfy the 'if' condition.
*/
- if (cur->output.len && !is_empty(cur->output.buf))
+ if (if_then_else->if_equals) {
+ if (!strcmp(if_then_else->if_equals, cur->output.buf))
+ if_then_else->condition_satisfied = 1;
+ } else if (if_then_else->not_equals) {
+ if (strcmp(if_then_else->not_equals, cur->output.buf))
+ if_then_else->condition_satisfied = 1;
+ } else if (cur->output.len && !is_empty(cur->output.buf))
if_then_else->condition_satisfied = 1;
strbuf_reset(&cur->output);
}
@@ -1013,8 +1031,10 @@ static void populate_value(struct ref_array_item *ref)
} else if (!strcmp(name, "end")) {
v->handler = end_atom_handler;
continue;
- } else if (!strcmp(name, "if")) {
+ } else if (match_atom_name(name, "if", &valp)) {
v->handler = if_atom_handler;
+ if (valp)
+ v->s = xstrdup(valp);
continue;
} else if (!strcmp(name, "then")) {
v->handler = then_atom_handler;
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 7ce1cc4..d7f7a18 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -303,4 +303,22 @@ test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
test_cmp expect actual
'
+test_expect_success 'check %(if:equals=<string>)' '
+ git for-each-ref --format="%(if:equals=master)%(refname:short)%(then)Found master%(else)Not master%(end)" refs/heads/ >actual &&
+ cat >expect <<-\EOF &&
+ Found master
+ Not master
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'check %(if:notequals=<string>)' '
+ git for-each-ref --format="%(if:notequals=master)%(refname:short)%(then)Not master%(else)Found master%(end)" refs/heads/ >actual &&
+ cat >expect <<-\EOF &&
+ Found master
+ Not master
+ EOF
+ test_cmp expect actual
+'
+
test_done
--
2.6.0
next prev parent reply other threads:[~2015-10-02 17:41 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-02 17:38 [PATCH 0/9] port branch.c to use ref-filter printing APIs Karthik Nayak
2015-10-02 17:38 ` [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2015-10-02 20:45 ` Junio C Hamano
2015-10-03 7:05 ` Karthik Nayak
2015-10-03 9:39 ` Matthieu Moy
2015-10-03 17:01 ` Junio C Hamano
2015-10-04 8:02 ` Matthieu Moy
2015-10-04 17:21 ` Junio C Hamano
2015-10-04 13:59 ` Karthik Nayak
2015-10-02 17:38 ` Karthik Nayak [this message]
2015-10-02 20:54 ` [PATCH 2/9] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Junio C Hamano
2015-10-03 7:14 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 3/9] ref-filter: add support for %(path) atom Karthik Nayak
2015-10-03 10:02 ` Matthieu Moy
2015-10-04 17:07 ` Karthik Nayak
2015-10-04 17:51 ` Matthieu Moy
2015-10-04 18:44 ` Junio C Hamano
2015-10-05 6:40 ` Matthieu Moy
2015-10-04 19:12 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2015-10-02 21:02 ` Junio C Hamano
2015-10-03 7:28 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 5/9] ref-filter: adopt get_head_description() from branch.c Karthik Nayak
2015-10-02 17:39 ` [PATCH 6/9] ref-filter: introduce format_ref_array_item() Karthik Nayak
2015-10-03 12:02 ` Matthieu Moy
2015-10-05 7:49 ` Karthik Nayak
2015-10-05 8:49 ` Matthieu Moy
2015-10-06 19:16 ` Karthik Nayak
2015-10-06 19:38 ` Matthieu Moy
2015-10-06 19:50 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2015-10-03 12:08 ` Matthieu Moy
2015-10-05 7:49 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 8/9] branch: use ref-filter printing APIs Karthik Nayak
2015-10-03 12:41 ` Matthieu Moy
2015-10-05 17:46 ` Karthik Nayak
2015-10-05 18:43 ` Matthieu Moy
2015-10-06 15:30 ` Karthik Nayak
2015-10-06 19:03 ` Matthieu Moy
2015-10-07 16:47 ` Karthik Nayak
2015-10-07 17:58 ` Matthieu Moy
2015-10-07 18:02 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 9/9] branch: implement '--format' option Karthik Nayak
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443807546-5985-3-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).