kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

for-each-ref: introduce %(color:...) for color 

Enhance 'git for-each-ref' with color formatting options.  You can now
use the following format in for-each-ref:

  %(color:green)%(refname:short)%(color:reset)

where color names are described in color.branch.*.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ramkumar Ramachandra 2013-11-18 23:09:12 +05:30 committed by Junio C Hamano
parent b28061ce0d
commit fddb74c947
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-for-each-ref.txt
View File

@ -101,6 +101,10 @@ HEAD::
'*' if HEAD matches current ref (the checked out branch), ' ' '*' if HEAD matches current ref (the checked out branch), ' '
otherwise. otherwise.


color::
Change output color. Followed by `:<colorname>`, where names
are described in `color.branch.*`.

In addition to the above, for commit and tag objects, the header In addition to the above, for commit and tag objects, the header
field names (`tree`, `parent`, `object`, `type`, and `tag`) can field names (`tree`, `parent`, `object`, `type`, and `tag`) can
be used to specify the value in the header field. be used to specify the value in the header field.

11
builtin/for-each-ref.c
View File

@ -9,6 +9,7 @@
#include "quote.h" #include "quote.h"
#include "parse-options.h" #include "parse-options.h"
#include "remote.h" #include "remote.h"
#include "color.h"


/* Quoting styles */ /* Quoting styles */
#define QUOTE_NONE 0 #define QUOTE_NONE 0
@ -76,6 +77,7 @@ static struct {
{ "symref" }, { "symref" },
{ "flag" }, { "flag" },
{ "HEAD" }, { "HEAD" },
{ "color" },
}; };


/* /*
@ -662,8 +664,13 @@ static void populate_value(struct refinfo *ref)
!branch->merge[0]->dst) !branch->merge[0]->dst)
continue; continue;
refname = branch->merge[0]->dst; refname = branch->merge[0]->dst;
} } else if (!prefixcmp(name, "color:")) {
else if (!strcmp(name, "flag")) { char color[COLOR_MAXLEN] = "";

color_parse(name + 6, "--format", color);
v->s = xstrdup(color);
continue;
} else if (!strcmp(name, "flag")) {
char buf[256], *cp = buf; char buf[256], *cp = buf;
if (ref->flag & REF_ISSYMREF) if (ref->flag & REF_ISSYMREF)
cp = copy_advance(cp, ",symref"); cp = copy_advance(cp, ",symref");

17
t/t6300-for-each-ref.sh
View File

@ -343,6 +343,23 @@ test_expect_success 'Check for invalid refname format' '
test_must_fail git for-each-ref --format="%(refname:INVALID)" test_must_fail git for-each-ref --format="%(refname:INVALID)"
' '


get_color ()
{
git config --get-color no.such.slot "$1"
}

cat >expected <<EOF
$(git rev-parse --short refs/heads/master) $(get_color green)master$(get_color reset)
$(git rev-parse --short refs/remotes/origin/master) $(get_color green)origin/master$(get_color reset)
$(git rev-parse --short refs/tags/testtag) $(get_color green)testtag$(get_color reset)
$(git rev-parse --short refs/tags/two) $(get_color green)two$(get_color reset)
EOF

test_expect_success 'Check %(color:...) ' '
git for-each-ref --format="%(objectname:short) %(color:green)%(refname:short)%(color:reset)" >actual &&
test_cmp expected actual
'

cat >expected <<\EOF cat >expected <<\EOF
heads/master heads/master
tags/master tags/master