ref-filter: introduce contents_atom_parser()

Introduce contents_atom_parser() which will parse the '%(contents)'
atom and store information into the 'used_atom' structure based on the
modifiers used along with the atom. Also introduce body_atom_parser()
and subject_atom_parser() for parsing atoms '%(body)' and '%(subject)'
respectively.

Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index 7df5085020ba9b62f49f178270bea7332e78dd01..d2946ea2a1d98653f748837a2d3c7a42896d5145 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -39,6 +39,10 @@ static struct used_atom {
                struct align align;
                enum { RR_NORMAL, RR_SHORTEN, RR_TRACK, RR_TRACKSHORT }
                        remote_ref;
                struct align align;
                enum { RR_NORMAL, RR_SHORTEN, RR_TRACK, RR_TRACKSHORT }
                        remote_ref;

+               struct {
+                       enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB } option;
+                       unsigned int nlines;
+               } contents;

        } u;
 } *used_atom;
 static int used_atom_cnt, need_tagged, need_symref;
        } u;
 } *used_atom;
 static int used_atom_cnt, need_tagged, need_symref;


@@ -66,6 +70,38 @@ static void remote_ref_atom_parser(struct used_atom *atom, const char *arg)
                die(_("unrecognized format: %%(%s)"), atom->name);
 }
 
                die(_("unrecognized format: %%(%s)"), atom->name);
 }
 

