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 <gits...@pobox.com>
Mentored-by: Christian Couder <christian.cou...@gmail.com>
Mentored-by: Matthieu Moy <matthieu....@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik....@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
--
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
