Add --relative-date option to the revision interface

Exposes the infrastructure from 9a8e35e98793af086f05d1ca9643052df9b44a74.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index dd9fff16d3067fe939642170258fffc427c77729..a446a6b5a27067d25c1d32d97ccbbd9e59e3b754 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -128,6 +128,11 @@ OPTIONS
        After a failed merge, show refs that touch files having a
        conflict and don't exist on all heads to merge.
 
        After a failed merge, show refs that touch files having a
        conflict and don't exist on all heads to merge.
 

+--relative-date::
+       Show dates relative to the current time, e.g. "2 hours ago".
+       Only takes effect for dates shown in human-readable format,
+       such as when using "--pretty".
+

 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 7f3e1fcfb34810285815f97979e8078e2ad6209d..402af8e1b5516143c5f4e2303abf05d2812c5a1c 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -85,7 +85,7 @@ static void show_commit(struct commit *commit)
                static char pretty_header[16384];
                pretty_print_commit(revs.commit_format, commit, ~0,
                                    pretty_header, sizeof(pretty_header),
                static char pretty_header[16384];
                pretty_print_commit(revs.commit_format, commit, ~0,
                                    pretty_header, sizeof(pretty_header),

-                                   revs.abbrev, NULL, NULL);
+                                   revs.abbrev, NULL, NULL, revs.relative_date);

                printf("%s%c", pretty_header, hdr_termination);
        }
        fflush(stdout);
                printf("%s%c", pretty_header, hdr_termination);
        }
        fflush(stdout);

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 18786f88e3252dbd46d88014f2f35205c53d5200..d7de18ec0b0ace327616f2bde6ab5cdefad8dd04 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -261,7 +261,7 @@ static void show_one_commit(struct commit *commit, int no_name)
        struct commit_name *name = commit->util;
        if (commit->object.parsed)
                pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
        struct commit_name *name = commit->util;
        if (commit->object.parsed)
                pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,

-                                   pretty, sizeof(pretty), 0, NULL, NULL);
+                                   pretty, sizeof(pretty), 0, NULL, NULL, 0);

        else
                strcpy(pretty, "(unavailable)");
        if (!strncmp(pretty, "[PATCH] ", 8))
        else
                strcpy(pretty, "(unavailable)");
        if (!strncmp(pretty, "[PATCH] ", 8))

diff --git a/commit.c b/commit.c
index c3ff9b4175c00a600ae25f9dc90eb521d7053719..5b6e082c85f203cf27ac5b50f2d06a18b36fdc70 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -467,7 +467,8 @@ static int add_rfc2047(char *buf, const char *line, int len)
        return bp - buf;
 }
 
        return bp - buf;
 }
 

-static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
+static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
+                        const char *line, int relative_date)

 {
        char *date;
        int namelen;
 {
        char *date;
        int namelen;


@@ -507,14 +508,16 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
        }
        switch (fmt) {
        case CMIT_FMT_MEDIUM:
        }
        switch (fmt) {
        case CMIT_FMT_MEDIUM:

-               ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz, 0));
+               ret += sprintf(buf + ret, "Date:   %s\n",
+                              show_date(time, tz, relative_date));

                break;
        case CMIT_FMT_EMAIL:
                ret += sprintf(buf + ret, "Date: %s\n",
                               show_rfc2822_date(time, tz));
                break;
        case CMIT_FMT_FULLER:
                break;
        case CMIT_FMT_EMAIL:
                ret += sprintf(buf + ret, "Date: %s\n",
                               show_rfc2822_date(time, tz));
                break;
        case CMIT_FMT_FULLER:

-               ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz, 0));
+               ret += sprintf(buf + ret, "%sDate: %s\n", what,
+                              show_date(time, tz, relative_date));

                break;
        default:
                /* notin' */
                break;
        default:
                /* notin' */


@@ -557,7 +560,10 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
        return offset;
 }
 
        return offset;
 }
 

-unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
+                                 unsigned long len, char *buf, unsigned long space,
+                                 int abbrev, const char *subject,
+                                 const char *after_subject, int relative_date)

 {
        int hdr = 1, body = 0;
        unsigned long offset = 0;
 {
        int hdr = 1, body = 0;
        unsigned long offset = 0;


@@ -646,12 +652,14 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
                        if (!memcmp(line, "author ", 7))
                                offset += add_user_info("Author", fmt,
                                                        buf + offset,
                        if (!memcmp(line, "author ", 7))
                                offset += add_user_info("Author", fmt,
                                                        buf + offset,

-                                                       line + 7);
+                                                       line + 7,
+                                                       relative_date);

                        if (!memcmp(line, "committer ", 10) &&
                            (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
                                offset += add_user_info("Commit", fmt,
                                                        buf + offset,
                        if (!memcmp(line, "committer ", 10) &&
                            (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
                                offset += add_user_info("Commit", fmt,
                                                        buf + offset,

-                                                       line + 10);
+                                                       line + 10,
+                                                       relative_date);

                        continue;
                }
 
                        continue;
                }
 

diff --git a/commit.h b/commit.h
index 779ed82ed0ce2fb1a643b1cfa0ffe0fd3107ed09..fc13de9780f98c3bd9f330ef6177fd47a4da3d80 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -52,7 +52,7 @@ enum cmit_fmt {
 };
 
 extern enum cmit_fmt get_commit_format(const char *arg);
 };
 
 extern enum cmit_fmt get_commit_format(const char *arg);

-extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject);
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject, int relative_date);

 
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.
 
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.

diff --git a/log-tree.c b/log-tree.c
index 031af88933fe1b21de2da701855b9e9604121d3c..54cdaa4d81db3acc1150a558dc244f2a88b5cdbc 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -194,7 +194,9 @@ void show_log(struct rev_info *opt, const char *sep)
        /*
         * And then the pretty-printed message itself
         */
        /*
         * And then the pretty-printed message itself
         */

-       len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, extra_headers);
+       len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header,
+                                 sizeof(this_header), abbrev, subject,
+                                 extra_headers, opt->relative_date);

 
        if (opt->add_signoff)
                len = append_signoff(this_header, sizeof(this_header), len,
 
        if (opt->add_signoff)
                len = append_signoff(this_header, sizeof(this_header), len,

diff --git a/revision.c b/revision.c
index 1d89d72738ff917d29373d50c2c2cc9bbd10b2c0..b588f7487035027755954575f922afee99651662 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -816,6 +816,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                revs->simplify_history = 0;
                                continue;
                        }
                                revs->simplify_history = 0;
                                continue;
                        }

+                       if (!strcmp(arg, "--relative-date")) {
+                               revs->relative_date = 1;
+                               continue;
+                       }

                        opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
                        if (opts > 0) {
                                revs->diff = 1;
                        opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
                        if (opts > 0) {
                                revs->diff = 1;

diff --git a/revision.h b/revision.h
index 0c3b8d99059fb272b913a85c2873f5fef64acc00..d289781051c523c7e1596c6e215625616d51f088 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -55,7 +55,8 @@ struct rev_info {
 
        /* Format info */
        unsigned int    shown_one:1,
 
        /* Format info */
        unsigned int    shown_one:1,

-                       abbrev_commit:1;
+                       abbrev_commit:1,
+                       relative_date:1;

        unsigned int    abbrev;
        enum cmit_fmt   commit_format;
        struct log_info *loginfo;
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;
        struct log_info *loginfo;