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

[PATCH v5 01/11] ref-filter: introduce 'ref_formatting_state'

From
Karthik Nayak <karthik.188@gmail.com>
Date
Jul 27, 2015, 07:27 UTC
Message-ID
<1437982035-6658-1-git-send-email-Karthik.188@gmail.com>
In-Reply-To
<CAOLa=ZTtAepdO5U8zo62VBn_z4-LcKoguPxVGaAnNZULEwzrQQ@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 | 46 +++++++++++++++++++++++++++++++---------------
 ref-filter.h |  5 +++++
 2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 7561727..a3625e8 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,40 @@ 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 ref_formatting(struct ref_formatting_state *state,
+			   struct atom_value *v, struct strbuf *value)
 {
-	struct strbuf sb = STRBUF_INIT;
-	switch (quote_style) {
+	strbuf_addf(value, "%s", v->s);
+}
+
+static void print_value(struct ref_formatting_state *state, struct atom_value *v)
+{
+	struct strbuf value = STRBUF_INIT;
+	struct strbuf formatted = STRBUF_INIT;
+
+	ref_formatting(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(&formatted);
+	strbuf_release(&value);
 }
 
 static int hex1(char ch)
@@ -1257,6 +1269,10 @@ static void emit(const char *cp, const char *ep)
 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 +1281,7 @@ 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);
+		print_value(&state, atomv);
 	}
 	if (*cp) {
 		sp = cp + strlen(cp);
@@ -1278,7 +1294,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(&state, &resetv);
 	}
 	putchar('\n');
 }
diff --git a/ref-filter.h b/ref-filter.h
index 6bf27d8..f24e3ef 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 pseudo_atom : 1; /*  atoms which aren't placeholders for ref attributes */
+};
+
+struct ref_formatting_state {
+	int quote_style;
 };
 
 struct ref_sorting {

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