Make git blame's date output format configurable, like git log

Add the following:

- git config value blame.date that expects one of the git log date
formats (e.g. relative,local,default,iso,...);

- git blame command line option --date expects one of the git
log date formats;

- documentation in blame-options.txt;

- git blame uses the appropriate date.c functions and enums to
make sense of the date format and provide appropriate data;

git blame continues to line up the output columns by padding the date
column up to the max width of the chosen date format.

The date format for git blame without both blame.date and --date continues
to be ISO for backwards compatibility.

git annotate ignores the date format specifiers and continues to uses the
ISO format, as before.

Signed-off-by: Eugene Letuchy <eugene@facebook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 7f28432254a81e4c39ce8ff204b4d6618050c5c6..e6717af44ed6d8812466e17486d1884bcb7fbc1b 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -70,6 +70,14 @@ of lines before or after the line given by <start>.
        tree copy has the contents of the named file (specify
        `-` to make the command read from the standard input).
 
        tree copy has the contents of the named file (specify
        `-` to make the command read from the standard input).
 

+--date <format>::
+       The value is one of the following alternatives:
+       {relative,local,default,iso,rfc,short}. If --date is not
+       provided, the value of the blame.date config variable is
+       used. If the blame.date config variable is also not set, the
+       iso format is used. For more information, See the discussion
+       of the --date option at linkgit:git-log[1].
+

 -M|<num>|::
        Detect moving lines in the file as well.  When a commit
        moves a block of lines in a file (e.g. the original file
 -M|<num>|::
        Detect moving lines in the file as well.  When a commit
        moves a block of lines in a file (e.g. the original file

diff --git a/builtin-blame.c b/builtin-blame.c
index 114a214ed3fef40ae5cc13737d037f29d6f8acfd..0c6ad98d19cba2459169653cdfeedd1caef03fe9 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Pickaxe
+ * Blame

  *
  * Copyright (c) 2006, Junio C Hamano
  */
  *
  * Copyright (c) 2006, Junio C Hamano
  */


@@ -40,6 +40,10 @@ static int reverse;
 static int blank_boundary;
 static int incremental;
 static int xdl_opts = XDF_NEED_MINIMAL;
 static int blank_boundary;
 static int incremental;
 static int xdl_opts = XDF_NEED_MINIMAL;

+
+static enum date_mode blame_date_mode = DATE_ISO8601;
+static size_t blame_date_width;
+

 static struct string_list mailmap;
 
 #ifndef DEBUG
 static struct string_list mailmap;
 
 #ifndef DEBUG


@@ -1507,24 +1511,20 @@ static const char *format_time(unsigned long time, const char *tz_str,
                               int show_raw_time)
 {
        static char time_buf[128];
                               int show_raw_time)
 {
        static char time_buf[128];

-       time_t t = time;
-       int minutes, tz;
-       struct tm *tm;
+       const char *time_str;
+       int time_len;
+       int tz;

 
        if (show_raw_time) {
                sprintf(time_buf, "%lu %s", time, tz_str);
 
        if (show_raw_time) {
                sprintf(time_buf, "%lu %s", time, tz_str);

-               return time_buf;

        }
        }

-
-       tz = atoi(tz_str);
-       minutes = tz < 0 ? -tz : tz;
-       minutes = (minutes / 100)*60 + (minutes % 100);
-       minutes = tz < 0 ? -minutes : minutes;
-       t = time + minutes * 60;
-       tm = gmtime(&t);
-
-       strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", tm);
-       strcat(time_buf, tz_str);
+       else {
+               tz = atoi(tz_str);
+               time_str = show_date(time, tz, blame_date_mode);
+               time_len = strlen(time_str);
+               memcpy(time_buf, time_str, time_len);
+               memset(time_buf + time_len, ' ', blame_date_width - time_len);
+       }

        return time_buf;
 }
 
        return time_buf;
 }
 


@@ -1975,6 +1975,12 @@ static int git_blame_config(const char *var, const char *value, void *cb)
                blank_boundary = git_config_bool(var, value);
                return 0;
        }
                blank_boundary = git_config_bool(var, value);
                return 0;
        }

+       if (!strcmp(var, "blame.date")) {
+               if (!value)
+                       return config_error_nonbool(var);
+               blame_date_mode = parse_date_format(value);
+               return 0;
+       }

        return git_default_config(var, value, cb);
 }
 
        return git_default_config(var, value, cb);
 }
 


@@ -2239,6 +2245,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 
        git_config(git_blame_config, NULL);
        init_revisions(&revs, NULL);
 
        git_config(git_blame_config, NULL);
        init_revisions(&revs, NULL);

+       revs.date_mode = blame_date_mode;
+

        save_commit_buffer = 0;
        dashdash_pos = 0;
 
        save_commit_buffer = 0;
        dashdash_pos = 0;
 


@@ -2263,8 +2271,35 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 parse_done:
        argc = parse_options_end(&ctx);
 
 parse_done:
        argc = parse_options_end(&ctx);
 

-       if (cmd_is_annotate)
+       if (cmd_is_annotate) {

                output_option |= OUTPUT_ANNOTATE_COMPAT;
                output_option |= OUTPUT_ANNOTATE_COMPAT;

+               blame_date_mode = DATE_ISO8601;
+       } else {
+               blame_date_mode = revs.date_mode;
+       }
+
+       /* The maximum width used to show the dates */
+       switch (blame_date_mode) {
+       case DATE_RFC2822:
+               blame_date_width = sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
+               break;
+       case DATE_ISO8601:
+               blame_date_width = sizeof("2006-10-19 16:00:04 -0700");
+               break;
+       case DATE_RAW:
+               blame_date_width = sizeof("1161298804 -0700");
+               break;
+       case DATE_SHORT:
+               blame_date_width = sizeof("2006-10-19");
+               break;
+       case DATE_RELATIVE:
+               /* "normal" is used as the fallback for "relative" */
+       case DATE_LOCAL:
+       case DATE_NORMAL:
+               blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700");
+               break;
+       }
+       blame_date_width -= 1; /* strip the null */

 
        if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
                opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
 
        if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
                opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |