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.
Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com>
Signed-off-by: Karthik Nayak <karthik....@gmail.com>
---
ref-filter.c | 77 +++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 48 insertions(+), 29 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 44670e3..ce02933 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -39,6 +39,10 @@ static struct used_atom {
struct align align;
enum { RR_SHORTEN, RR_TRACK, RR_TRACKSHORT, RR_NORMAL }
remote_ref;
+ struct {
+ enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG,
C_SUB } option;
+ unsigned int no_lines;
+ } contents;
} u;
} *used_atom;
static int used_atom_cnt, need_tagged, need_symref;
@@ -90,6 +94,36 @@ static void remote_ref_atom_parser(struct used_atom *atom)
die(_("unrecognized format: %%(%s)"), atom->str);
}
+static void contents_atom_parser(struct used_atom *atom)
+{
+ const char * buf;
+
+ if (match_atom_name(atom->str, "contents", &buf))
+ atom->u.contents.option = C_BARE;
+ else if (match_atom_name(atom->str, "subject", &buf)) {
+ atom->u.contents.option = C_SUB;
+ return;
+ } else if (match_atom_name(atom->str, "body", &buf)) {
+ atom->u.contents.option = C_BODY_DEP;
+ return;
+ }
+ if (!buf)
+ return;
+
+ if (!strcmp(buf, "body"))
+ atom->u.contents.option = C_BODY;
+ else if (!strcmp(buf, "signature"))
+ atom->u.contents.option = C_SIG;
+ else if (!strcmp(buf, "subject"))
+ atom->u.contents.option = C_SUB;
+ else if (skip_prefix(buf, "lines=", &buf)) {
+ atom->u.contents.option = C_LINES;
+ if (strtoul_ui(buf, 10, &atom->u.contents.no_lines))
+ die(_("positive value expected contents:lines=%s"),
buf);
+ } else
+ die(_("unrecognized %%(contents) argument: %s"), buf);
+}
+
static align_type parse_align_position(const char *s)
{
if (!strcmp(s, "right"))
@@ -171,9 +205,9 @@ static struct {
{ "taggerdate", FIELD_TIME },
{ "creator" },
{ "creatordate", FIELD_TIME },
- { "subject" },
- { "body" },
- { "contents" },
+ { "subject", FIELD_STR, contents_atom_parser },
+ { "body", FIELD_STR, contents_atom_parser },
+ { "contents", FIELD_STR, contents_atom_parser },
{ "upstream", FIELD_STR, remote_ref_atom_parser },
{ "push", FIELD_STR, remote_ref_atom_parser },
{ "symref" },
@@ -186,11 +220,6 @@ static struct {
#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;
@@ -207,7 +236,6 @@ struct atom_value {
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 */
@@ -756,20 +784,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++) {
- const char *name = used_atom[i].str;
+ struct used_atom *atom = &used_atom[i];
+ const char *name = atom->str;
struct atom_value *v = &val[i];
- const char *valp = NULL;
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,
@@ -777,28 +801,23 @@ static void grab_sub_body_contents(struct atom_value
*val, int deref, struct obj
&bodypos, &bodylen, &nonsiglen,
&sigpos, &siglen);
- if (!strcmp(name, "subject"))
+ if (atom->u.contents.option == C_SUB)
v->s = copy_subject(subpos, sublen);
- else if (!strcmp(name, "contents:subject"))
- 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);
- else if (!strcmp(name, "contents:body"))
+ else if (atom->u.contents.option == C_BODY)
v->s = xmemdupz(bodypos, nonsiglen);
- else if (!strcmp(name, "contents:signature"))
+ else if (atom->u.contents.option == C_SIG)
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;
- 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 */
- append_lines(&s, subpos, contents_end - subpos,
v->u.contents.lines);
+ append_lines(&s, subpos, contents_end - subpos,
atom->u.contents.no_lines);
v->s = strbuf_detach(&s, NULL);
- }
+ } else if (atom->u.contents.option == C_BARE)
+ v->s = xstrdup(subpos);
}
}
--
2.6.4
--
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
