push: colorize errors

This is an attempt to resolve an issue I experience with people that are
new to Git -- especially colleagues in a team setting -- where they miss
that their push to a remote location failed because the failure and
success both return a block of white text.

An example is if I push something to a remote repository and then a
colleague attempts to push to the same remote repository and the push
fails because it requires them to pull first, but they don't notice
because a success and failure both return a block of white text. They
then continue about their business, thinking it has been successfully
pushed.

This patch colorizes the errors and hints (in red and yellow,
respectively) so whenever there is a failure when pushing to a remote
repository that fails, it is more noticeable.

[jes: fixed a couple bugs, added the color.{advice,push,transport}
settings, refactored to use want_color_stderr().]

Signed-off-by: Ryan Dammrose ryandammrose@gmail.com
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/advice.c b/advice.c
index 406efc183ba272b94a39d4cc7e97d7483a40a9d4..89fda1de55bfc80ba884ab45dd7a31087dea66df 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
 #include "cache.h"
 #include "config.h"

+#include "color.h"

 
 int advice_push_update_rejected = 1;
 int advice_push_non_ff_current = 1;
 
 int advice_push_update_rejected = 1;
 int advice_push_non_ff_current = 1;


@@ -20,6 +21,33 @@ int advice_add_embedded_repo = 1;
 int advice_ignored_hook = 1;
 int advice_waiting_for_editor = 1;
 
 int advice_ignored_hook = 1;
 int advice_waiting_for_editor = 1;
 

