Re: [PATCH 2/9] ref-filter: implement %(if:equals=) and %(if:notequals=)

[Karthik Nayak]

On Sat, Oct 3, 2015 at 2:24 AM, Junio C Hamano  wrote:
> Karthik Nayak  writes:
>
>> Implement %(if:equals=) wherein the if condition is only
>> satisfied if the value obtained between the %(if:...) and %(then) atom
>> is the same as the given ''.
>>
>> Similarly, implement (if:notequals=) wherein the if condition
>> is only satisfied if the value obtained between the %(if:...) and
>> %(then) atom is differnt from the given ''.
>>
>> Add tests and Documentation for the same.
>>
>> Mentored-by: Christian Couder 
>> Mentored-by: Matthieu Moy 
>> Signed-off-by: Karthik Nayak 
>> ---
>
> The fast that the patch touches only the narrow parts that are
> specific to %(if),%(then) and %(else) and does not have to touch any
> generic part (other than the populate_value() parser for obvious
> reasons) is a good signal that tells us that the basic structure of
> the code is very sound.  I very much like the direction in which
> this series is going ;-)
>

Thats nice to hear :)

-- 
Regards,
Karthik Nayak
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/9] ref-filter: implement %(if:equals=) and %(if:notequals=)

[Karthik Nayak]

Implement %(if:equals=) wherein the if condition is only
satisfied if the value obtained between the %(if:...) and %(then) atom
is the same as the given ''.

Similarly, implement (if:notequals=) wherein the if condition
is only satisfied if the value obtained between the %(if:...) and
%(then) atom is differnt from the given ''.

Add tests and Documentation for the same.

Mentored-by: Christian Couder 
Mentored-by: Matthieu Moy 
Signed-off-by: Karthik Nayak 
---
 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=" or ":notequals=" 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=", ))
+   if_then_else->if_equals = valp;
+   else if (skip_prefix(atomv->s, "notequals=", ))
+   if_then_else->not_equals = valp;
+   else if (atomv->s[0])
+   die(_("format: unknown format if:%s"), atomv->s);
+
push_stack_element(>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(>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", )) {
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=)' '
+   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=)' '
+   git for-each-ref 

Re: [PATCH 2/9] ref-filter: implement %(if:equals=) and %(if:notequals=)

[Junio C Hamano]

Karthik Nayak  writes:

> Implement %(if:equals=) wherein the if condition is only
> satisfied if the value obtained between the %(if:...) and %(then) atom
> is the same as the given ''.
>
> Similarly, implement (if:notequals=) wherein the if condition
> is only satisfied if the value obtained between the %(if:...) and
> %(then) atom is differnt from the given ''.
>
> Add tests and Documentation for the same.
>
> Mentored-by: Christian Couder 
> Mentored-by: Matthieu Moy 
> Signed-off-by: Karthik Nayak 
> ---

The fast that the patch touches only the narrow parts that are
specific to %(if),%(then) and %(else) and does not have to touch any
generic part (other than the populate_value() parser for obvious
reasons) is a good signal that tells us that the basic structure of
the code is very sound.  I very much like the direction in which
this series is going ;-)

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html