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.
Signed-off-by: Karthik Nayak <karthik....@gmail.com>
---
ref-filter.c | 66 ++++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 24 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 802629b..117bbbb 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -42,6 +42,14 @@ static struct used_atom {
track : 1,
trackshort : 1;
} remote_ref;
+ struct {
+ unsigned int subject : 1,
+ body : 1,
+ signature : 1,
+ all : 1,
+ lines : 1,
+ no_lines;
+ } contents;
} u;
} *used_atom;
static int used_atom_cnt, need_tagged, need_symref;
@@ -92,6 +100,29 @@ void remote_ref_atom_parser(struct used_atom *atom)
die(_("improper format entered align:%s"), buf);
}
+void contents_atom_parser(struct used_atom *atom)
+{
+ const char * buf;
+
+ if (match_atom_name(atom->str, "contents", &buf))
+ atom->u.contents.all = 1;
+
+ if (!buf)
+ return;
+ if (!strcmp(buf, "body"))
+ atom->u.contents.body = 1;
+ else if (!strcmp(buf, "signature"))
+ atom->u.contents.signature = 1;
+ else if (!strcmp(buf, "subject"))
+ atom->u.contents.subject = 1;
+ else if (skip_prefix(buf, "lines=", &buf)) {
+ atom->u.contents.lines = 1;
+ if (strtoul_ui(buf, 10, &atom->u.contents.no_lines))
+ die(_("positive value expected contents:lines=%s"),
buf);
+ } else
+ die(_("improper format entered contents:%s"), buf);
+}
+
static align_type get_align_position(const char *type)
{
if (!strcmp(type, "right"))
@@ -178,7 +209,7 @@ static struct {
{ "creatordate", FIELD_TIME },
{ "subject", FIELD_STR },
{ "body", FIELD_STR },
- { "contents", FIELD_STR },
+ { "contents", FIELD_STR, contents_atom_parser },
{ "upstream", FIELD_STR, remote_ref_atom_parser },
{ "push", FIELD_STR, remote_ref_atom_parser },
{ "symref", FIELD_STR },
@@ -191,11 +222,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;
@@ -212,7 +238,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 */
@@ -761,20 +786,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="))
+ !atom->u.contents.all)
continue;
if (!subpos)
find_subpos(buf, sz,
@@ -784,26 +805,23 @@ static void grab_sub_body_contents(struct atom_value
*val, int deref, struct obj
if (!strcmp(name, "subject"))
v->s = copy_subject(subpos, sublen);
- else if (!strcmp(name, "contents:subject"))
+ else if (atom->u.contents.subject)
v->s = copy_subject(subpos, sublen);
else if (!strcmp(name, "body"))
v->s = xmemdupz(bodypos, bodylen);
- else if (!strcmp(name, "contents:body"))
+ else if (atom->u.contents.body)
v->s = xmemdupz(bodypos, nonsiglen);
- else if (!strcmp(name, "contents:signature"))
+ else if (atom->u.contents.signature)
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.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 /* For %(contents) without modifiers */
+ v->s = xstrdup(subpos);
}
}
--
2.6.2
--
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
