* [PATCH 1/2] Make git blame's date output format configurable, like git log
@ 2009-02-20 22:51 eletuchy
2009-02-22 17:23 ` Junio C Hamano
2009-02-22 23:03 ` Jeff King
0 siblings, 2 replies; 7+ messages in thread
From: eletuchy @ 2009-02-20 22:51 UTC (permalink / raw)
To: gitster, git; +Cc: peff, Eugene Letuchy
From: Eugene Letuchy <eugene@facebook.com>
Add the following:
- git config value blame.date that expects one of the git log date
formats ({relative,local,default,iso,rfc,short})
- git blame command line option --date expects one of the git
log date formats ({relative,local,default,iso,rfc,short})
- 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>
---
Documentation/blame-options.txt | 8 +++++
builtin-blame.c | 62 +++++++++++++++++++++++++++++----------
2 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 1ab1b96..ad00d36 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -63,6 +63,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).
+--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
diff --git a/builtin-blame.c b/builtin-blame.c
index 114a214..aa5c66c 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1,5 +1,5 @@
/*
- * Pickaxe
+ * Blame
*
* 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 enum date_mode blame_date_mode = DATE_ISO8601;
+static size_t blame_date_width;
+
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];
- 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);
- 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;
}
@@ -1975,6 +1975,9 @@ static int git_blame_config(const char *var, const char *value, void *cb)
blank_boundary = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "blame.date") && value[0]) {
+ blame_date_mode = parse_date_format(value);
+ }
return git_default_config(var, value, cb);
}
@@ -2239,6 +2242,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
git_config(git_blame_config, NULL);
init_revisions(&revs, NULL);
+ revs.date_mode = blame_date_mode;
+
save_commit_buffer = 0;
dashdash_pos = 0;
@@ -2263,8 +2268,33 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
parse_done:
argc = parse_options_end(&ctx);
- if (cmd_is_annotate)
+ if (cmd_is_annotate) {
output_option |= OUTPUT_ANNOTATE_COMPAT;
+ blame_date_mode = DATE_ISO8601;
+ } else {
+ blame_date_mode = revs.date_mode;
+ }
+
+ 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_SHORT:
+ blame_date_width = sizeof("2006-10-19");
+ break;
+ case DATE_RELATIVE:
+ /* unfortunately "normal" is the fallback for "relative" */
+ /* blame_date_width = sizeof("14 minutes ago"); */
+ /* break; */
+ 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 |
--
1.6.2.rc1.14.g07c3.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Make git blame's date output format configurable, like git log
2009-02-20 22:51 [PATCH 1/2] Make git blame's date output format configurable, like git log eletuchy
@ 2009-02-22 17:23 ` Junio C Hamano
2009-02-22 23:03 ` Jeff King
1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2009-02-22 17:23 UTC (permalink / raw)
To: eletuchy; +Cc: git, peff, Eugene Letuchy
Looked sensible, queued.
Thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Make git blame's date output format configurable, like git log
2009-02-20 22:51 [PATCH 1/2] Make git blame's date output format configurable, like git log eletuchy
2009-02-22 17:23 ` Junio C Hamano
@ 2009-02-22 23:03 ` Jeff King
2009-02-23 9:09 ` Eugene Letuchy
2009-02-23 16:33 ` Junio C Hamano
1 sibling, 2 replies; 7+ messages in thread
From: Jeff King @ 2009-02-22 23:03 UTC (permalink / raw)
To: eletuchy; +Cc: gitster, git, Eugene Letuchy
On Fri, Feb 20, 2009 at 02:51:11PM -0800, eletuchy@gmail.com wrote:
> @@ -1975,6 +1975,9 @@ static int git_blame_config(const char *var, const char *value, void *cb)
> blank_boundary = git_config_bool(var, value);
> return 0;
> }
> + if (!strcmp(var, "blame.date") && value[0]) {
> + blame_date_mode = parse_date_format(value);
> + }
> return git_default_config(var, value, cb);
> }
When there is a config value we are expecting to have a value rather
than a boolean, we usually print an error rather than silently
discarding. IOW, something like this:
if (!strcmp(var, "blame.date")) {
if (!value)
return config_error_nonbool(var);
blame_date_mode = parse_date_format(value);
}
> + 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_SHORT:
> + blame_date_width = sizeof("2006-10-19");
> + break;
> + case DATE_RELATIVE:
> + /* unfortunately "normal" is the fallback for "relative" */
> + /* blame_date_width = sizeof("14 minutes ago"); */
> + /* break; */
> + 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 */
Maybe this should be a date_format_width() library function?
Other than that, the patch looks reasonable to me.
-Peff
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Make git blame's date output format configurable, like git log
2009-02-22 23:03 ` Jeff King
@ 2009-02-23 9:09 ` Eugene Letuchy
2009-02-24 5:00 ` Jeff King
2009-02-23 16:33 ` Junio C Hamano
1 sibling, 1 reply; 7+ messages in thread
From: Eugene Letuchy @ 2009-02-23 9:09 UTC (permalink / raw)
To: Jeff King; +Cc: gitster, git, Eugene Letuchy
On Sun, Feb 22, 2009 at 3:03 PM, Jeff King <peff@peff.net> wrote:
> On Fri, Feb 20, 2009 at 02:51:11PM -0800, eletuchy@gmail.com wrote:
>
>> @@ -1975,6 +1975,9 @@ static int git_blame_config(const char *var, const char *value, void *cb)
>> blank_boundary = git_config_bool(var, value);
>> return 0;
>> }
>> + if (!strcmp(var, "blame.date") && value[0]) {
>> + blame_date_mode = parse_date_format(value);
>> + }
>> return git_default_config(var, value, cb);
>> }
>
> When there is a config value we are expecting to have a value rather
> than a boolean, we usually print an error rather than silently
> discarding. IOW, something like this:
>
> if (!strcmp(var, "blame.date")) {
> if (!value)
> return config_error_nonbool(var);
> blame_date_mode = parse_date_format(value);
> }
>
I'll make that change to the patch.
>> + 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_SHORT:
>> + blame_date_width = sizeof("2006-10-19");
>> + break;
>> + case DATE_RELATIVE:
>> + /* unfortunately "normal" is the fallback for "relative" */
>> + /* blame_date_width = sizeof("14 minutes ago"); */
>> + /* break; */
>> + 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 */
>
> Maybe this should be a date_format_width() library function?
>
I think that's a possible change, but unfortunately my next two
patches would not apply cleanly with a date_format_width change.
I'm a n00b with respect to git contribution, but is there a procedure
for pushing my blame_date branch remotely so that it's possible to
track a series of patches?
>
> Other than that, the patch looks reasonable to me.
>
> -Peff
>
--
Eugene
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Make git blame's date output format configurable, like git log
2009-02-22 23:03 ` Jeff King
2009-02-23 9:09 ` Eugene Letuchy
@ 2009-02-23 16:33 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2009-02-23 16:33 UTC (permalink / raw)
To: Jeff King; +Cc: eletuchy, gitster, git, Eugene Letuchy
Jeff King <peff@peff.net> writes:
> On Fri, Feb 20, 2009 at 02:51:11PM -0800, eletuchy@gmail.com wrote:
>
>> @@ -1975,6 +1975,9 @@ static int git_blame_config(const char *var, const char *value, void *cb)
>> blank_boundary = git_config_bool(var, value);
>> return 0;
>> }
>> + if (!strcmp(var, "blame.date") && value[0]) {
>> + blame_date_mode = parse_date_format(value);
>> + }
>> return git_default_config(var, value, cb);
>> }
>
> When there is a config value we are expecting to have a value rather
> than a boolean, we usually print an error rather than silently
> discarding.
Oops, missed that. Yes, this needs fixing.
Thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Make git blame's date output format configurable, like git log
2009-02-23 9:09 ` Eugene Letuchy
@ 2009-02-24 5:00 ` Jeff King
0 siblings, 0 replies; 7+ messages in thread
From: Jeff King @ 2009-02-24 5:00 UTC (permalink / raw)
To: Eugene Letuchy; +Cc: gitster, git, Eugene Letuchy
On Mon, Feb 23, 2009 at 01:09:13AM -0800, Eugene Letuchy wrote:
> > Maybe this should be a date_format_width() library function?
>
> I think that's a possible change, but unfortunately my next two
> patches would not apply cleanly with a date_format_width change.
>
> I'm a n00b with respect to git contribution, but is there a procedure
> for pushing my blame_date branch remotely so that it's possible to
> track a series of patches?
Updating previous work depends on whether it has been picked up in
'next' by Junio; once patches are there, they cannot be rewritten. In
that case, you can send a follow-up patch.
In your case, though, the patch is still in 'pu', so you can repost. So
I think it makes sense to use "rebase -i" (or the tool of your choice)
to make a cleaned up series, and then repost the whole thing as a
series.
-Peff
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] Make git blame's date output format configurable, like git log
2009-02-20 21:23 ` [PATCH] Make git blame date output format configurable, a la git log (take 2) eletuchy
@ 2009-02-20 21:23 ` eletuchy
0 siblings, 0 replies; 7+ messages in thread
From: eletuchy @ 2009-02-20 21:23 UTC (permalink / raw)
To: gitster; +Cc: git, eletuchy, Eugene Letuchy
From: Eugene Letuchy <eugene@facebook.com>
Add the following:
- git config value blame.date that expects one of the git log date
formats ({relative,local,default,iso,rfc,short})
- git blame command line option --date expects one of the git
log date formats ({relative,local,default,iso,rfc,short})
- 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>
---
Documentation/blame-options.txt | 8 +++++
builtin-blame.c | 62 +++++++++++++++++++++++++++++----------
2 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 1ab1b96..ad00d36 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -63,6 +63,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).
+--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
diff --git a/builtin-blame.c b/builtin-blame.c
index 114a214..aa5c66c 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1,5 +1,5 @@
/*
- * Pickaxe
+ * Blame
*
* 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 enum date_mode blame_date_mode = DATE_ISO8601;
+static size_t blame_date_width;
+
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];
- 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);
- 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;
}
@@ -1975,6 +1975,9 @@ static int git_blame_config(const char *var, const char *value, void *cb)
blank_boundary = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "blame.date") && value[0]) {
+ blame_date_mode = parse_date_format(value);
+ }
return git_default_config(var, value, cb);
}
@@ -2239,6 +2242,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
git_config(git_blame_config, NULL);
init_revisions(&revs, NULL);
+ revs.date_mode = blame_date_mode;
+
save_commit_buffer = 0;
dashdash_pos = 0;
@@ -2263,8 +2268,33 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
parse_done:
argc = parse_options_end(&ctx);
- if (cmd_is_annotate)
+ if (cmd_is_annotate) {
output_option |= OUTPUT_ANNOTATE_COMPAT;
+ blame_date_mode = DATE_ISO8601;
+ } else {
+ blame_date_mode = revs.date_mode;
+ }
+
+ 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_SHORT:
+ blame_date_width = sizeof("2006-10-19");
+ break;
+ case DATE_RELATIVE:
+ /* unfortunately "normal" is the fallback for "relative" */
+ /* blame_date_width = sizeof("14 minutes ago"); */
+ /* break; */
+ 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 |
--
1.6.2.rc1.14.g07c3.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-02-24 5:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-20 22:51 [PATCH 1/2] Make git blame's date output format configurable, like git log eletuchy
2009-02-22 17:23 ` Junio C Hamano
2009-02-22 23:03 ` Jeff King
2009-02-23 9:09 ` Eugene Letuchy
2009-02-24 5:00 ` Jeff King
2009-02-23 16:33 ` Junio C Hamano
[not found] <[PATCH] Make git blame date output format configurable, a la git log>
2009-02-20 21:23 ` [PATCH] Make git blame date output format configurable, a la git log (take 2) eletuchy
2009-02-20 21:23 ` [PATCH 1/2] Make git blame's date output format configurable, like git log eletuchy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.