Introduce 'ref_formatting' structure to hold values of pseudo atoms
which help only in formatting. This will eventually be used by atoms
like `color` and the `padright` atom which will be introduced in a
later patch.
Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
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 | 71 +++++++++++++++++++++++++++++++++++++++++++++++-------------
ref-filter.h | 5 +++++
2 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 7561727..a919a14 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -10,6 +10,8 @@
#include "quote.h"
#include "ref-filter.h"
#include "revision.h"
+#include "utf8.h"
+#include "git-compat-util.h"
typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
@@ -620,7 +622,7 @@ static void populate_value(struct ref_array_item *ref)
const char *name = used_atom[i];
struct atom_value *v = &ref->value[i];
int deref = 0;
- const char *refname;
+ const char *refname = NULL;
const char *formatp;
struct branch *branch = NULL;
@@ -1190,30 +1192,47 @@ 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)
+static void apply_formatting_state(struct ref_formatting_state *state,
+ struct atom_value *v, struct strbuf *value)
{
- struct strbuf sb = STRBUF_INIT;
- switch (quote_style) {
+ /* Eventually we'll formatt based on the ref_formatting_state */
+ strbuf_addstr(value, v->s);
+}
+
+static void print_value(struct atom_value *v, struct ref_formatting_state *state)
+{
+ struct strbuf value = STRBUF_INIT;
+ struct strbuf formatted = STRBUF_INIT;
+
+ /*
+ * Some (pesudo) atoms have no immediate side effect, but only
+ * affect the next atom. Store the relevant information from
+ * these atoms in the 'state' variable for use when displaying
+ * the next atom.
+ */
+ apply_formatting_state(state, v, &value);
+
+ switch (state->quote_style) {
case QUOTE_NONE:
- fputs(v->s, stdout);
+ fputs(value.buf, stdout);
break;
case QUOTE_SHELL:
- sq_quote_buf(&sb, v->s);
+ sq_quote_buf(&formatted, value.buf);
break;
case QUOTE_PERL:
- perl_quote_buf(&sb, v->s);
+ perl_quote_buf(&formatted, value.buf);
break;
case QUOTE_PYTHON:
- python_quote_buf(&sb, v->s);
+ python_quote_buf(&formatted, value.buf);
break;
case QUOTE_TCL:
- tcl_quote_buf(&sb, v->s);
+ tcl_quote_buf(&formatted, value.buf);
break;
}
- if (quote_style != QUOTE_NONE) {
- fputs(sb.buf, stdout);
- strbuf_release(&sb);
- }
+ if (state->quote_style != QUOTE_NONE)
+ fputs(formatted.buf, stdout);
+ strbuf_release(&value);
+ strbuf_release(&formatted);
}
static int hex1(char ch)
@@ -1254,9 +1273,26 @@ 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 */
+}
+
+static void reset_formatting_state(struct ref_formatting_state *state)
+{
+ int quote_style = state->quote_style;
+ memset(state, 0, sizeof(*state));
+ state->quote_style = quote_style;
+}
+
void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
{
const char *cp, *sp, *ep;
+ struct ref_formatting_state state;
+
+ 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;
@@ -1265,7 +1301,12 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu
if (cp < sp)
emit(cp, sp);
get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);
- print_value(atomv, quote_style);
+ if (atomv->modifier_atom)
+ store_formatting_state(&state, atomv);
+ else {
+ print_value(atomv, &state);
+ reset_formatting_state(&state);
+ }
}
if (*cp) {
sp = cp + strlen(cp);
@@ -1278,7 +1319,7 @@ 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);
+ print_value(&resetv, &state);
}
putchar('\n');
}
diff --git a/ref-filter.h b/ref-filter.h
index 6bf27d8..12e6a6b 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -19,6 +19,11 @@
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 */
+};
+
+struct ref_formatting_state {
+ int quote_style;
};
struct ref_sorting {
--
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