+static int advice_use_color = -1;
+static char advice_colors[][COLOR_MAXLEN] = {
+       GIT_COLOR_RESET,
+       GIT_COLOR_YELLOW,       /* HINT */
+};
+
+enum color_advice {
+       ADVICE_COLOR_RESET = 0,
+       ADVICE_COLOR_HINT = 1,
+};
+
+static int parse_advise_color_slot(const char *slot)
+{
+       if (!strcasecmp(slot, "reset"))
+               return ADVICE_COLOR_RESET;
+       if (!strcasecmp(slot, "hint"))
+               return ADVICE_COLOR_HINT;
+       return -1;
+}
+
+static const char *advise_get_color(enum color_advice ix)
+{
+       if (want_color_stderr(advice_use_color))
+               return advice_colors[ix];
+       return "";
+}
+

 static struct {
        const char *name;
        int *preference;
 static struct {
        const char *name;
        int *preference;


@@ -59,7 +87,10 @@ void advise(const char *advice, ...)
 
        for (cp = buf.buf; *cp; cp = np) {
                np = strchrnul(cp, '\n');
 
        for (cp = buf.buf; *cp; cp = np) {
                np = strchrnul(cp, '\n');

-               fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
+               fprintf(stderr, _("%shint: %.*s%s\n"),
+                       advise_get_color(ADVICE_COLOR_HINT),
+                       (int)(np - cp), cp,
+                       advise_get_color(ADVICE_COLOR_RESET));

                if (*np)
                        np++;
        }
                if (*np)
                        np++;
        }


@@ -68,9 +99,23 @@ void advise(const char *advice, ...)
 
 int git_default_advice_config(const char *var, const char *value)
 {
 
 int git_default_advice_config(const char *var, const char *value)
 {

-       const char *k;
+       const char *k, *slot_name;

        int i;
 
        int i;
 

+       if (!strcmp(var, "color.advice")) {
+               advice_use_color = git_config_colorbool(var, value);
+               return 0;
+       }
+
+       if (skip_prefix(var, "color.advice.", &slot_name)) {
+               int slot = parse_advise_color_slot(slot_name);
+               if (slot < 0)
+                       return 0;
+               if (!value)
+                       return config_error_nonbool(var);
+               return color_parse(value, advice_colors[slot]);
+       }
+

        if (!skip_prefix(var, "advice.", &k))
                return 0;
 
        if (!skip_prefix(var, "advice.", &k))
                return 0;
 

diff --git a/builtin/push.c b/builtin/push.c
index 013c20d6164f61dc404b89271c0281d28b5069a7..ac3705370e12fda53da086f33c6b47925a48873c 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -12,12 +12,40 @@
 #include "submodule.h"
 #include "submodule-config.h"
 #include "send-pack.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "send-pack.h"

+#include "color.h"

 
 static const char * const push_usage[] = {
        N_("git push [<options>] [<repository> [<refspec>...]]"),
        NULL,
 };
 
 
 static const char * const push_usage[] = {
        N_("git push [<options>] [<repository> [<refspec>...]]"),
        NULL,
 };
 

+static int push_use_color = -1;
+static char push_colors[][COLOR_MAXLEN] = {
+       GIT_COLOR_RESET,
+       GIT_COLOR_RED,  /* ERROR */
+};
+
+enum color_push {
+       PUSH_COLOR_RESET = 0,
+       PUSH_COLOR_ERROR = 1
+};
+
+static int parse_push_color_slot(const char *slot)
+{
+       if (!strcasecmp(slot, "reset"))
+               return PUSH_COLOR_RESET;
+       if (!strcasecmp(slot, "error"))
+               return PUSH_COLOR_ERROR;
+       return -1;
+}
+
+static const char *push_get_color(enum color_push ix)
+{
+       if (want_color_stderr(push_use_color))
+               return push_colors[ix];
+       return "";
+}
+

 static int thin = 1;
 static int deleterefs;
 static const char *receivepack;
 static int thin = 1;
 static int deleterefs;
 static const char *receivepack;


@@ -337,8 +365,11 @@ static int push_with_options(struct transport *transport, int flags)
                fprintf(stderr, _("Pushing to %s\n"), transport->url);
        err = transport_push(transport, refspec_nr, refspec, flags,
                             &reject_reasons);
                fprintf(stderr, _("Pushing to %s\n"), transport->url);
        err = transport_push(transport, refspec_nr, refspec, flags,
                             &reject_reasons);

-       if (err != 0)
+       if (err != 0) {
+               fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));

                error(_("failed to push some refs to '%s'"), transport->url);
                error(_("failed to push some refs to '%s'"), transport->url);

+               fprintf(stderr, "%s", push_get_color(PUSH_COLOR_RESET));
+       }

 
        err |= transport_disconnect(transport);
        if (!err)
 
        err |= transport_disconnect(transport);
        if (!err)


@@ -467,6 +498,7 @@ static void set_push_cert_flags(int *flags, int v)
 
 static int git_push_config(const char *k, const char *v, void *cb)
 {
 
 static int git_push_config(const char *k, const char *v, void *cb)
 {

+       const char *slot_name;

        int *flags = cb;
        int status;
 
        int *flags = cb;
        int status;
 


@@ -514,6 +546,16 @@ static int git_push_config(const char *k, const char *v, void *cb)
                        else
                                string_list_append(&push_options_config, v);
                return 0;
                        else
                                string_list_append(&push_options_config, v);
                return 0;

+       } else if (!strcmp(k, "color.push")) {
+               push_use_color = git_config_colorbool(k, v);
+               return 0;
+       } else if (skip_prefix(k, "color.push.", &slot_name)) {
+               int slot = parse_push_color_slot(slot_name);
+               if (slot < 0)
+                       return 0;
+               if (!v)
+                       return config_error_nonbool(k);
+               return color_parse(v, push_colors[slot]);

        }
 
        return git_default_config(k, v, NULL);
        }
 
        return git_default_config(k, v, NULL);

diff --git a/config.c b/config.c
index c698988f5e11cd416bef9a77c998d94b9ef87930..f21317a25a7e3adcb7a0916d28454d3d88595fa1 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1365,7 +1365,7 @@ int git_default_config(const char *var, const char *value, void *dummy)
        if (starts_with(var, "mailmap."))
                return git_default_mailmap_config(var, value);
 
        if (starts_with(var, "mailmap."))
                return git_default_mailmap_config(var, value);
 

-       if (starts_with(var, "advice."))
+       if (starts_with(var, "advice.") || starts_with(var, "color.advice"))

                return git_default_advice_config(var, value);
 
        if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
                return git_default_advice_config(var, value);
 
        if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {

diff --git a/transport.c b/transport.c
index 94eccf29aa3f9758f5acaa9daddedcd559ad3915..f72081a5a582b099aecbefd419072b63614c8b18 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -19,6 +19,56 @@
 #include "sigchain.h"
 #include "transport-internal.h"
 #include "object-store.h"
 #include "sigchain.h"
 #include "transport-internal.h"
 #include "object-store.h"

+#include "color.h"
+
+static int transport_use_color = -1;
+static char transport_colors[][COLOR_MAXLEN] = {
+       GIT_COLOR_RESET,
+       GIT_COLOR_RED           /* REJECTED */
+};
+
+enum color_transport {
+       TRANSPORT_COLOR_RESET = 0,
+       TRANSPORT_COLOR_REJECTED = 1
+};
+
+static int transport_color_config(void)
+{
+       const char *keys[] = {
+               "color.transport.reset",
+               "color.transport.rejected"
+       }, *key = "color.transport";
+       char *value;
+       int i;
+       static int initialized;
+
+       if (initialized)
+               return 0;
+       initialized = 1;
+
+       if (!git_config_get_string(key, &value))
+               transport_use_color = git_config_colorbool(key, value);
+
+       if (!want_color_stderr(transport_use_color))
+               return 0;
+
+       for (i = 0; i < ARRAY_SIZE(keys); i++)
+               if (!git_config_get_string(keys[i], &value)) {
+                       if (!value)
+                               return config_error_nonbool(keys[i]);
+                       if (color_parse(value, transport_colors[i]) < 0)
+                               return -1;
+               }
+
+       return 0;
+}
+
+static const char *transport_get_color(enum color_transport ix)
+{
+       if (want_color_stderr(transport_use_color))
+               return transport_colors[ix];
+       return "";
+}

 
 static void set_upstreams(struct transport *transport, struct ref *refs,
        int pretend)
 
 static void set_upstreams(struct transport *transport, struct ref *refs,
        int pretend)


@@ -339,7 +389,13 @@ static void print_ref_status(char flag, const char *summary,
                else
                        fprintf(stdout, "%s\n", summary);
        } else {
                else
                        fprintf(stdout, "%s\n", summary);
        } else {

-               fprintf(stderr, " %c %-*s ", flag, summary_width, summary);
+               const char *red = "", *reset = "";
+               if (push_had_errors(to)) {
+                       red = transport_get_color(TRANSPORT_COLOR_REJECTED);
+                       reset = transport_get_color(TRANSPORT_COLOR_RESET);
+               }
+               fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width,
+                       summary, reset);

                if (from)
                        fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
                else
                if (from)
                        fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
                else


@@ -488,6 +544,9 @@ void transport_print_push_status(const char *dest, struct ref *refs,
        char *head;
        int summary_width = transport_summary_width(refs);
 
        char *head;
        int summary_width = transport_summary_width(refs);
 

+       if (transport_color_config() < 0)
+               warning(_("could not parse transport.color.* config"));
+

        head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
 
        if (verbose) {
        head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
 
        if (verbose) {


@@ -554,6 +613,9 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
        struct send_pack_args args;
        int ret;
 
        struct send_pack_args args;
        int ret;
 

+       if (transport_color_config() < 0)
+               return -1;
+

        if (!data->got_remote_heads) {
                struct ref *tmp_refs;
                connect_setup(transport, 1);
        if (!data->got_remote_heads) {
                struct ref *tmp_refs;
                connect_setup(transport, 1);


@@ -998,6 +1060,9 @@ int transport_push(struct transport *transport,
        *reject_reasons = 0;
        transport_verify_remote_names(refspec_nr, refspec);
 
        *reject_reasons = 0;
        transport_verify_remote_names(refspec_nr, refspec);
 

+       if (transport_color_config() < 0)
+               return -1;
+

        if (transport->vtable->push_refs) {
                struct ref *remote_refs;
                struct ref *local_refs = get_local_heads();
        if (transport->vtable->push_refs) {
                struct ref *remote_refs;
                struct ref *local_refs = get_local_heads();