git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, gitster@pobox.com,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v10 06/20] ref-filter: introduce format_ref_array_item()
Date: Tue, 10 Jan 2017 14:19:39 +0530	[thread overview]
Message-ID: <20170110084953.15890-7-Karthik.188@gmail.com> (raw)
In-Reply-To: <20170110084953.15890-1-Karthik.188@gmail.com>

From: Karthik Nayak <karthik.188@gmail.com>

To allow column display, we will need to first render the output in a
string list to allow print_columns() to compute the proper size of
each column before starting the actual output. Introduce the function
format_ref_array_item() that does the formatting of a ref_array_item
to an strbuf.

show_ref_array_item() is kept as a convenience wrapper around it which
obtains the strbuf and prints it the standard output.

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 | 16 ++++++++++++----
 ref-filter.h |  3 +++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index 5511a200c..47b521cca 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1833,10 +1833,10 @@ static void append_literal(const char *cp, const char *ep, struct ref_formatting
 	}
 }
 
-void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
+void format_ref_array_item(struct ref_array_item *info, const char *format,
+			   int quote_style, struct strbuf *final_buf)
 {
 	const char *cp, *sp, *ep;
-	struct strbuf *final_buf;
 	struct ref_formatting_state state = REF_FORMATTING_STATE_INIT;
 
 	state.quote_style = quote_style;
@@ -1866,9 +1866,17 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu
 	}
 	if (state.stack->prev)
 		die(_("format: %%(end) atom missing"));
-	final_buf = &state.stack->output;
-	fwrite(final_buf->buf, 1, final_buf->len, stdout);
+	strbuf_addbuf(final_buf, &state.stack->output);
 	pop_stack_element(&state.stack);
+}
+
+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
+{
+	struct strbuf final_buf = STRBUF_INIT;
+
+	format_ref_array_item(info, format, quote_style, &final_buf);
+	fwrite(final_buf.buf, 1, final_buf.len, stdout);
+	strbuf_release(&final_buf);
 	putchar('\n');
 }
 
diff --git a/ref-filter.h b/ref-filter.h
index f78323de0..630e7c2b9 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -100,6 +100,9 @@ int parse_ref_filter_atom(const char *atom, const char *ep);
 int verify_ref_format(const char *format);
 /*  Sort the given ref_array as per the ref_sorting provided */
 void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
+/*  Based on the given format and quote_style, fill the strbuf */
+void format_ref_array_item(struct ref_array_item *info, const char *format,
+			   int quote_style, struct strbuf *final_buf);
 /*  Print the ref using the given format and quote_style */
 void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style);
 /*  Callback function for parsing the sort option */
-- 
2.11.0


  parent reply	other threads:[~2017-01-10  8:49 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-10  8:49 [PATCH v10 00/20] port branch.c to use ref-filter's printing options Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 01/20] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 02/20] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 03/20] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2017-01-10 20:45   ` Junio C Hamano
2017-01-14 10:02     ` Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 04/20] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 05/20] ref-filter: move get_head_description() from branch.c Karthik Nayak
2017-01-10  8:49 ` Karthik Nayak [this message]
2017-01-10  8:49 ` [PATCH v10 07/20] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 08/20] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 09/20] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 10/20] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 11/20] ref-filter: introduce refname_atom_parser() Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 12/20] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 13/20] ref-filter: rename the 'strip' option to 'lstrip' Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 14/20] ref-filter: Do not abruptly die when using the 'lstrip=<N>' option Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 15/20] ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>' Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 16/20] ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 17/20] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 18/20] branch, tag: use porcelain output Karthik Nayak
2017-01-10  8:49 ` [PATCH v10 19/20] branch: use ref-filter printing APIs Karthik Nayak
2017-01-11 23:47   ` Jacob Keller
2017-01-14 10:01     ` Karthik Nayak
2017-01-15  5:51       ` Jacob Keller
2017-01-10  8:49 ` [PATCH v10 20/20] branch: implement '--format' option Karthik Nayak
2017-01-10 20:51 ` [PATCH v10 00/20] port branch.c to use ref-filter's printing options Junio C Hamano
2017-01-14 10:03   ` Karthik Nayak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170110084953.15890-7-Karthik.188@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).