Introduce a ref_formatting_state which will eventually hold the values
of modifier atoms. Implement this within ref-filter.
Mentored-by: Christian Couder <christian.couder@xxxxxxxxx>
Mentored-by: Matthieu Moy <matthieu.moy@xxxxxxxxxxxxxxx>
Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx>
---
ref-filter.c | 49 +++++++++++++++++++++++++++++++++++++------------
ref-filter.h | 4 ++++
2 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index febdc45..c4c7064 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1190,9 +1190,10 @@ void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);
}
-static void print_value(struct atom_value *v, int quote_style, struct strbuf *output)
+static void print_value(struct atom_value *v, struct ref_formatting_state *state,
+ struct strbuf *output)
{
- switch (quote_style) {
+ switch (state->quote_style) {
case QUOTE_NONE:
strbuf_addstr(output, v->s);
break;
@@ -1249,24 +1250,47 @@ static void emit(const char *cp, const char *ep, struct strbuf *output)
}
}
+static void process_formatting_state(struct atom_value *atomv, struct ref_formatting_state *state)
+{
+ /* Based on the atomv values, the formatting state is set */
+}
+
+static void apply_formatting_state(struct ref_formatting_state *state, struct strbuf *value,
+ struct strbuf *format)
+{
+ /* More formatting options to be evetually added */
+ strbuf_addbuf(format, value);
+ strbuf_release(value);
+}
+
void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
{
const char *cp, *sp, *ep;
- struct strbuf output = STRBUF_INIT;
+ struct strbuf value = STRBUF_INIT;
+ struct strbuf final_buf = STRBUF_INIT;
+ struct ref_formatting_state state;
int i;
+ memset(&state, 0, sizeof(state));
+ state.quote_style = quote_style;
+
for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {
- struct atom_value *atomv;
+ struct atom_value *atomv = NULL;
ep = strchr(sp, ')');
- if (cp < sp)
- emit(cp, sp, &output);
+ if (cp < sp) {
+ emit(cp, sp, &value);
+ apply_formatting_state(&state, &value, &final_buf);
+ }
get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);
- print_value(atomv, quote_style, &output);
+ process_formatting_state(atomv, &state);
+ print_value(atomv, &state, &value);
+ apply_formatting_state(&state, &value, &final_buf);
}
if (*cp) {
sp = cp + strlen(cp);
- emit(cp, sp, &output);
+ emit(cp, sp, &value);
+ apply_formatting_state(&state, &value, &final_buf);
}
if (need_color_reset_at_eol) {
struct atom_value resetv;
@@ -1275,12 +1299,13 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu
if (color_parse("reset", color) < 0)
die("BUG: couldn't parse 'reset' as a color");
resetv.s = color;
- print_value(&resetv, quote_style, &output);
+ print_value(&resetv, &state, &value);
+ apply_formatting_state(&state, &value, &final_buf);
}
- for (i = 0; i < output.len; i++)
- printf("%c", output.buf[i]);
+ for (i = 0; i < final_buf.len; i++)
+ printf("%c", final_buf.buf[i]);
putchar('\n');
- strbuf_release(&output);
+ strbuf_release(&final_buf);
}
/* If no sorting option is given, use refname to sort as default */
diff --git a/ref-filter.h b/ref-filter.h
index 6bf27d8..b64677f 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -16,6 +16,10 @@
#define FILTER_REFS_INCLUDE_BROKEN 0x1
#define FILTER_REFS_ALL 0x2
+struct ref_formatting_state {
+ int quote_style;
+};
+
struct atom_value {
const char *s;
unsigned long ul; /* used for sorting when not FIELD_STR */
--
2.4.6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html