git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 01/10] ref-filter: introduce 'ref_formatting_state'

From
Karthik Nayak <karthik.188@gmail.com>
Date
Jul 28, 2015, 06:33 UTC
Message-ID
<1438065211-3777-1-git-send-email-Karthik.188@gmail.com>
In-Reply-To
<CAOLa=ZR6_2NBB4v0Ynq391=8Jk2RZON6R0YG=HKUNwKx249b7Q@mail.gmail.com>

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@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 | 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
Previous: Karthik NayakNext: Karthik Nayak
Message 2 of 42 in “port tag.c to use ref-filter APIs”
  1. 0/10 port tag.c to use ref-filter APIsKarthik Nayak, Jul 28, 2015
  2. 01/10 ref-filter: introduce 'ref_formatting_state'Karthik Nayak, Jul 28, 2015
  3. 02/10 ref-filter: add option to pad atoms to the rightKarthik Nayak, Jul 28, 2015
  4. Eric SunshineJul 29, 2015
  5. Karthik NayakJul 30, 2015
  6. 03/10 ref-filter: add option to filter only tagsKarthik Nayak, Jul 28, 2015
  7. 04/10 ref-filter: support printing N lines from tag annotationKarthik Nayak, Jul 28, 2015
  8. 05/10 ref-filter: add support to sort by versionKarthik Nayak, Jul 28, 2015
  9. Eric SunshineJul 29, 2015
  10. Karthik NayakJul 30, 2015
  11. 06/10 ref-filter: add option to match literal patternKarthik Nayak, Jul 28, 2015
  12. 07/10 tag.c: use 'ref-filter' data structuresKarthik Nayak, Jul 28, 2015
  13. 08/10 tag.c: use 'ref-filter' APIsKarthik Nayak, Jul 28, 2015
  14. 09/10 tag.c: implement '--format' optionKarthik Nayak, Jul 28, 2015
  15. 10/10 tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jul 28, 2015
  16. Matthieu MoyJul 28, 2015
  17. Karthik NayakJul 29, 2015
  18. Matthieu MoyJul 29, 2015
  19. Karthik NayakJul 29, 2015
  20. Matthieu MoyJul 29, 2015
  21. 01/10 ref-filter: introduce 'ref_formatting_state'Eric Sunshine, Jul 29, 2015
  22. Junio C HamanoJul 29, 2015
  23. Junio C HamanoJul 29, 2015
  24. Karthik NayakJul 30, 2015
  25. Matthieu MoyJul 30, 2015
  26. Matthieu MoyJul 29, 2015
  27. Karthik NayakJul 30, 2015
  28. Eric SunshineJul 29, 2015
  29. Junio C HamanoJul 29, 2015
  30. Matthieu MoyJul 30, 2015
  31. Karthik NayakJul 30, 2015
  32. 01/11 ref-filter: introduce 'ref_formatting_state'Karthik Nayak, Jul 30, 2015
  33. 02/11 ref-filter: make `color` use `ref_formatting_state`Karthik Nayak, Jul 30, 2015
  34. 03/11 ref-filter: add option to pad atoms to the rightKarthik Nayak, Jul 30, 2015
  35. 04/11 ref-filter: add option to filter only tagsKarthik Nayak, Jul 30, 2015
  36. 05/11 ref-filter: support printing N lines from tag annotationKarthik Nayak, Jul 30, 2015
  37. 06/11 ref-filter: add support to sort by versionKarthik Nayak, Jul 30, 2015
  38. 07/11 ref-filter: add option to match literal patternKarthik Nayak, Jul 30, 2015
  39. 08/11 tag.c: use 'ref-filter' data structuresKarthik Nayak, Jul 30, 2015
  40. 09/11 tag.c: use 'ref-filter' APIsKarthik Nayak, Jul 30, 2015
  41. 10/11 tag.c: implement '--format' optionKarthik Nayak, Jul 30, 2015
  42. 11/11 tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jul 30, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.