It makes it easier to write a sensible format string, since you don't
have to %(color:reset) after each atom. Additionally, to make sure that
an invocation like the following doesn't leak color,
$ git for-each-ref --format='%(subject)%(color:green)'
auto-reset at the end of the format string as well.
Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
---
builtin/for-each-ref.c | 22 ++++++++++++++++++----
t/t6300-for-each-ref.sh | 2 +-
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 2ff4e54..1050aea 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -23,6 +23,7 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
struct atom_value {
const char *s;
unsigned long ul; /* used for sorting when not FIELD_STR */
+ int color : 1;
};
struct ref_sort {
@@ -669,6 +670,7 @@ static void populate_value(struct refinfo *ref)
color_parse(name + 6, "--format", color);
v->s = xstrdup(color);
+ v->color = 1;
continue;
} else if (!strcmp(name, "flag")) {
char buf[256], *cp = buf;
@@ -914,11 +916,9 @@ static void sort_refs(struct ref_sort *sort, struct
refinfo **refs, int num_refs
qsort(refs, num_refs, sizeof(struct refinfo *), compare_refs);
}
-static void print_value(struct refinfo *ref, int atom, int quote_style)
+static void print_value(struct atom_value *v, int quote_style)
{
- struct atom_value *v;
struct strbuf sb = STRBUF_INIT;
- get_value(ref, atom, &v);
switch (quote_style) {
case QUOTE_NONE:
fputs(v->s, stdout);
@@ -983,17 +983,31 @@ static void emit(const char *cp, const char *ep)
static void show_ref(struct refinfo *info, const char *format, int quote_style)
{
const char *cp, *sp, *ep;
+ struct atom_value *atomv, resetv;
+ int reset_color = 0;
+ char color[COLOR_MAXLEN] = "";
+ color_parse("reset", "--format", color);
+ resetv.s = color;
for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {
ep = strchr(sp, ')');
if (cp < sp)
emit(cp, sp);
- print_value(info, parse_atom(sp + 2, ep), quote_style);
+ get_value(info, parse_atom(sp + 2, ep), &atomv);
+ print_value(atomv, quote_style);
+ if (reset_color) {
+ print_value(&resetv, quote_style);
+ reset_color = 0;
+ }
+ if (atomv->color)
+ reset_color = 1;
}
if (*cp) {
sp = cp + strlen(cp);
emit(cp, sp);
}
+ if (reset_color)
+ print_value(&resetv, quote_style);
putchar('\n');
}
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 35ca991..2bf2bea 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -348,7 +348,7 @@ $(get_color red)$(git rev-parse --short HEAD)$(get_color
reset) origin/master
EOF
test_expect_success 'Check %(color:...) ' '
- git for-each-ref
--format="%(color:red)%(objectname:short)%(color:reset) %(upstream:short)"
refs/heads >actual &&
+ git for-each-ref --format="%(color:red)%(objectname:short)
%(upstream:short)" refs/heads >actual &&
test_cmp expected actual
'
--
1.8.5.rc0.6.gfd75b41
--
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
