builtin/blame: highlight recently changed lines

Choose a different color for dates and imitate a 'temperature cool down'
depending upon age.

Originally I had planned to have the temperature cool down dependent on
the age of the project or file for example, as that might scale better,
but that can be added on top of this commit, e.g. instead of giving a
date, you could imagine giving a percentage that would be the linearly
interpolated between now and the beginning of the file.

Similarly to the previous patch, this offers the command line option
'--color-by-age' to enable this mode and the config option
'color.blame.highlightrecent' to select colors. A later patch will offer
a config option to select the default mode.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5d1d22e87383411d9911033b4967d9b5ace66942..c6aea52e98ad9742dd893e0452e64c860fcd254a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1223,6 +1223,23 @@ color.blame.repeatedLines::
        is repeated meta information per line (such as commit id,
        author name, date and timezone). Defaults to cyan.
 
        is repeated meta information per line (such as commit id,
        author name, date and timezone). Defaults to cyan.
 

+color.blame.highlightRecent::
+       This can be used to color the metadata of a blame line depending
+       on age of the line.
++
+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
 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 0a10e9d2084fb68f797cae06d26411f23823416e..35104e41603942c8ee8b19d528d76dfc16675eab 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -24,6 +24,7 @@
 #include "dir.h"
 #include "progress.h"
 #include "blame.h"
 #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>");
 
 
 static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
 


@@ -323,6 +324,7 @@ static const char *format_time(timestamp_t time, const char *tz_str,
 #define OUTPUT_SHOW_EMAIL      0400
 #define OUTPUT_LINE_PORCELAIN  01000
 #define OUTPUT_COLOR_LINE      02000
 #define OUTPUT_SHOW_EMAIL      0400
 #define OUTPUT_LINE_PORCELAIN  01000
 #define OUTPUT_COLOR_LINE      02000

+#define OUTPUT_SHOW_AGE_WITH_COLOR     04000

 
 static void emit_porcelain_details(struct blame_origin *suspect, int repeat)
 {
 
 static void emit_porcelain_details(struct blame_origin *suspect, int repeat)
 {


@@ -370,6 +372,63 @@ static void emit_porcelain(struct blame_scoreboard *sb, struct blame_entry *ent,
                putchar('\n');
 }
 
                putchar('\n');
 }
 

+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;
+
+       colorfield_nr = 0;
+
+       /* 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_color_by_age(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, int opt)
 {
        int cnt;
 static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int opt)
 {
        int cnt;


@@ -378,12 +437,19 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
        struct commit_info ci;
        char hex[GIT_MAX_HEXSZ + 1];
        int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
        struct commit_info ci;
        char hex[GIT_MAX_HEXSZ + 1];
        int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);

-       const char *color = NULL, *reset = NULL;
+       const char *default_color = NULL, *color = NULL, *reset = NULL;

 
        get_commit_info(suspect->commit, &ci, 1);
        oid_to_hex_r(hex, &suspect->commit->object.oid);
 
        cp = blame_nth_line(sb, ent->lno);
 
        get_commit_info(suspect->commit, &ci, 1);
        oid_to_hex_r(hex, &suspect->commit->object.oid);
 
        cp = blame_nth_line(sb, ent->lno);

+
+       if (opt & OUTPUT_SHOW_AGE_WITH_COLOR) {
+               determine_line_heat(ent, &default_color);
+               color = default_color;
+               reset = GIT_COLOR_RESET;
+       }
+

        for (cnt = 0; cnt < ent->num_lines; cnt++) {
                char ch;
                int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? GIT_SHA1_HEXSZ : abbrev;
        for (cnt = 0; cnt < ent->num_lines; cnt++) {
                char ch;
                int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? GIT_SHA1_HEXSZ : abbrev;


@@ -393,8 +459,8 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
                                color = repeated_meta_color;
                                reset = GIT_COLOR_RESET;
                        } else  {
                                color = repeated_meta_color;
                                reset = GIT_COLOR_RESET;
                        } else  {

-                               color = NULL;
-                               reset = NULL;
+                               color = default_color ? default_color : NULL;
+                               reset = default_color ? GIT_COLOR_RESET : NULL;

                        }
                }
                if (color)
                        }
                }
                if (color)


@@ -631,6 +697,10 @@ static int git_blame_config(const char *var, const char *value, void *cb)
                                value);
                return 0;
        }
                                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;
 
        if (git_diff_heuristic_config(var, value, cb) < 0)
                return -1;


@@ -706,6 +776,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
                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 differently"), OUTPUT_COLOR_LINE),
                OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
                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 differently"), OUTPUT_COLOR_LINE),

+               OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),

 
                /*
                 * The following two options are parsed by parse_revision_opt()
 
                /*
                 * The following two options are parsed by parse_revision_opt()


@@ -730,6 +801,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        unsigned int range_i;
        long anchor;
 
        unsigned int range_i;
        long anchor;
 

+       setup_default_color_by_age();

        git_config(git_blame_config, &output_option);
        init_revisions(&revs, NULL);
        revs.date_mode = blame_date_mode;
        git_config(git_blame_config, &output_option);
        init_revisions(&revs, NULL);
        revs.date_mode = blame_date_mode;


@@ -972,7 +1044,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                        strcpy(repeated_meta_color, GIT_COLOR_CYAN);
        }
        if (output_option & OUTPUT_ANNOTATE_COMPAT)
                        strcpy(repeated_meta_color, GIT_COLOR_CYAN);
        }
        if (output_option & OUTPUT_ANNOTATE_COMPAT)

-               output_option &= ~OUTPUT_COLOR_LINE;
+               output_option &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR);

 
        output(&sb, output_option);
        free((void *)sb.final_buf);
 
        output(&sb, output_option);
        free((void *)sb.final_buf);

diff --git a/t/t8012-blame-colors.sh b/t/t8012-blame-colors.sh
index 98a22a3c8dcb82352d010fbd793fd3262fba4b5b..ae9aa79d4e60dac70d3db42f871546a89f1e2e4d 100755 (executable)
--- a/t/t8012-blame-colors.sh
+++ b/t/t8012-blame-colors.sh
@@ -16,4 +16,29 @@ test_expect_success 'colored blame colors contiguous lines' '
        test_line_count = 3 H.expect
 '
 
        test_line_count = 3 H.expect
 '
 

+test_expect_success 'color by age consistently colors old code' '
+       git blame --color-by-age hello.c >actual.raw &&
+       test_decode_color <actual.raw >actual &&
+       grep "<BLUE>" <actual >colored &&
+       test_line_count = 10 colored
+'
+
+test_expect_success 'blame color by age: new code is different' '
+       cat >>hello.c <<-EOF &&
+               void qfunc();
+       EOF
+       git add hello.c &&
+       GIT_AUTHOR_DATE="" git commit -m "new commit" &&
+
+       git -c color.blame.highlightRecent="yellow,1 month ago, cyan" blame --color-by-age hello.c >actual.raw &&
+       test_decode_color <actual.raw >actual &&
+
+       grep "<YELLOW>" <actual >colored &&
+       test_line_count = 10 colored &&
+
+       grep "<CYAN>" <actual >colored &&
+       test_line_count = 1 colored &&
+       grep qfunc colored
+'
+

 test_done
 test_done