Colourise git-branch output

I wanted to have a visual indication of which branches are local and
which are remote in git-branch -a output; however Junio was concerned
that someone might be using the output in a script.  This patch
addresses the problem by colouring the git-branch output - which in
"auto" mode won't be activated.

I've based it off the colouring code for builtin-diff.c; which means
there is a branch color configuration variable that needs setting to
something before the color will appear.

The colour parameter is "color.branch" rather than "branch.color" to
avoid clashing with the default namespace for default branch merge
definitions.

This patch chooses green for local, red for remote and bold green for
current.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-branch.c b/builtin-branch.c
index 3d5cb0e4b2de8abf3a9f1af8fadb9c1bc5393967..7c87b8d5793ce2ebd12f468cd747cb442a200820 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -5,6 +5,7 @@
  * Based on git-branch.sh by Junio C Hamano.
  */
 
  * Based on git-branch.sh by Junio C Hamano.
  */
 

+#include "color.h"

 #include "cache.h"
 #include "refs.h"
 #include "commit.h"
 #include "cache.h"
 #include "refs.h"
 #include "commit.h"


@@ -17,6 +18,58 @@ static const char builtin_branch_usage[] =
 static const char *head;
 static unsigned char head_sha1[20];
 
 static const char *head;
 static unsigned char head_sha1[20];
 

+static int branch_use_color;
+static char branch_colors[][COLOR_MAXLEN] = {
+       "\033[m",       /* reset */
+       "",             /* PLAIN (normal) */
+       "\033[31m",     /* REMOTE (red) */
+       "\033[32m",     /* LOCAL (green) */
+       "\033[1;32m",   /* CURRENT (boldgreen) */
+};
+enum color_branch {
+       COLOR_BRANCH_RESET = 0,
+       COLOR_BRANCH_PLAIN = 1,
+       COLOR_BRANCH_REMOTE = 2,
+       COLOR_BRANCH_LOCAL = 3,
+       COLOR_BRANCH_CURRENT = 4,
+};
+
+static int parse_branch_color_slot(const char *var, int ofs)
+{
+       if (!strcasecmp(var+ofs, "plain"))
+               return COLOR_BRANCH_PLAIN;
+       if (!strcasecmp(var+ofs, "reset"))
+               return COLOR_BRANCH_RESET;
+       if (!strcasecmp(var+ofs, "remote"))
+               return COLOR_BRANCH_REMOTE;
+       if (!strcasecmp(var+ofs, "local"))
+               return COLOR_BRANCH_LOCAL;
+       if (!strcasecmp(var+ofs, "current"))
+               return COLOR_BRANCH_CURRENT;
+       die("bad config variable '%s'", var);
+}
+
+int git_branch_config(const char *var, const char *value)
+{
+       if (!strcmp(var, "color.branch")) {
+               branch_use_color = git_config_colorbool(var, value);
+               return 0;
+       }
+       if (!strncmp(var, "color.branch.", 13)) {
+               int slot = parse_branch_color_slot(var, 13);
+               color_parse(value, var, branch_colors[slot]);
+               return 0;
+       }
+       return git_default_config(var, value);
+}
+
+const char *branch_get_color(enum color_branch ix)
+{
+       if (branch_use_color)
+               return branch_colors[ix];
+       return "";
+}
+

 static int in_merge_bases(const unsigned char *sha1,
                          struct commit *rev1,
                          struct commit *rev2)
 static int in_merge_bases(const unsigned char *sha1,
                          struct commit *rev1,
                          struct commit *rev2)


@@ -183,6 +236,7 @@ static void print_ref_list(int kinds, int verbose, int abbrev)
        int i;
        char c;
        struct ref_list ref_list;
        int i;
        char c;
        struct ref_list ref_list;

+       int color;

 
        memset(&ref_list, 0, sizeof(ref_list));
        ref_list.kinds = kinds;
 
        memset(&ref_list, 0, sizeof(ref_list));
        ref_list.kinds = kinds;


@@ -191,18 +245,38 @@ static void print_ref_list(int kinds, int verbose, int abbrev)
        qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
 
        for (i = 0; i < ref_list.index; i++) {
        qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
 
        for (i = 0; i < ref_list.index; i++) {

+               switch( ref_list.list[i].kind ) {
+                       case REF_LOCAL_BRANCH:
+                               color = COLOR_BRANCH_LOCAL;
+                               break;
+                       case REF_REMOTE_BRANCH:
+                               color = COLOR_BRANCH_REMOTE;
+                               break;
+                       default:
+                               color = COLOR_BRANCH_PLAIN;
+                               break;
+               }
+

                c = ' ';
                if (ref_list.list[i].kind == REF_LOCAL_BRANCH &&
                c = ' ';
                if (ref_list.list[i].kind == REF_LOCAL_BRANCH &&

-                               !strcmp(ref_list.list[i].name, head))
+                               !strcmp(ref_list.list[i].name, head)) {

                        c = '*';
                        c = '*';

+                       color = COLOR_BRANCH_CURRENT;
+               }

 
                if (verbose) {
 
                if (verbose) {

-                       printf("%c %-*s", c, ref_list.maxwidth,
-                              ref_list.list[i].name);
+                       printf("%c %s%-*s%s", c,
+                                       branch_get_color(color),
+                                       ref_list.maxwidth,
+                                       ref_list.list[i].name,
+                                       branch_get_color(COLOR_BRANCH_RESET));

                        print_ref_info(ref_list.list[i].sha1, abbrev);
                }
                else
                        print_ref_info(ref_list.list[i].sha1, abbrev);
                }
                else

-                       printf("%c %s\n", c, ref_list.list[i].name);
+                       printf("%c %s%s%s\n", c,
+                                       branch_get_color(color),
+                                       ref_list.list[i].name,
+                                       branch_get_color(COLOR_BRANCH_RESET));

        }
 
        free_ref_list(&ref_list);
        }
 
        free_ref_list(&ref_list);


@@ -253,7 +327,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
        int kinds = REF_LOCAL_BRANCH;
        int i;
 
        int kinds = REF_LOCAL_BRANCH;
        int i;
 

-       git_config(git_default_config);
+       git_config(git_branch_config);

 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];


@@ -297,6 +371,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                        verbose = 1;
                        continue;
                }
                        verbose = 1;
                        continue;
                }

+               if (!strcmp(arg, "--color")) {
+                       branch_use_color = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--no-color")) {
+                       branch_use_color = 0;
+                       continue;
+               }

                usage(builtin_branch_usage);
        }
 
                usage(builtin_branch_usage);
        }