Choose a different color for dates and imitate a 'temperature cool down'
for the dates.
Signed-off-by: Stefan Beller <sbel...@google.com>
---
Documentation/config.txt | 20 +++++++++++++
builtin/blame.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 85dfdc6a9b..7d2efc5ad6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1194,6 +1194,26 @@ color.blame.repeatedMeta::
is repeated meta information per line (such as commit id,
author name, date and timezone). Defaults to dark gray.
+color.blame.highlightRecent::
+ This can be used to color the author and date of a blame line.
+ This overrides `color.blame.repeatedMeta` setting, which colors
+ repetitions.
++
+ This setting should be set to a comma-separated list of
+ color and date settings, starting and ending with a color, the dates
+ should be set from oldest to newest.
+ The metadata will be colored given the colors if the the line was
+ introduced before the given timestamp, overwriting older timestamped
+ colors.
++
+ Instead of an absolute timestamp relative timestamps work as
+ well, e.g. 2.weeks.ago is valid to address anything older than 2 weeks.
++
+ It defaults to "blue,12 month ago,white,1 month ago,red",
+ which colors everything older than one year blue, recent changes between
+ one month and one year old are kept white, and lines introduced within
+ the last month are colored red.
+
color.ui::
This variable determines the default value for variables such
as `color.diff` and `color.grep` that control the use of color
diff --git a/builtin/blame.c b/builtin/blame.c
index 9d460597a2..e157ee3864 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -24,6 +24,7 @@
#include "dir.h"
#include "progress.h"
#include "blame.h"
+#include "string-list.h"
static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>]
[--] <file>");
@@ -324,6 +325,7 @@ static const char *format_time(timestamp_t time, const char
*tz_str,
#define OUTPUT_LINE_PORCELAIN 01000
#define OUTPUT_COLOR_LINE 02000
#define OUTPUT_COLOR_FIELDS 04000
+#define OUTPUT_HEATED_LINES 010000
static void emit_porcelain_details(struct blame_origin *suspect, int repeat)
{
@@ -436,6 +438,61 @@ static void setup_line_color(int opt, int cnt,
colors_set(use_color, reset_color);
}
+static struct color_field {
+ timestamp_t hop;
+ char col[COLOR_MAXLEN];
+} *colorfield;
+static int colorfield_nr, colorfield_alloc;
+
+static void parse_color_fields(const char *s)
+{
+ struct string_list l = STRING_LIST_INIT_DUP;
+ struct string_list_item *item;
+ enum { EXPECT_DATE, EXPECT_COLOR } next = EXPECT_COLOR;
+
+ /* Ideally this would be stripped and split at the same time? */
+ string_list_split(&l, s, ',', -1);
+ ALLOC_GROW(colorfield, colorfield_nr + 1, colorfield_alloc);
+
+ for_each_string_list_item(item, &l) {
+ switch (next) {
+ case EXPECT_DATE:
+ colorfield[colorfield_nr].hop =
approxidate(item->string);
+ next = EXPECT_COLOR;
+ colorfield_nr++;
+ ALLOC_GROW(colorfield, colorfield_nr + 1,
colorfield_alloc);
+ break;
+ case EXPECT_COLOR:
+ if (color_parse(item->string,
colorfield[colorfield_nr].col))
+ die(_("expecting a color: %s"), item->string);
+ next = EXPECT_DATE;
+ break;
+ }
+ }
+
+ if (next == EXPECT_COLOR)
+ die (_("must end with a color"));
+
+ colorfield[colorfield_nr].hop = TIME_MAX;
+}
+
+static void setup_default_colorfield(void)
+{
+ parse_color_fields("blue,12 month ago,white,1 month ago,red");
+}
+
+static void determine_line_heat(struct blame_entry *ent, const char
**dest_color)
+{
+ int i = 0;
+ struct commit_info ci;
+ get_commit_info(ent->suspect->commit, &ci, 1);
+
+ while (i < colorfield_nr && ci.author_time > colorfield[i].hop)
+ i++;
+
+ *dest_color = colorfield[i].col;
+}
+
static void emit_other(struct blame_scoreboard *sb,
struct blame_entry *ent,
struct blame_entry *prev,
@@ -443,6 +500,7 @@ static void emit_other(struct blame_scoreboard *sb,
{
int cnt;
const char *cp;
+ const char *heatcolor = NULL;
struct blame_origin *suspect = ent->suspect;
struct commit_info ci;
char hex[GIT_MAX_HEXSZ + 1];
@@ -452,6 +510,10 @@ static void emit_other(struct blame_scoreboard *sb,
oid_to_hex_r(hex, &suspect->commit->object.oid);
cp = blame_nth_line(sb, ent->lno);
+
+ if (opt & OUTPUT_HEATED_LINES)
+ determine_line_heat(ent, &heatcolor);
+
for (cnt = 0; cnt < ent->num_lines; cnt++) {
char ch;
int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? GIT_SHA1_HEXSZ :
abbrev;
@@ -503,6 +565,7 @@ static void emit_other(struct blame_scoreboard *sb,
if (!(opt & OUTPUT_NO_AUTHOR)) {
const char *name;
int pad;
+ int hcolor = opt & OUTPUT_HEATED_LINES;
if (opt & OUTPUT_SHOW_EMAIL)
name = ci.author_mail.buf;
else
@@ -510,7 +573,10 @@ static void emit_other(struct blame_scoreboard *sb,
pad = longest_author - utf8_strwidth(name);
setup_field_color(opt, cnt, OUTPUT_NO_AUTHOR,
ent, prev, &col, &rcol);
- printf(" %s(%s%*s %10s%s", col,
+ if (hcolor)
+ rcol = GIT_COLOR_RESET;
+ printf(" %s(%s%*s %10s%s",
+ hcolor ? heatcolor : col,
name, pad, "",
format_time(ci.author_time,
ci.author_tz.buf,
@@ -701,6 +767,10 @@ static int git_blame_config(const char *var, const char
*value, void *cb)
value);
return 0;
}
+ if (!strcmp(var, "color.blame.highlightrecent")) {
+ parse_color_fields(value);
+ return 0;
+ }
if (git_diff_heuristic_config(var, value, cb) < 0)
return -1;
@@ -777,6 +847,7 @@ int cmd_blame(int argc, const char **argv, const char
*prefix)
OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace
differences"), XDF_IGNORE_WHITESPACE),
OPT_BIT(0, "color-lines", &output_option, N_("color redundant
metadata from previous line"), OUTPUT_COLOR_LINE),
OPT_BIT(0, "color-fields", &output_option, N_("color redundant
metadata fields from previous line"), OUTPUT_COLOR_FIELDS),
+ OPT_BIT(0, "heated-lines", &output_option, N_("color lines by
date"), OUTPUT_HEATED_LINES),
/*
* The following two options are parsed by parse_revision_opt()
@@ -801,6 +872,7 @@ int cmd_blame(int argc, const char **argv, const char
*prefix)
unsigned int range_i;
long anchor;
+ setup_default_colorfield();
git_config(git_blame_config, &output_option);
init_revisions(&revs, NULL);
revs.date_mode = blame_date_mode;
--
2.15.0.128.gcadd42da22
