From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v7 06/17] ref-filter: introduce format_ref_array_item()
Date: Wed, 9 Nov 2016 01:42:00 +0530 [thread overview]
Message-ID: <20161108201211.25213-7-Karthik.188@gmail.com> (raw)
In-Reply-To: <20161108201211.25213-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 40bdf97..b8b8a95 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1795,10 +1795,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;
@@ -1828,9 +1828,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 4aea594..0014b92 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -98,6 +98,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.10.2
next prev parent reply other threads:[~2016-11-08 20:12 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 20:11 [PATCH v7 00/17] port branch.c to use ref-filter's printing options Karthik Nayak
2016-11-08 20:11 ` [PATCH v7 01/17] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-11-08 23:13 ` Jacob Keller
2016-11-10 17:11 ` Karthik Nayak
2016-11-10 23:20 ` Junio C Hamano
2016-11-11 9:13 ` Karthik Nayak
2016-11-10 23:13 ` Junio C Hamano
2016-11-11 9:10 ` Karthik Nayak
2016-11-08 20:11 ` [PATCH v7 02/17] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-11-08 23:16 ` Jacob Keller
2016-11-10 17:16 ` Karthik Nayak
2016-11-08 20:11 ` [PATCH v7 03/17] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-11-08 23:22 ` Jacob Keller
2016-11-10 17:31 ` Karthik Nayak
2016-11-11 5:27 ` Jacob Keller
2016-11-10 23:26 ` Junio C Hamano
2016-11-11 5:25 ` Jacob Keller
2016-11-12 9:19 ` Karthik Nayak
2016-11-18 19:58 ` Jakub Narębski
2016-11-20 7:23 ` Karthik Nayak
2016-11-08 20:11 ` [PATCH v7 04/17] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-11-08 23:27 ` Jacob Keller
2016-11-10 17:36 ` Karthik Nayak
2016-11-11 5:29 ` Jacob Keller
2016-11-12 9:56 ` Karthik Nayak
2016-11-10 23:32 ` Junio C Hamano
2016-11-08 20:11 ` [PATCH v7 05/17] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-11-08 23:31 ` Jacob Keller
2016-11-10 19:01 ` Karthik Nayak
2016-11-08 20:12 ` Karthik Nayak [this message]
2016-11-08 23:32 ` [PATCH v7 06/17] ref-filter: introduce format_ref_array_item() Jacob Keller
2016-11-08 20:12 ` [PATCH v7 07/17] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-11-08 23:37 ` Jacob Keller
2016-11-12 18:48 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 08/17] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-11-08 23:45 ` Jacob Keller
2016-11-12 20:01 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 09/17] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-11-08 23:46 ` Jacob Keller
2016-11-18 21:34 ` Jakub Narębski
2016-11-20 7:31 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 10/17] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2016-11-18 21:36 ` Jakub Narębski
2016-11-20 7:34 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 11/17] ref-filter: introduce symref_atom_parser() and refname_atom_parser() Karthik Nayak
2016-11-08 23:52 ` Jacob Keller
2016-11-12 20:12 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 12/17] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2016-11-08 23:54 ` Jacob Keller
2016-11-08 20:12 ` [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms Karthik Nayak
2016-11-08 23:58 ` Jacob Keller
2016-11-13 14:07 ` Karthik Nayak
2016-11-14 1:55 ` Junio C Hamano
2016-11-14 19:36 ` Karthik Nayak
2016-11-14 19:51 ` Junio C Hamano
2016-11-15 6:48 ` Karthik Nayak
2016-11-15 7:55 ` Jacob Keller
2016-11-15 7:56 ` Jacob Keller
2016-11-15 17:42 ` Junio C Hamano
2016-11-15 21:19 ` Jacob Keller
2016-11-16 7:58 ` Karthik Nayak
2016-11-17 18:35 ` Junio C Hamano
2016-11-18 7:33 ` Karthik Nayak
2016-11-18 8:19 ` Jacob Keller
2016-11-18 18:18 ` Junio C Hamano
2016-11-18 21:49 ` Jakub Narębski
2016-11-20 15:16 ` Karthik Nayak
2016-11-20 16:52 ` Karthik Nayak
2016-11-20 17:32 ` Junio C Hamano
2016-11-20 18:43 ` Jakub Narębski
2016-11-22 18:34 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 14/17] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-11-09 0:00 ` Jacob Keller
2016-11-18 22:46 ` Jakub Narębski
2016-11-20 15:33 ` Karthik Nayak
2016-11-21 8:41 ` Matthieu Moy
2016-11-22 18:33 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 15/17] branch, tag: use porcelain output Karthik Nayak
2016-11-09 0:01 ` Jacob Keller
2016-11-08 20:12 ` [PATCH v7 16/17] branch: use ref-filter printing APIs Karthik Nayak
2016-11-09 0:14 ` Jacob Keller
2016-11-14 19:23 ` Karthik Nayak
2016-11-15 1:36 ` Jacob Keller
2016-11-17 19:50 ` Junio C Hamano
2016-11-17 22:05 ` Junio C Hamano
2016-11-22 18:31 ` Karthik Nayak
2016-11-08 20:12 ` [PATCH v7 17/17] branch: implement '--format' option Karthik Nayak
2016-11-09 0:15 ` [PATCH v7 00/17] port branch.c to use ref-filter's printing options Jacob Keller
2016-11-14 19:24 ` Karthik Nayak
2016-11-15 20:43 ` Junio C Hamano
2016-11-15 20:57 ` Re* " Junio C Hamano
2016-11-16 15:31 ` Karthik Nayak
2016-11-18 23:31 ` Junio C Hamano
2016-11-20 7:08 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161108201211.25213-7-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).