[PATCH v7 03/11] ref-filter: add option to pad atoms to the right

From

Karthik Nayak <karthik.188@gmail.com>

Date

Jul 30, 2015, 15:48 UTC

Message-ID

<1438271332-10615-3-git-send-email-Karthik.188@gmail.com>

In-Reply-To

<1438271332-10615-1-git-send-email-Karthik.188@gmail.com>

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                       | 26 ++++++++++++++++++++++++++
 ref-filter.h                       |  4 +++-
 t/t6302-for-each-ref-filter.sh     | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index e49d578..9961921 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 or string to the right. Followed by
+	`:<value>`, where `value` states the total length of atom or
+	string including the padding. If the `value` is lesser than
+	the atom or string 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 9a63d25..e2890e3 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->modifier_atom = 1;
+			v->pad_to_right = 1;
+			continue;
 		} else
 			continue;
 
@@ -1201,6 +1214,17 @@ static void apply_formatting_state(struct ref_formatting_state *state,
 		strbuf_addstr(value, state->color);
 		state->color = NULL;
 	}
+	if (state->pad_to_right) {
+		if (!is_utf8(buf))
+			strbuf_addf(value, "%-*s", state->pad_to_right, buf);
+		else {
+			int utf8_compensation = strlen(buf) - utf8_strwidth(buf);
+			strbuf_addf(value, "%-*s", state->pad_to_right + utf8_compensation, buf);
+		}
+		state->pad_to_right = 0;
+		return;
+	}
+
 	strbuf_addstr(value, buf);
 }
 
@@ -1285,6 +1309,8 @@ static void store_formatting_state(struct ref_formatting_state *state,
 {
 	if (atomv->color)
 		state->color = atomv->s;
+	if (atomv->pad_to_right)
+		state->pad_to_right = atomv->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 5d33360..e548c93 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -20,11 +20,13 @@ struct atom_value {
 	const char *s;
 	unsigned long ul; /* used for sorting when not FIELD_STR */
 	unsigned int modifier_atom : 1, /*  atoms which act as modifiers for the next atom */
-		color : 1;
+		color : 1,
+		pad_to_right : 1;
 };
 
 struct ref_formatting_state {
 	int quote_style;
+	unsigned int pad_to_right;
 	const char *color;
 };
 
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 505a360..48caac9 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -81,4 +81,36 @@ test_expect_success 'filtering with --contains' '
 	test_cmp expect actual
 '
 
+test_expect_success 'padding to the right using `padright`' '
+	cat >expect <<-\EOF &&
+	master|    master    |
+	side|    side      |
+	odd/spot|    odd/spot  |
+	double-tag|    double-tag|
+	four|    four      |
+	one|    one       |
+	signed-tag|    signed-tag|
+	three|    three     |
+	two|    two       |
+	EOF
+	git for-each-ref --format="%(refname:short)%(padright:5)|%(padright:10)%(refname:short)|" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'no padding when `padright` length is smaller than atom length' '
+	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:5)%(refname)|" >actual &&
+	test_cmp expect actual
+'
+
 test_done

-- 
2.4.6