+static void body_atom_parser(struct used_atom *atom, const char *arg)
+{
+       if (arg)
+               die("%%(body) does not take arguments");
+       atom->u.contents.option = C_BODY_DEP;
+}
+
+static void subject_atom_parser(struct used_atom *atom, const char *arg)
+{
+       if (arg)
+               die("%%(subject) does not take arguments");
+       atom->u.contents.option = C_SUB;
+}
+
+static void contents_atom_parser(struct used_atom *atom, const char *arg)
+{
+       if (!arg)
+               atom->u.contents.option = C_BARE;
+       else if (!strcmp(arg, "body"))
+               atom->u.contents.option = C_BODY;
+       else if (!strcmp(arg, "signature"))
+               atom->u.contents.option = C_SIG;
+       else if (!strcmp(arg, "subject"))
+               atom->u.contents.option = C_SUB;
+       else if (skip_prefix(arg, "lines=", &arg)) {
+               atom->u.contents.option = C_LINES;
+               if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
+                       die(_("positive value expected contents:lines=%s"), arg);
+       } else
+               die(_("unrecognized %%(contents) argument: %s"), arg);
+}
+

 static align_type parse_align_position(const char *s)
 {
        if (!strcmp(s, "right"))
 static align_type parse_align_position(const char *s)
 {
        if (!strcmp(s, "right"))


@@ -145,9 +181,9 @@ static struct {
        { "taggerdate", FIELD_TIME },
        { "creator" },
        { "creatordate", FIELD_TIME },
        { "taggerdate", FIELD_TIME },
        { "creator" },
        { "creatordate", FIELD_TIME },

-       { "subject" },
-       { "body" },
-       { "contents" },
+       { "subject", FIELD_STR, subject_atom_parser },
+       { "body", FIELD_STR, body_atom_parser },
+       { "contents", FIELD_STR, contents_atom_parser },

        { "upstream", FIELD_STR, remote_ref_atom_parser },
        { "push", FIELD_STR, remote_ref_atom_parser },
        { "symref" },
        { "upstream", FIELD_STR, remote_ref_atom_parser },
        { "push", FIELD_STR, remote_ref_atom_parser },
        { "symref" },


@@ -160,11 +196,6 @@ static struct {
 
 #define REF_FORMATTING_STATE_INIT  { 0, NULL }
 
 
 #define REF_FORMATTING_STATE_INIT  { 0, NULL }
 

-struct contents {
-       unsigned int lines;
-       struct object_id oid;
-};
-

 struct ref_formatting_stack {
        struct ref_formatting_stack *prev;
        struct strbuf output;
 struct ref_formatting_stack {
        struct ref_formatting_stack *prev;
        struct strbuf output;


@@ -181,7 +212,6 @@ struct atom_value {
        const char *s;
        union {
                struct align align;
        const char *s;
        union {
                struct align align;

-               struct contents contents;

        } u;
        void (*handler)(struct atom_value *atomv, struct ref_formatting_state *state);
        unsigned long ul; /* used for sorting when not FIELD_STR */
        } u;
        void (*handler)(struct atom_value *atomv, struct ref_formatting_state *state);
        unsigned long ul; /* used for sorting when not FIELD_STR */


@@ -733,20 +763,16 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj
        unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
 
        for (i = 0; i < used_atom_cnt; i++) {
        unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
 
        for (i = 0; i < used_atom_cnt; i++) {

-               const char *name = used_atom[i].name;
+               struct used_atom *atom = &used_atom[i];
+               const char *name = atom->name;

                struct atom_value *v = &val[i];
                struct atom_value *v = &val[i];

-               const char *valp = NULL;

                if (!!deref != (*name == '*'))
                        continue;
                if (deref)
                        name++;
                if (strcmp(name, "subject") &&
                    strcmp(name, "body") &&
                if (!!deref != (*name == '*'))
                        continue;
                if (deref)
                        name++;
                if (strcmp(name, "subject") &&
                    strcmp(name, "body") &&

-                   strcmp(name, "contents") &&
-                   strcmp(name, "contents:subject") &&
-                   strcmp(name, "contents:body") &&
-                   strcmp(name, "contents:signature") &&
-                   !starts_with(name, "contents:lines="))
+                   !starts_with(name, "contents"))

                        continue;
                if (!subpos)
                        find_subpos(buf, sz,
                        continue;
                if (!subpos)
                        find_subpos(buf, sz,


@@ -754,28 +780,23 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj
                                    &bodypos, &bodylen, &nonsiglen,
                                    &sigpos, &siglen);
 
                                    &bodypos, &bodylen, &nonsiglen,
                                    &sigpos, &siglen);
 

-               if (!strcmp(name, "subject"))
-                       v->s = copy_subject(subpos, sublen);
-               else if (!strcmp(name, "contents:subject"))
+               if (atom->u.contents.option == C_SUB)

                        v->s = copy_subject(subpos, sublen);
                        v->s = copy_subject(subpos, sublen);

-               else if (!strcmp(name, "body"))
+               else if (atom->u.contents.option == C_BODY_DEP)

                        v->s = xmemdupz(bodypos, bodylen);
                        v->s = xmemdupz(bodypos, bodylen);

-               else if (!strcmp(name, "contents:body"))
+               else if (atom->u.contents.option == C_BODY)

                        v->s = xmemdupz(bodypos, nonsiglen);
                        v->s = xmemdupz(bodypos, nonsiglen);

-               else if (!strcmp(name, "contents:signature"))
+               else if (atom->u.contents.option == C_SIG)

                        v->s = xmemdupz(sigpos, siglen);
                        v->s = xmemdupz(sigpos, siglen);

-               else if (!strcmp(name, "contents"))
-                       v->s = xstrdup(subpos);
-               else if (skip_prefix(name, "contents:lines=", &valp)) {
+               else if (atom->u.contents.option == C_LINES) {

                        struct strbuf s = STRBUF_INIT;
                        const char *contents_end = bodylen + bodypos - siglen;
 
                        struct strbuf s = STRBUF_INIT;
                        const char *contents_end = bodylen + bodypos - siglen;
 

-                       if (strtoul_ui(valp, 10, &v->u.contents.lines))
-                               die(_("positive value expected contents:lines=%s"), valp);

                        /*  Size is the length of the message after removing the signature */
                        /*  Size is the length of the message after removing the signature */

-                       append_lines(&s, subpos, contents_end - subpos, v->u.contents.lines);
+                       append_lines(&s, subpos, contents_end - subpos, atom->u.contents.nlines);

                        v->s = strbuf_detach(&s, NULL);
                        v->s = strbuf_detach(&s, NULL);

-               }
+               } else if (atom->u.contents.option == C_BARE)
+                       v->s = xstrdup(subpos);

        }
 }
 
        }
 }