[PATCH] Add --pretty=fuller

[PATCH] Add --pretty=fuller

[Junio C Hamano]

git log without --pretty showed author and author-date, while
with --pretty=full showed author and committer but no dates.
The new formatting option, --pretty=fuller, shows both name and
timestamp for author and committer.

Signed-off-by: Junio C Hamano <junkio@cox.net>

---

 * again, likes, dislikes, don't-cares?

 commit.c |   37 ++++++++++++++++++++++++++++++-------
 commit.h |    1 +
 2 files changed, 31 insertions(+), 7 deletions(-)

applies-to: 6466c53ae80cddbb581c5fdb2332f9321fade867
2155be5980310bac027d4719458e9f5d5975c334
diff --git a/commit.c b/commit.c
index a8c9bfc..534c03e 100644
--- a/commit.c
+++ b/commit.c
@@ -34,6 +34,8 @@ enum cmit_fmt get_commit_format(const ch
 		return CMIT_FMT_SHORT;
 	if (!strcmp(arg, "=full"))
 		return CMIT_FMT_FULL;
+	if (!strcmp(arg, "=fuller"))
+		return CMIT_FMT_FULLER;
 	if (!strcmp(arg, "=oneline"))
 		return CMIT_FMT_ONELINE;
 	die("invalid --pretty format");
@@ -361,6 +363,7 @@ static int add_user_info(const char *wha
 	int namelen;
 	unsigned long time;
 	int tz, ret;
+	const char *filler = "    ";
 
 	if (fmt == CMIT_FMT_ONELINE)
 		return 0;
@@ -371,9 +374,20 @@ static int add_user_info(const char *wha
 	time = strtoul(date, &date, 10);
 	tz = strtol(date, NULL, 10);
 
-	ret = sprintf(buf, "%s: %.*s\n", what, namelen, line);
-	if (fmt == CMIT_FMT_MEDIUM)
+	ret = sprintf(buf, "%s: %.*s%.*s\n", what,
+		      (fmt == CMIT_FMT_FULLER) ? 4 : 0,
+		      filler, namelen, line);
+	switch (fmt) {
+	case CMIT_FMT_MEDIUM:
 		ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
+		break;
+	case CMIT_FMT_FULLER:
+		ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
+		break;
+	default:
+		/* notin' */
+		break;
+	}
 	return ret;
 }
 
@@ -448,12 +462,21 @@ unsigned long pretty_print_commit(enum c
 					die("bad parent line in commit");
 				offset += add_parent_info(fmt, buf + offset, line, ++parents);
 			}
+
+			/*
+			 * MEDIUM == DEFAULT shows only author with dates.
+			 * FULL shows both authors but not dates.
+			 * FULLER shows both authors and dates.
+			 */
 			if (!memcmp(line, "author ", 7))
-				offset += add_user_info("Author", fmt, buf + offset, line + 7);
-			if (fmt == CMIT_FMT_FULL) {
-				if (!memcmp(line, "committer ", 10))
-					offset += add_user_info("Commit", fmt, buf + offset, line + 10);
-			}
+				offset += add_user_info("Author", fmt,
+							buf + offset,
+							line + 7);
+			if (!memcmp(line, "committer ", 10) &&
+			    (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
+				offset += add_user_info("Commit", fmt,
+							buf + offset,
+							line + 10);
 			continue;
 		}
 
diff --git a/commit.h b/commit.h
index 30702ca..6738a69 100644
--- a/commit.h
+++ b/commit.h
@@ -43,6 +43,7 @@ enum cmit_fmt {
 	CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
 	CMIT_FMT_SHORT,
 	CMIT_FMT_FULL,
+	CMIT_FMT_FULLER,
 	CMIT_FMT_ONELINE,
 };
 
---
0.99.9.GIT

Re: [PATCH] Add --pretty=fuller

[Johannes Schindelin]

Hi,

On Wed, 9 Nov 2005, Junio C Hamano wrote:

>  * again, likes, dislikes, don't-cares?

melikes.

On a side note: what would --pretty=fullest contain? ;-)

Ciao,
Dscho

Re: [PATCH] Add --pretty=fuller

[Andreas Ericsson]

Junio C Hamano wrote:
> git log without --pretty showed author and author-date, while
> with --pretty=full showed author and committer but no dates.
> The new formatting option, --pretty=fuller, shows both name and
> timestamp for author and committer.
> 
> Signed-off-by: Junio C Hamano <junkio@cox.net>
> 
> ---
> 
>  * again, likes, dislikes, don't-cares?
> 

Why not use:

--show=cdm,atn

for
Committer: date, mail
Author: timestamp,name

or

--show-author=date,timestamp,name
--show-committer=name,time
--show=name,date (for both author and committer)

or some such, with --pretty=<something> just a short-hand for those 
show-options?

We'll run out of superlatives really quickly if there are more author 
and committer info added sometime in the future, while the --show 
flag(s) can be extended more or less indefinitely.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Re: [PATCH] Add --pretty=fuller

[Jon Loeliger]

Andreas wrote:

> --show-author=date,timestamp,name
> --show-committer=name,time
> --show=name,date (for both author and committer)
> 
> or some such, with --pretty=<something> just a short-hand for those 
> show-options?

Which just looks like a candidate for the [log]
section of the config file to me.  Or is the "git log"
output needing to be standardized enough that this
level of flexability is a bad idea?  Dunno.

jdl