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 v5 03/11] ref-filter: add option to pad atoms to the right
Date: Mon, 27 Jul 2015 12:57:07 +0530 [thread overview]
Message-ID: <1437982035-6658-3-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1437982035-6658-1-git-send-email-Karthik.188@gmail.com>
Add a new atom "padright" and support %(padright:X) where X is a
number. This will align the succeeding atom value to the left
followed by spaces for a total length of X characters. If X is less
than the item size, the entire atom value is printed.
Add tests and documentation for the same.
Helped-by: Duy Nguyen <pclouds@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
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-for-each-ref.txt | 6 ++++++
ref-filter.c | 24 ++++++++++++++++++++++++
ref-filter.h | 4 +++-
t/t6302-for-each-ref-filter.sh | 16 ++++++++++++++++
4 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index e49d578..45dd7f8 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -127,6 +127,12 @@ color::
Change output color. Followed by `:<colorname>`, where names
are described in `color.branch.*`.
+padright::
+ Pad succeeding atom to the right. Followed by `:<value>`,
+ where `value` states the total length of atom including the
+ padding. If the `value` is greater than the atom length, then
+ no padding is performed.
+
In addition to the above, for commit and tag objects, the header
field names (`tree`, `parent`, `object`, `type`, and `tag`) can
be used to specify the value in the header field.
diff --git a/ref-filter.c b/ref-filter.c
index cc25c85..7ab34be 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -55,6 +55,7 @@ static struct {
{ "flag" },
{ "HEAD" },
{ "color" },
+ { "padright" },
};
/*
@@ -691,6 +692,18 @@ static void populate_value(struct ref_array_item *ref)
else
v->s = " ";
continue;
+ } else if (starts_with(name, "padright:")) {
+ const char *valp = NULL;
+
+ skip_prefix(name, "padright:", &valp);
+ if (!valp[0])
+ die(_("no value given with 'padright:'"));
+ if (strtoul_ui(valp, 10, (unsigned int *)&v->ul))
+ die(_("positive integer expected after ':' in padright:%u\n"),
+ (unsigned int)v->ul);
+ v->pseudo_atom = 1;
+ v->pad_to_right = 1;
+ continue;
} else
continue;
@@ -1202,6 +1215,15 @@ static void ref_formatting(struct ref_formatting_state *state,
free(state->color);
state->color = NULL;
}
+ if (state->pad_to_right) {
+ if (!is_utf8(v->s))
+ strbuf_addf(value, "%-*s", state->pad_to_right, v->s);
+ else {
+ int utf8_compensation = strlen(v->s) - utf8_strwidth(v->s);
+ strbuf_addf(value, "%-*s", state->pad_to_right + utf8_compensation, v->s);
+ }
+ return;
+ }
strbuf_addf(value, "%s", v->s);
}
@@ -1278,6 +1300,8 @@ static void apply_pseudo_state(struct ref_formatting_state *state,
{
if (v->color)
state->color = (char *)v->s;
+ if (v->pad_to_right)
+ state->pad_to_right = v->ul;
}
void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
diff --git a/ref-filter.h b/ref-filter.h
index 7687879..63b8175 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -20,12 +20,14 @@ struct atom_value {
const char *s;
unsigned long ul; /* used for sorting when not FIELD_STR */
unsigned int pseudo_atom : 1, /* atoms which aren't placeholders for ref attributes */
- color : 1;
+ color : 1,
+ pad_to_right : 1;
};
struct ref_formatting_state {
int quote_style;
char *color;
+ unsigned int pad_to_right;
};
struct ref_sorting {
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 505a360..daaa27a 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -81,4 +81,20 @@ test_expect_success 'filtering with --contains' '
test_cmp expect actual
'
+test_expect_success 'padding to the right using `padright`' '
+ cat >expect <<-\EOF &&
+ refs/heads/master |
+ refs/heads/side |
+ refs/odd/spot |
+ refs/tags/double-tag |
+ refs/tags/four |
+ refs/tags/one |
+ refs/tags/signed-tag |
+ refs/tags/three |
+ refs/tags/two |
+ EOF
+ git for-each-ref --format="%(padright:25)%(refname)|" >actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.4.6
next prev parent reply other threads:[~2015-07-27 7:27 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 7:26 [PATCH v5 00/11] port tag.c to use ref-filter APIs Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 01/11] ref-filter: introduce 'ref_formatting_state' Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 02/11] ref-filter: make `color` use `ref_formatting_state` Karthik Nayak
2015-07-27 12:47 ` Matthieu Moy
2015-07-27 14:28 ` Junio C Hamano
2015-07-27 17:23 ` Karthik Nayak
2015-07-27 16:02 ` Karthik Nayak
2015-07-27 13:06 ` Matthieu Moy
2015-07-27 17:16 ` Karthik Nayak
2015-07-27 7:27 ` Karthik Nayak [this message]
2015-07-27 12:50 ` [PATCH v5 03/11] ref-filter: add option to pad atoms to the right Matthieu Moy
2015-07-27 15:45 ` Junio C Hamano
2015-07-27 15:54 ` Matthieu Moy
2015-07-27 18:42 ` Karthik Nayak
2015-07-27 18:47 ` Matthieu Moy
2015-07-27 18:54 ` Karthik Nayak
2015-07-27 18:56 ` Junio C Hamano
2015-07-27 18:43 ` Karthik Nayak
2015-07-28 21:41 ` Eric Sunshine
2015-07-29 16:16 ` Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 04/11] ref-filter: add option to filter only tags Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 05/11] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 06/11] ref-filter: add support to sort by version Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 07/11] ref-filter: add option to match literal pattern Karthik Nayak
2015-07-27 12:54 ` Matthieu Moy
2015-07-27 15:57 ` Karthik Nayak
2015-07-27 15:59 ` Karthik Nayak
2015-07-27 16:06 ` Matthieu Moy
2015-07-27 16:48 ` Karthik Nayak
2015-07-28 21:49 ` Eric Sunshine
2015-07-29 16:17 ` Karthik Nayak
2015-07-30 11:21 ` Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 08/11] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 09/11] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 10/11] tag.c: implement '--format' option Karthik Nayak
2015-07-27 7:27 ` [PATCH v5 11/11] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-07-27 12:42 ` [PATCH v5 01/11] ref-filter: introduce 'ref_formatting_state' Matthieu Moy
2015-07-27 15:28 ` 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=1437982035-6658-3-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).