undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --pretty=fuller

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-11-09 22:15:27 -08:00
parent e3e291fc07
commit ff56fe1ca7
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
commit.c
View File

@ -34,6 +34,8 @@ enum cmit_fmt get_commit_format(const char *arg)
return CMIT_FMT_SHORT; return CMIT_FMT_SHORT;
if (!strcmp(arg, "=full")) if (!strcmp(arg, "=full"))
return CMIT_FMT_FULL; return CMIT_FMT_FULL;
if (!strcmp(arg, "=fuller"))
return CMIT_FMT_FULLER;
if (!strcmp(arg, "=oneline")) if (!strcmp(arg, "=oneline"))
return CMIT_FMT_ONELINE; return CMIT_FMT_ONELINE;
die("invalid --pretty format"); die("invalid --pretty format");
@ -361,6 +363,7 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
int namelen; int namelen;
unsigned long time; unsigned long time;
int tz, ret; int tz, ret;
const char *filler = " ";
if (fmt == CMIT_FMT_ONELINE) if (fmt == CMIT_FMT_ONELINE)
return 0; return 0;
@ -371,9 +374,20 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
time = strtoul(date, &date, 10); time = strtoul(date, &date, 10);
tz = strtol(date, NULL, 10); tz = strtol(date, NULL, 10);
ret = sprintf(buf, "%s: %.*s\n", what, namelen, line); ret = sprintf(buf, "%s: %.*s%.*s\n", what,
if (fmt == CMIT_FMT_MEDIUM) (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)); 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; return ret;
} }
@ -448,12 +462,21 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
die("bad parent line in commit"); die("bad parent line in commit");
offset += add_parent_info(fmt, buf + offset, line, ++parents); 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)) if (!memcmp(line, "author ", 7))
offset += add_user_info("Author", fmt, buf + offset, line + 7); offset += add_user_info("Author", fmt,
if (fmt == CMIT_FMT_FULL) { buf + offset,
if (!memcmp(line, "committer ", 10)) line + 7);
offset += add_user_info("Commit", fmt, buf + offset, line + 10); if (!memcmp(line, "committer ", 10) &&
} (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
offset += add_user_info("Commit", fmt,
buf + offset,
line + 10);
continue; continue;
} }

1
commit.h
View File

@ -43,6 +43,7 @@ enum cmit_fmt {
CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM, CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
CMIT_FMT_SHORT, CMIT_FMT_SHORT,
CMIT_FMT_FULL, CMIT_FMT_FULL,
CMIT_FMT_FULLER,
CMIT_FMT_ONELINE, CMIT_FMT_ONELINE,
}; };