From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v10 03/13] ref-filter: introduce ref_formatting_state
Date: Sun, 9 Aug 2015 19:41:36 +0530 [thread overview]
Message-ID: <1439129506-9989-4-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1439129506-9989-1-git-send-email-Karthik.188@gmail.com>
Introduce a ref_formatting_state which will eventually hold the values
of modifier atoms. Implement this within ref-filter.
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 | 65 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 18 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 95f027b..e2df209 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1195,23 +1195,29 @@ 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 format_quote_value(struct atom_value *v, int quote_style, struct strbuf *output)
+
+struct ref_formatting_state {
+ struct strbuf output;
+ int quote_style;
+};
+
+static void format_quote_value(struct atom_value *v, struct ref_formatting_state *state)
{
- switch (quote_style) {
+ switch (state->quote_style) {
case QUOTE_NONE:
- strbuf_addstr(output, v->s);
+ strbuf_addstr(&state->output, v->s);
break;
case QUOTE_SHELL:
- sq_quote_buf(output, v->s);
+ sq_quote_buf(&state->output, v->s);
break;
case QUOTE_PERL:
- perl_quote_buf(output, v->s);
+ perl_quote_buf(&state->output, v->s);
break;
case QUOTE_PYTHON:
- python_quote_buf(output, v->s);
+ python_quote_buf(&state->output, v->s);
break;
case QUOTE_TCL:
- tcl_quote_buf(output, v->s);
+ tcl_quote_buf(&state->output, v->s);
break;
}
}
@@ -1234,7 +1240,7 @@ static int hex2(const char *cp)
return -1;
}
-static void append_non_atom(const char *cp, const char *ep, struct strbuf *output)
+static void append_non_atom(const char *cp, const char *ep, struct ref_formatting_state *state)
{
while (*cp && (!ep || cp < ep)) {
if (*cp == '%') {
@@ -1243,34 +1249,55 @@ static void append_non_atom(const char *cp, const char *ep, struct strbuf *outpu
else {
int ch = hex2(cp + 1);
if (0 <= ch) {
- strbuf_addch(output, ch);
+ strbuf_addch(&state->output, ch);
cp += 3;
continue;
}
}
}
- strbuf_addch(output, *cp);
+ strbuf_addch(&state->output, *cp);
cp++;
}
}
+static void set_formatting_state(struct atom_value *atomv, struct ref_formatting_state *state)
+{
+ /* Based on the atomv values, the formatting state is set */
+}
+
+static void perform_state_formatting(struct ref_formatting_state *state, struct strbuf *final)
+{
+ /* More formatting options to be eventually added */
+ strbuf_addbuf(final, &state->output);
+ strbuf_reset(&state->output);
+}
+
void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
{
const char *cp, *sp, *ep;
- struct strbuf output = STRBUF_INIT;
+ struct strbuf final_buf = STRBUF_INIT;
+ struct ref_formatting_state state;
+
+ state.quote_style = quote_style;
+ strbuf_init(&state.output, 0);
for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {
struct atom_value *atomv;
ep = strchr(sp, ')');
- if (cp < sp)
- append_non_atom(cp, sp, &output);
+ if (cp < sp) {
+ append_non_atom(cp, sp, &state);
+ perform_state_formatting(&state, &final_buf);
+ }
get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);
- format_quote_value(atomv, quote_style, &output);
+ set_formatting_state(atomv, &state);
+ format_quote_value(atomv, &state);
+ perform_state_formatting(&state, &final_buf);
}
if (*cp) {
sp = cp + strlen(cp);
- append_non_atom(cp, sp, &output);
+ append_non_atom(cp, sp, &state);
+ perform_state_formatting(&state, &final_buf);
}
if (need_color_reset_at_eol) {
struct atom_value resetv;
@@ -1279,11 +1306,13 @@ 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;
- format_quote_value(&resetv, quote_style, &output);
+ format_quote_value(&resetv, &state);
+ perform_state_formatting(&state, &final_buf);
}
- fwrite(output.buf, 1, output.len, stdout);
+ fwrite(final_buf.buf, 1, final_buf.len, stdout);
putchar('\n');
- strbuf_release(&output);
+ strbuf_release(&final_buf);
+ strbuf_release(&state.output);
}
/* If no sorting option is given, use refname to sort as default */
--
2.5.0
next prev parent reply other threads:[~2015-08-09 14:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-09 14:11 [PATCH v10 00/13] port tag.c to use ref-filter APIs Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 01/13] ref-filter: move `struct atom_value` to ref-filter.c Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 02/13] ref-filter: print output to strbuf for formatting Karthik Nayak
2015-08-11 17:56 ` Junio C Hamano
2015-08-12 13:22 ` Karthik Nayak
2015-08-12 16:29 ` Junio C Hamano
2015-08-12 16:56 ` Karthik Nayak
2015-08-11 18:00 ` Junio C Hamano
2015-08-12 13:22 ` Karthik Nayak
2015-08-09 14:11 ` Karthik Nayak [this message]
2015-08-11 18:13 ` [PATCH v10 03/13] ref-filter: introduce ref_formatting_state Junio C Hamano
2015-08-12 13:26 ` Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 04/13] utf8: add function to align a string into given strbuf Karthik Nayak
2015-08-11 18:22 ` Junio C Hamano
2015-08-12 13:41 ` Karthik Nayak
2015-08-12 16:40 ` Junio C Hamano
2015-08-12 17:10 ` Karthik Nayak
2015-08-13 19:08 ` Eric Sunshine
2015-08-13 20:55 ` Karthik Nayak
2015-08-14 16:06 ` Junio C Hamano
2015-08-15 8:27 ` Duy Nguyen
2015-08-09 14:11 ` [PATCH v10 05/13] ref-filter: implement an `align` atom Karthik Nayak
2015-08-11 18:52 ` Junio C Hamano
2015-08-12 16:24 ` Karthik Nayak
2015-08-12 17:13 ` Junio C Hamano
2015-08-12 20:07 ` Karthik Nayak
2015-08-12 20:24 ` Junio C Hamano
2015-08-14 15:46 ` Karthik Nayak
2015-08-14 17:42 ` Junio C Hamano
2015-08-13 18:26 ` Eric Sunshine
2015-08-13 20:29 ` Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 06/13] ref-filter: add option to filter only tags Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 07/13] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 08/13] ref-filter: add support to sort by version Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 09/13] ref-filter: add option to match literal pattern Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 10/13] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-08-09 14:17 ` Karthik Nayak
2015-08-09 14:32 ` [PATCH v10 11/13] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-08-09 14:32 ` [PATCH v10 12/13] tag.c: implement '--format' option Karthik Nayak
2015-08-09 14:32 ` [PATCH v10 13/13] tag.c: implement '--merged' and '--no-merged' options 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=1439129506-9989-4-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).