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 <pclo...@gmail.com>
Helped-by: Junio C Hamano <gits...@pobox.com>
Mentored-by: Christian Couder <christian.cou...@gmail.com>
Mentored-by: Matthieu Moy <matthieu....@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik....@gmail.com>
---
Documentation/git-for-each-ref.txt | 6 ++++++
ref-filter.c | 27 +++++++++++++++++++++++++--
ref-filter.h | 4 +++-
t/t6302-for-each-ref-filter.sh | 16 ++++++++++++++++
4 files changed, 50 insertions(+), 3 deletions(-)
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 a919a14..e5cd97b 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -55,6 +55,7 @@ static struct {
{ "flag" },
{ "HEAD" },
{ "color" },
+ { "padright" },
};
/*
@@ -689,6 +690,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;
@@ -1195,7 +1208,16 @@ void ref_array_sort(struct ref_sorting *sorting, struct
ref_array *array)
static void apply_formatting_state(struct ref_formatting_state *state,
struct atom_value *v, struct strbuf *value)
{
- /* Eventually we'll formatt based on the ref_formatting_state */
+ 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_addstr(value, v->s);
}
@@ -1276,7 +1298,8 @@ static void emit(const char *cp, const char *ep)
static void store_formatting_state(struct ref_formatting_state *state,
struct atom_value *atomv)
{
- /* Here the 'ref_formatting_state' variable will be filled */
+ if (atomv->pad_to_right)
+ state->pad_to_right = atomv->ul;
}
static void reset_formatting_state(struct ref_formatting_state *state)
diff --git a/ref-filter.h b/ref-filter.h
index 12e6a6b..23d8574 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -19,11 +19,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 */
+ unsigned int modifier_atom : 1, /* atoms which act as modifiers for
the next atom */
+ pad_to_right : 1;
};
struct ref_formatting_state {
int quote_style;
+ 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..19ac480 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/master |refs/heads/master|
+ refs/heads/side|refs/heads/side |refs/heads/side|
+ refs/odd/spot|refs/odd/spot |refs/odd/spot|
+ refs/tags/double-tag|refs/tags/double-tag |refs/tags/double-tag|
+ refs/tags/four|refs/tags/four |refs/tags/four|
+ refs/tags/one|refs/tags/one |refs/tags/one|
+ refs/tags/signed-tag|refs/tags/signed-tag |refs/tags/signed-tag|
+ refs/tags/three|refs/tags/three |refs/tags/three|
+ refs/tags/two|refs/tags/two |refs/tags/two|
+ EOF
+ git for-each-ref
--format="%(refname)%(padright:25)|%(refname)|%(refname)|" >actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.4.6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
