summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorNazri Ramliy <ayiehere@gmail.com>2010-06-19 01:37:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-21 04:44:32 (GMT)
commit67a4b5864f9423ccfe8090365029dae918504830 (patch)
tree7f479511d04bf47124f08932e8e69700cc264d67 /log-tree.c
parenta7524128750ebf34fe0639e1e5d7abd03aff0302 (diff)
downloadgit-67a4b5864f9423ccfe8090365029dae918504830.zip
git-67a4b5864f9423ccfe8090365029dae918504830.tar.gz
git-67a4b5864f9423ccfe8090365029dae918504830.tar.bz2
log --decorate: Colorize commit decorations
This makes the decorations stand out more and easier to distinguish and spot because they are colored differently depending on their type. Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c34
1 files changed, 33 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index bec6096..61680f4 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -7,6 +7,7 @@
#include "reflog-walk.h"
#include "refs.h"
#include "string-list.h"
+#include "color.h"
struct decoration name_decoration = { "object names" };
@@ -19,6 +20,29 @@ enum decoration_type {
DECORATION_REF_HEAD,
};
+static char decoration_colors[][COLOR_MAXLEN] = {
+ GIT_COLOR_RESET,
+ GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
+ GIT_COLOR_BOLD_RED, /* REF_REMOTE */
+ GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
+ GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
+ GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
+};
+
+static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
+{
+ if (decorate_use_color)
+ return decoration_colors[ix];
+ return "";
+}
+
+/*
+ * log-tree.c uses DIFF_OPT_TST for determining whether to use color
+ * for showing the commit sha1, use the same check for --decorate
+ */
+#define decorate_get_color_opt(o, ix) \
+ decorate_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
+
static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
{
int nlen = strlen(name);
@@ -81,6 +105,10 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
{
const char *prefix;
struct name_decoration *decoration;
+ const char *color_commit =
+ diff_get_color_opt(&opt->diffopt, DIFF_COMMIT);
+ const char *color_reset =
+ decorate_get_color_opt(&opt->diffopt, DECORATION_NONE);
if (opt->show_source && commit->util)
printf("\t%s", (char *) commit->util);
@@ -92,9 +120,13 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
prefix = " (";
while (decoration) {
printf("%s", prefix);
+ fputs(decorate_get_color_opt(&opt->diffopt, decoration->type),
+ stdout);
if (decoration->type == DECORATION_REF_TAG)
- printf("tag: ");
+ fputs("tag: ", stdout);
printf("%s", decoration->name);
+ fputs(color_reset, stdout);
+ fputs(color_commit, stdout);
prefix = ", ";
decoration = decoration->next;
}