From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v5 11/12] ref-filter: introduce contents_atom_parser() Date: Wed, 17 Feb 2016 00:30:14 +0530 Message-ID: <1455649215-23260-12-git-send-email-Karthik.188@gmail.com> References: <1455649215-23260-1-git-send-email-Karthik.188@gmail.com> Cc: gitster@pobox.com, sunshine@sunshineco.com, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Feb 16 20:00:35 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aVkrH-0000CN-CS for gcvg-git-2@plane.gmane.org; Tue, 16 Feb 2016 20:00:23 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933237AbcBPTAS (ORCPT ); Tue, 16 Feb 2016 14:00:18 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:33554 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933217AbcBPTAO (ORCPT ); Tue, 16 Feb 2016 14:00:14 -0500 Received: by mail-pa0-f45.google.com with SMTP id fl4so95997421pad.0 for ; Tue, 16 Feb 2016 11:00:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=saSXVdHLT+/WsWFtLRRRzbFbaXfBqDhQn3VnF5T9Gb8=; b=vqEZispLW26W2um8tmxvnn56nsE0NWtZLwGcy1L3VKfQRMNAhI52SLwEOjhk4jT4Iw S7H6DUPq6Fc3kIezzQ7BELU5HH7zN4TBUs+oTACUPXk/SRpx/Ux30C9FQy2EeGW+k31/ wcjp+yWnHILyVJAY1R46sXZdKldnwCIqcQeuxGXrjXCuyE++SCahDfwX5e/cC+/5K84y G6G6nlXCjdEtFhlBXi4z+qniEqcIbbWuVB/o9mhlLgDpALCw6C/Yq/UYX9JxgTSFa0+m tgT29swBwEOpi/JXssh+97w/oNe2AFT9t3nEWvPMcxqGG/C5c1C9tvKQrzPYsgE2oLnU Ii9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=saSXVdHLT+/WsWFtLRRRzbFbaXfBqDhQn3VnF5T9Gb8=; b=dgkxQFh7BTJ3HHxCJBwSROD8lHpRBlLJ62FGDkaB9ESHjyCPGbm3zexdZOyZty/KGn ucQcVGgPoY9Rns1VcnoZ99QSnvDiuaE4ANKh8WHkRghixn2WG6fu6NARh88DT0o4V8nY AKYic9xtdvo/0WfW/LLgIlwUExXFkAcmrjjN+PlhOduB4acIg9Sl/I8QGKB7pvgfAf8o wXJn02OSVOMwaAe8tL/o18bHzu7qovUi9aZyo4Ionv0Hefk+dQjwDgXA762TxyiMMkgJ TO66KVnkPal4OBHTpzGbfLtOULnF3ASvJxW3EtQGlAPg7az4BCX+0BerqajQ9+YazWHz z2iw== X-Gm-Message-State: AG10YOTG+PAbr/VjzSLNZdgTBHOIg2rb96kbRVdEwVhzpJ+UwFwVdY5Y/7lCBTdpop++pA== X-Received: by 10.66.62.162 with SMTP id z2mr32883437par.39.1455649213460; Tue, 16 Feb 2016 11:00:13 -0800 (PST) Received: from ashley.localdomain ([106.51.133.38]) by smtp.gmail.com with ESMTPSA id 27sm47469677pfh.48.2016.02.16.11.00.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Feb 2016 11:00:12 -0800 (PST) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.7.1 In-Reply-To: <1455649215-23260-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c | 79 ++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 8005e45..3895a8c 100644 --- 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 { + 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; @@ -66,6 +70,38 @@ static void remote_ref_atom_parser(struct used_atom *atom, const char *arg) 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")) @@ -145,9 +181,9 @@ static struct { { "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" }, @@ -160,11 +196,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; @@ -181,7 +212,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 */ @@ -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++) { - 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]; - 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, @@ -754,28 +780,23 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj &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); - 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.nlines); v->s = strbuf_detach(&s, NULL); - } + } else if (atom->u.contents.option == C_BARE) + v->s = xstrdup(subpos); } } -- 2.7.1