git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
	gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v7 02/11] ref-filter: make `color` use `ref_formatting_state`
Date: Thu, 30 Jul 2015 21:05:43 +0530	[thread overview]
Message-ID: <1438270552-10333-2-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1438270552-10333-1-git-send-email-Karthik.188@gmail.com>

Convert the 'color' atom to behave as a modifier atom and make it use
'ref_formatting_state' which was introduced in the previous patch.

Helped-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 ref-filter.c | 10 ++++++++--
 ref-filter.h |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index d6510a6..9a63d25 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -662,6 +662,8 @@ static void populate_value(struct ref_array_item *ref)
 			if (color_parse(name + 6, color) < 0)
 				die(_("unable to parse format"));
 			v->s = xstrdup(color);
+			v->color = 1;
+			v->modifier_atom = 1;
 			continue;
 		} else if (!strcmp(name, "flag")) {
 			char buf[256], *cp = buf;
@@ -1195,7 +1197,10 @@ void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
 static void apply_formatting_state(struct ref_formatting_state *state,
 				   const char *buf, struct strbuf *value)
 {
-	/* Eventually we'll format based on the ref_formatting_state */
+	if (state->color) {
+		strbuf_addstr(value, state->color);
+		state->color = NULL;
+	}
 	strbuf_addstr(value, buf);
 }
 
@@ -1278,7 +1283,8 @@ static void emit(const char *cp, const char *ep,
 static void store_formatting_state(struct ref_formatting_state *state,
 				   struct atom_value *atomv)
 {
-	/*  Here the 'ref_formatting_state' variable will be filled */
+	if (atomv->color)
+		state->color = atomv->s;
 }
 
 void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
diff --git a/ref-filter.h b/ref-filter.h
index 12e6a6b..5d33360 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -19,11 +19,13 @@
 struct atom_value {
 	const char *s;
 	unsigned long ul; /* used for sorting when not FIELD_STR */
-	unsigned int modifier_atom : 1; /*  atoms which act as modifiers for the next atom */
+	unsigned int modifier_atom : 1, /*  atoms which act as modifiers for the next atom */
+		color : 1;
 };
 
 struct ref_formatting_state {
 	int quote_style;
+	const char *color;
 };
 
 struct ref_sorting {
-- 
2.4.6

  reply	other threads:[~2015-07-30 15:36 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-28  6:32 [PATCH v6 0/10] port tag.c to use ref-filter APIs Karthik Nayak
2015-07-28  6:33 ` [PATCH v6 01/10] ref-filter: introduce 'ref_formatting_state' Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 02/10] ref-filter: add option to pad atoms to the right Karthik Nayak
2015-07-29 19:29     ` Eric Sunshine
2015-07-30 10:18       ` Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 03/10] ref-filter: add option to filter only tags Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 04/10] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 05/10] ref-filter: add support to sort by version Karthik Nayak
2015-07-29 19:34     ` Eric Sunshine
2015-07-30 10:23       ` Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 06/10] ref-filter: add option to match literal pattern Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 07/10] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 08/10] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 09/10] tag.c: implement '--format' option Karthik Nayak
2015-07-28  6:33   ` [PATCH v6 10/10] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-07-28  7:26   ` [PATCH v6 01/10] ref-filter: introduce 'ref_formatting_state' Matthieu Moy
2015-07-29 15:56     ` Karthik Nayak
2015-07-29 16:04       ` Matthieu Moy
2015-07-29 16:10         ` Karthik Nayak
2015-07-29 16:35           ` Matthieu Moy
2015-07-29 19:19   ` Eric Sunshine
2015-07-29 19:50     ` Junio C Hamano
2015-07-29 19:54     ` Junio C Hamano
2015-07-30  9:18       ` Karthik Nayak
2015-07-30  9:25       ` Matthieu Moy
2015-07-29 21:34     ` Matthieu Moy
2015-07-30  6:53     ` Karthik Nayak
2015-07-29 19:27 ` [PATCH v6 0/10] port tag.c to use ref-filter APIs Eric Sunshine
2015-07-29 20:29   ` Junio C Hamano
2015-07-30  9:44     ` Matthieu Moy
2015-07-30 10:13       ` Karthik Nayak
2015-07-30 15:35 ` [PATCH v7 01/11] ref-filter: introduce 'ref_formatting_state' Karthik Nayak
2015-07-30 15:35   ` Karthik Nayak [this message]
2015-07-30 15:35   ` [PATCH v7 03/11] ref-filter: add option to pad atoms to the right Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 04/11] ref-filter: add option to filter only tags Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 05/11] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 06/11] ref-filter: add support to sort by version Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 07/11] ref-filter: add option to match literal pattern Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 08/11] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 09/11] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 10/11] tag.c: implement '--format' option Karthik Nayak
2015-07-30 15:35   ` [PATCH v7 11/11] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
  -- strict thread matches above, loose matches on Subject: below --
2015-07-30 15:34 [PATCH v7 0/11] port tag.c to use ref-filter APIs Karthik Nayak
2015-07-30 15:48 ` [PATCH v7 01/11] ref-filter: introduce 'ref_formatting_state' Karthik Nayak
2015-07-30 15:48   ` [PATCH v7 02/11] ref-filter: make `color` use `ref_formatting_state` Karthik Nayak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438270552-10333-2-git-send-email-Karthik.188@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).