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 v17 13/14] tag.c: implement '--format' option
Date: Thu, 10 Sep 2015 21:52:48 +0530 [thread overview]
Message-ID: <1441902169-9891-2-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1441900110-4015-1-git-send-email-Karthik.188@gmail.com>
Implement the '--format' option provided by 'ref-filter'.
This lets the user list tags as per desired format similar
to the implementation in 'git for-each-ref'.
Add tests and documentation for the same.
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>
---
Documentation/git-tag.txt | 8 +++++++-
builtin/tag.c | 24 ++++++++++++++----------
t/t7004-tag.sh | 12 ++++++++++++
3 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 3ac4a96..0c7f4e6 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -13,7 +13,8 @@ SYNOPSIS
<tagname> [<commit> | <object>]
'git tag' -d <tagname>...
'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
- [--column[=<options>] | --no-column] [--create-reflog] [--sort=<key>] [<pattern>...]
+ [--column[=<options>] | --no-column] [--create-reflog] [--sort=<key>]
+ [--format=<format>] [<pattern>...]
'git tag' -v <tagname>...
DESCRIPTION
@@ -158,6 +159,11 @@ This option is only applicable when listing tags without annotation lines.
The object that the new tag will refer to, usually a commit.
Defaults to HEAD.
+<format>::
+ A string that interpolates `%(fieldname)` from the object
+ pointed at by a ref being shown. The format is the same as
+ that of linkgit:git-for-each-ref[1]. When unspecified,
+ defaults to `%(refname:short)`.
CONFIGURATION
-------------
diff --git a/builtin/tag.c b/builtin/tag.c
index f257d45..075d90b 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -23,17 +23,17 @@ static const char * const git_tag_usage[] = {
N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"),
N_("git tag -d <tagname>..."),
N_("git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]"
- "\n\t\t[<pattern>...]"),
+ "\n\t\t[--format=<format>] [<pattern>...]"),
N_("git tag -v <tagname>..."),
NULL
};
static unsigned int colopts;
-static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting)
+static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format)
{
struct ref_array array;
- char *format, *to_free = NULL;
+ char *to_free = NULL;
int i;
memset(&array, 0, sizeof(array));
@@ -41,12 +41,14 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting)
if (filter->lines == -1)
filter->lines = 0;
- if (filter->lines) {
- format = xstrfmt("%s %%(contents:lines=%d)",
- "%(align:15)%%(refname:short)%%(end)", filter->lines);
- to_free = format;
- } else
- format = "%(refname:short)";
+ if (!format) {
+ if (filter->lines) {
+ format = xstrfmt("%s %%(contents:lines=%d)",
+ "%(align:15)%%(refname:short)%%(end)", filter->lines);
+ to_free = format;
+ } else
+ format = "%(refname:short)";
+ }
verify_ref_format(format);
filter_refs(&array, filter, FILTER_REFS_TAGS);
@@ -330,6 +332,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
struct strbuf err = STRBUF_INIT;
struct ref_filter filter;
static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+ const char *format = NULL;
struct option options[] = {
OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
{ OPTION_INTEGER, 'n', NULL, &filter.lines, N_("n"),
@@ -362,6 +365,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
N_("print only tags of the object"), 0, parse_opt_object_name
},
+ OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")),
OPT_END()
};
@@ -402,7 +406,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
run_column_filter(colopts, &copts);
}
filter.name_patterns = argv;
- ret = list_tags(&filter, sorting);
+ ret = list_tags(&filter, sorting, format);
if (column_active(colopts))
stop_column_filter();
return ret;
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 84153ef..8987fb1 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1519,4 +1519,16 @@ EOF"
test_cmp expect actual
'
+test_expect_success '--format should list tags as per format given' '
+ cat >expect <<-\EOF &&
+ refname : refs/tags/foo1.10
+ refname : refs/tags/foo1.3
+ refname : refs/tags/foo1.6
+ refname : refs/tags/foo1.6-rc1
+ refname : refs/tags/foo1.6-rc2
+ EOF
+ git tag -l --format="refname : %(refname)" "foo*" >actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.5.1
next prev parent reply other threads:[~2015-09-10 16:22 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-10 15:48 [PATCH v17 00/14] port tag.c to use ref-filter APIs Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 01/14] ref-filter: move `struct atom_value` to ref-filter.c Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 02/14] ref-filter: introduce ref_formatting_state and ref_formatting_stack Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 03/14] utf8: add function to align a string into given strbuf Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 04/14] ref-filter: introduce handler function for each atom Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 05/14] ref-filter: introduce match_atom_name() Karthik Nayak
2015-09-10 16:49 ` Matthieu Moy
2015-09-10 17:23 ` Junio C Hamano
2015-09-10 18:58 ` Matthieu Moy
2015-09-10 16:56 ` Junio C Hamano
2015-09-10 16:59 ` Matthieu Moy
2015-09-10 18:25 ` Junio C Hamano
2015-09-10 17:00 ` Karthik Nayak
2015-09-10 17:28 ` Junio C Hamano
2015-09-10 17:35 ` Karthik Nayak
2015-09-10 17:45 ` Junio C Hamano
2015-09-10 17:49 ` Karthik Nayak
2015-09-11 14:59 ` Karthik Nayak
2015-09-11 15:01 ` [PATCH v17 06/14] ref-filter: implement an `align` atom Karthik Nayak
2015-09-10 15:48 ` Karthik Nayak
2015-09-10 16:53 ` Matthieu Moy
2015-09-10 16:59 ` Junio C Hamano
2015-09-11 15:03 ` Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 07/14] ref-filter: add option to filter out tags, branches and remotes Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 08/14] ref-filter: add support for %(contents:lines=X) Karthik Nayak
2015-09-10 17:14 ` Junio C Hamano
2015-09-10 17:37 ` Karthik Nayak
2015-09-11 15:04 ` Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 09/14] ref-filter: add support to sort by version Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 10/14] ref-filter: add option to match literal pattern Karthik Nayak
2015-09-10 15:48 ` [PATCH v17 11/14] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-09-10 16:22 ` [PATCH v17 12/14] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-09-11 15:06 ` Karthik Nayak
2015-09-10 16:22 ` Karthik Nayak [this message]
2015-09-10 17:59 ` [PATCH v17 13/14] tag.c: implement '--format' option Junio C Hamano
2015-09-10 18:04 ` Karthik Nayak
2015-09-11 15:06 ` Karthik Nayak
2015-09-10 16:22 ` [PATCH v17 14/14] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-09-17 21:36 ` John Keeping
2015-09-17 22:09 ` Junio C Hamano
2015-09-18 7:10 ` Matthieu Moy
2015-09-18 8:42 ` John Keeping
2015-09-18 9:13 ` Matthieu Moy
2015-09-18 15:10 ` Karthik Nayak
2015-09-18 15:19 ` Matthieu Moy
2015-09-18 15:22 ` Karthik Nayak
2015-09-18 15:30 ` Matthieu Moy
2015-09-18 15:38 ` Karthik Nayak
2015-09-18 15:44 ` Matthieu Moy
2015-09-10 16:57 ` [PATCH v17 00/14] port tag.c to use ref-filter APIs Matthieu Moy
2015-09-11 15:08 ` Karthik Nayak
2015-09-11 17:30 ` Eric Sunshine
2015-09-11 18:05 ` Junio C Hamano
2015-09-11 18:12 ` Karthik Nayak
2015-09-12 9:14 ` Matthieu Moy
2015-09-13 4:54 ` 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=1441902169-9891-2-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.
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).