diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2017-01-10 08:49:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 20:44:31 (GMT) |
| commit | b180e6fe19ee4cf701d3a3478025dd7125fb0749 (patch) | |
| tree | 63302719f3b458b269f74fe7c55a0b9373a33b80 /ref-filter.c | |
| parent | 01f95825d55b2ca36ee9bc131a5f6899f47621c6 (diff) | |
| download | git-b180e6fe19ee4cf701d3a3478025dd7125fb0749.zip git-b180e6fe19ee4cf701d3a3478025dd7125fb0749.tar.gz git-b180e6fe19ee4cf701d3a3478025dd7125fb0749.tar.bz2 | |
ref-filter: introduce refname_atom_parser_internal()
Since there are multiple atoms which print refs ('%(refname)',
'%(symref)', '%(push)', '%(upstream)'), it makes sense to have a common
ground for parsing them. This would allow us to share implementations of
the atom modifiers between these atoms.
Introduce refname_atom_parser_internal() to act as a common parsing
function for ref printing atoms. This would eventually be used to
introduce refname_atom_parser() and symref_atom_parser() and also be
internally used in remote_ref_atom_parser().
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/ref-filter.c b/ref-filter.c index 26116b8..7ff284c 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -32,6 +32,11 @@ struct if_then_else { condition_satisfied : 1; }; +struct refname_atom { + enum { R_NORMAL, R_SHORT, R_STRIP } option; + unsigned int strip; +}; + /* * An atom is a valid field atom listed below, possibly prefixed with * a "*" to denote deref_tag(). @@ -64,6 +69,7 @@ static struct used_atom { enum { O_FULL, O_LENGTH, O_SHORT } option; unsigned int length; } objectname; + struct refname_atom refname; } u; } *used_atom; static int used_atom_cnt, need_tagged, need_symref; @@ -77,6 +83,21 @@ static void color_atom_parser(struct used_atom *atom, const char *color_value) die(_("unrecognized color: %%(color:%s)"), color_value); } +static void refname_atom_parser_internal(struct refname_atom *atom, + const char *arg, const char *name) +{ + if (!arg) + atom->option = R_NORMAL; + else if (!strcmp(arg, "short")) + atom->option = R_SHORT; + else if (skip_prefix(arg, "strip=", &arg)) { + atom->option = R_STRIP; + if (strtoul_ui(arg, 10, &atom->strip) || atom->strip <= 0) + die(_("positive value expected refname:strip=%s"), arg); + } else + die(_("unrecognized %%(%s) argument: %s"), name, arg); +} + static void remote_ref_atom_parser(struct used_atom *atom, const char *arg) { struct string_list params = STRING_LIST_INIT_DUP; |