2007-11-04 19:15:06 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "utf8.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
2008-07-21 18:03:49 +00:00
|
|
|
#include "string-list.h"
|
2008-07-11 23:28:18 +00:00
|
|
|
#include "mailmap.h"
|
2008-09-04 21:40:03 +00:00
|
|
|
#include "log-tree.h"
|
expand --pretty=format color options
Currently, the only colors available to --pretty=format
users are red, green, and blue. Rather than expand it with a
few new colors, this patch makes the usual config color
syntax available, including more colors, backgrounds, and
attributes.
Because colors are no longer bounded to a single word (e.g.,
%Cred), this uses a more advanced syntax that features a
beginning and end delimiter (but the old syntax still
works). So you can now do:
git log --pretty=tformat:'%C(yellow)%h%C(reset) %s'
to emulate --pretty=oneline, or even
git log --pretty=tformat:'%C(cyan magenta bold)%s%C(reset)'
if you want to relive the awesomeness of 4-color CGA.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-17 15:38:46 +00:00
|
|
|
#include "color.h"
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
static char *user_format;
|
|
|
|
|
2008-04-08 00:11:34 +00:00
|
|
|
void get_commit_format(const char *arg, struct rev_info *rev)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
|
|
|
int i;
|
2008-04-08 00:11:34 +00:00
|
|
|
static struct cmt_fmt_map {
|
|
|
|
const char *n;
|
|
|
|
size_t cmp_len;
|
|
|
|
enum cmit_fmt v;
|
|
|
|
} cmt_fmts[] = {
|
|
|
|
{ "raw", 1, CMIT_FMT_RAW },
|
|
|
|
{ "medium", 1, CMIT_FMT_MEDIUM },
|
|
|
|
{ "short", 1, CMIT_FMT_SHORT },
|
|
|
|
{ "email", 1, CMIT_FMT_EMAIL },
|
|
|
|
{ "full", 5, CMIT_FMT_FULL },
|
|
|
|
{ "fuller", 5, CMIT_FMT_FULLER },
|
|
|
|
{ "oneline", 1, CMIT_FMT_ONELINE },
|
|
|
|
};
|
2007-11-04 19:15:06 +00:00
|
|
|
|
2008-04-08 00:11:34 +00:00
|
|
|
rev->use_terminator = 0;
|
|
|
|
if (!arg || !*arg) {
|
|
|
|
rev->commit_format = CMIT_FMT_DEFAULT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
|
|
|
|
const char *cp = strchr(arg, ':') + 1;
|
Avoid unnecessary "if-before-free" tests.
This change removes all obvious useless if-before-free tests.
E.g., it replaces code like this:
if (some_expression)
free (some_expression);
with the now-equivalent:
free (some_expression);
It is equivalent not just because POSIX has required free(NULL)
to work for a long time, but simply because it has worked for
so long that no reasonable porting target fails the test.
Here's some evidence from nearly 1.5 years ago:
http://www.winehq.org/pipermail/wine-patches/2006-October/031544.html
FYI, the change below was prepared by running the following:
git ls-files -z | xargs -0 \
perl -0x3b -pi -e \
's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s+(free\s*\(\s*\1\s*\))/$2/s'
Note however, that it doesn't handle brace-enclosed blocks like
"if (x) { free (x); }". But that's ok, since there were none like
that in git sources.
Beware: if you do use the above snippet, note that it can
produce syntactically invalid C code. That happens when the
affected "if"-statement has a matching "else".
E.g., it would transform this
if (x)
free (x);
else
foo ();
into this:
free (x);
else
foo ();
There were none of those here, either.
If you're interested in automating detection of the useless
tests, you might like the useless-if-before-free script in gnulib:
[it *does* detect brace-enclosed free statements, and has a --name=S
option to make it detect free-like functions with different names]
http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=build-aux/useless-if-before-free
Addendum:
Remove one more (in imap-send.c), spotted by Jean-Luc Herren <jlh@gmx.ch>.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-01-31 17:26:32 +00:00
|
|
|
free(user_format);
|
2008-04-08 00:11:34 +00:00
|
|
|
user_format = xstrdup(cp);
|
|
|
|
if (arg[0] == 't')
|
|
|
|
rev->use_terminator = 1;
|
|
|
|
rev->commit_format = CMIT_FMT_USERFORMAT;
|
|
|
|
return;
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
|
|
|
|
if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
|
2008-04-08 00:11:34 +00:00
|
|
|
!strncmp(arg, cmt_fmts[i].n, strlen(arg))) {
|
|
|
|
if (cmt_fmts[i].v == CMIT_FMT_ONELINE)
|
|
|
|
rev->use_terminator = 1;
|
|
|
|
rev->commit_format = cmt_fmts[i].v;
|
|
|
|
return;
|
|
|
|
}
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
die("invalid --pretty format: %s", arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Generic support for pretty-printing the header
|
|
|
|
*/
|
|
|
|
static int get_one_line(const char *msg)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
char c = *msg++;
|
|
|
|
if (!c)
|
|
|
|
break;
|
|
|
|
ret++;
|
|
|
|
if (c == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* High bit set, or ISO-2022-INT */
|
|
|
|
int non_ascii(int ch)
|
|
|
|
{
|
|
|
|
ch = (ch & 0xff);
|
|
|
|
return ((ch & 0x80) || (ch == 0x1b));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_rfc2047_special(char ch)
|
|
|
|
{
|
|
|
|
return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_rfc2047(struct strbuf *sb, const char *line, int len,
|
|
|
|
const char *encoding)
|
|
|
|
{
|
|
|
|
int i, last;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
int ch = line[i];
|
|
|
|
if (non_ascii(ch))
|
|
|
|
goto needquote;
|
|
|
|
if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
|
|
|
|
goto needquote;
|
|
|
|
}
|
|
|
|
strbuf_add(sb, line, len);
|
|
|
|
return;
|
|
|
|
|
|
|
|
needquote:
|
|
|
|
strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
|
|
|
|
strbuf_addf(sb, "=?%s?q?", encoding);
|
|
|
|
for (i = last = 0; i < len; i++) {
|
|
|
|
unsigned ch = line[i] & 0xFF;
|
|
|
|
/*
|
|
|
|
* We encode ' ' using '=20' even though rfc2047
|
|
|
|
* allows using '_' for readability. Unfortunately,
|
|
|
|
* many programs do not understand this and just
|
|
|
|
* leave the underscore in place.
|
|
|
|
*/
|
|
|
|
if (is_rfc2047_special(ch) || ch == ' ') {
|
|
|
|
strbuf_add(sb, line + last, i - last);
|
|
|
|
strbuf_addf(sb, "=%02X", ch);
|
|
|
|
last = i + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
strbuf_add(sb, line + last, len - last);
|
|
|
|
strbuf_addstr(sb, "?=");
|
|
|
|
}
|
|
|
|
|
2008-02-19 03:56:08 +00:00
|
|
|
void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
|
|
|
|
const char *line, enum date_mode dmode,
|
|
|
|
const char *encoding)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
|
|
|
char *date;
|
|
|
|
int namelen;
|
|
|
|
unsigned long time;
|
|
|
|
int tz;
|
|
|
|
const char *filler = " ";
|
|
|
|
|
|
|
|
if (fmt == CMIT_FMT_ONELINE)
|
|
|
|
return;
|
|
|
|
date = strchr(line, '>');
|
|
|
|
if (!date)
|
|
|
|
return;
|
|
|
|
namelen = ++date - line;
|
|
|
|
time = strtoul(date, &date, 10);
|
|
|
|
tz = strtol(date, NULL, 10);
|
|
|
|
|
|
|
|
if (fmt == CMIT_FMT_EMAIL) {
|
|
|
|
char *name_tail = strchr(line, '<');
|
|
|
|
int display_name_length;
|
|
|
|
if (!name_tail)
|
|
|
|
return;
|
|
|
|
while (line < name_tail && isspace(name_tail[-1]))
|
|
|
|
name_tail--;
|
|
|
|
display_name_length = name_tail - line;
|
|
|
|
filler = "";
|
|
|
|
strbuf_addstr(sb, "From: ");
|
|
|
|
add_rfc2047(sb, line, display_name_length, encoding);
|
|
|
|
strbuf_add(sb, name_tail, namelen - display_name_length);
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
} else {
|
|
|
|
strbuf_addf(sb, "%s: %.*s%.*s\n", what,
|
|
|
|
(fmt == CMIT_FMT_FULLER) ? 4 : 0,
|
|
|
|
filler, namelen, line);
|
|
|
|
}
|
|
|
|
switch (fmt) {
|
|
|
|
case CMIT_FMT_MEDIUM:
|
|
|
|
strbuf_addf(sb, "Date: %s\n", show_date(time, tz, dmode));
|
|
|
|
break;
|
|
|
|
case CMIT_FMT_EMAIL:
|
|
|
|
strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
|
|
|
|
break;
|
|
|
|
case CMIT_FMT_FULLER:
|
|
|
|
strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, dmode));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* notin' */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_empty_line(const char *line, int *len_p)
|
|
|
|
{
|
|
|
|
int len = *len_p;
|
|
|
|
while (len && isspace(line[len-1]))
|
|
|
|
len--;
|
|
|
|
*len_p = len;
|
|
|
|
return !len;
|
|
|
|
}
|
|
|
|
|
2008-12-27 00:32:49 +00:00
|
|
|
static const char *skip_empty_lines(const char *msg)
|
|
|
|
{
|
|
|
|
for (;;) {
|
|
|
|
int linelen = get_one_line(msg);
|
|
|
|
int ll = linelen;
|
|
|
|
if (!linelen)
|
|
|
|
break;
|
|
|
|
if (!is_empty_line(msg, &ll))
|
|
|
|
break;
|
|
|
|
msg += linelen;
|
|
|
|
}
|
|
|
|
return msg;
|
|
|
|
}
|
|
|
|
|
2007-11-04 19:15:06 +00:00
|
|
|
static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
|
|
|
|
const struct commit *commit, int abbrev)
|
|
|
|
{
|
|
|
|
struct commit_list *parent = commit->parents;
|
|
|
|
|
|
|
|
if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
|
|
|
|
!parent || !parent->next)
|
|
|
|
return;
|
|
|
|
|
|
|
|
strbuf_addstr(sb, "Merge:");
|
|
|
|
|
|
|
|
while (parent) {
|
|
|
|
struct commit *p = parent->item;
|
|
|
|
const char *hex = NULL;
|
|
|
|
if (abbrev)
|
|
|
|
hex = find_unique_abbrev(p->object.sha1, abbrev);
|
|
|
|
if (!hex)
|
|
|
|
hex = sha1_to_hex(p->object.sha1);
|
|
|
|
parent = parent->next;
|
|
|
|
|
2009-02-13 22:10:41 +00:00
|
|
|
strbuf_addf(sb, " %s", hex);
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *get_header(const struct commit *commit, const char *key)
|
|
|
|
{
|
|
|
|
int key_len = strlen(key);
|
|
|
|
const char *line = commit->buffer;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
const char *eol = strchr(line, '\n'), *next;
|
|
|
|
|
|
|
|
if (line == eol)
|
|
|
|
return NULL;
|
|
|
|
if (!eol) {
|
|
|
|
eol = line + strlen(line);
|
|
|
|
next = NULL;
|
|
|
|
} else
|
|
|
|
next = eol + 1;
|
|
|
|
if (eol - line > key_len &&
|
|
|
|
!strncmp(line, key, key_len) &&
|
|
|
|
line[key_len] == ' ') {
|
|
|
|
return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
|
|
|
|
}
|
|
|
|
line = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *replace_encoding_header(char *buf, const char *encoding)
|
|
|
|
{
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf tmp = STRBUF_INIT;
|
2007-11-04 19:15:06 +00:00
|
|
|
size_t start, len;
|
|
|
|
char *cp = buf;
|
|
|
|
|
|
|
|
/* guess if there is an encoding header before a \n\n */
|
|
|
|
while (strncmp(cp, "encoding ", strlen("encoding "))) {
|
|
|
|
cp = strchr(cp, '\n');
|
|
|
|
if (!cp || *++cp == '\n')
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
start = cp - buf;
|
|
|
|
cp = strchr(cp, '\n');
|
|
|
|
if (!cp)
|
|
|
|
return buf; /* should not happen but be defensive */
|
|
|
|
len = cp + 1 - (buf + start);
|
|
|
|
|
|
|
|
strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
|
|
|
|
if (is_encoding_utf8(encoding)) {
|
|
|
|
/* we have re-coded to UTF-8; drop the header */
|
|
|
|
strbuf_remove(&tmp, start, len);
|
|
|
|
} else {
|
|
|
|
/* just replaces XXXX in 'encoding XXXX\n' */
|
|
|
|
strbuf_splice(&tmp, start + strlen("encoding "),
|
|
|
|
len - strlen("encoding \n"),
|
|
|
|
encoding, strlen(encoding));
|
|
|
|
}
|
|
|
|
return strbuf_detach(&tmp, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *logmsg_reencode(const struct commit *commit,
|
|
|
|
const char *output_encoding)
|
|
|
|
{
|
|
|
|
static const char *utf8 = "utf-8";
|
|
|
|
const char *use_encoding;
|
|
|
|
char *encoding;
|
|
|
|
char *out;
|
|
|
|
|
|
|
|
if (!*output_encoding)
|
|
|
|
return NULL;
|
|
|
|
encoding = get_header(commit, "encoding");
|
|
|
|
use_encoding = encoding ? encoding : utf8;
|
|
|
|
if (!strcmp(use_encoding, output_encoding))
|
|
|
|
if (encoding) /* we'll strip encoding header later */
|
|
|
|
out = xstrdup(commit->buffer);
|
|
|
|
else
|
|
|
|
return NULL; /* nothing to do */
|
|
|
|
else
|
|
|
|
out = reencode_string(commit->buffer,
|
|
|
|
output_encoding, use_encoding);
|
|
|
|
if (out)
|
|
|
|
out = replace_encoding_header(out, output_encoding);
|
|
|
|
|
|
|
|
free(encoding);
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
2009-02-08 14:34:30 +00:00
|
|
|
static int mailmap_name(char *email, int email_len, char *name, int name_len)
|
2008-07-11 23:28:18 +00:00
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
static struct string_list *mail_map;
|
2008-07-11 23:28:18 +00:00
|
|
|
if (!mail_map) {
|
|
|
|
mail_map = xcalloc(1, sizeof(*mail_map));
|
2009-02-08 14:34:27 +00:00
|
|
|
read_mailmap(mail_map, NULL);
|
2008-07-11 23:28:18 +00:00
|
|
|
}
|
2009-02-08 14:34:30 +00:00
|
|
|
return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
|
2008-07-11 23:28:18 +00:00
|
|
|
}
|
|
|
|
|
2008-02-09 14:40:19 +00:00
|
|
|
static size_t format_person_part(struct strbuf *sb, char part,
|
2008-08-29 00:54:59 +00:00
|
|
|
const char *msg, int len, enum date_mode dmode)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
2008-02-09 14:40:19 +00:00
|
|
|
/* currently all placeholders have same length */
|
|
|
|
const int placeholder_len = 2;
|
2007-11-04 19:15:06 +00:00
|
|
|
int start, end, tz = 0;
|
2008-02-09 14:40:19 +00:00
|
|
|
unsigned long date = 0;
|
2007-11-04 19:15:06 +00:00
|
|
|
char *ep;
|
2009-02-08 14:34:30 +00:00
|
|
|
const char *name_start, *name_end, *mail_start, *mail_end, *msg_end = msg+len;
|
|
|
|
char person_name[1024];
|
|
|
|
char person_mail[1024];
|
2007-11-04 19:15:06 +00:00
|
|
|
|
2008-02-09 14:40:19 +00:00
|
|
|
/* advance 'end' to point to email start delimiter */
|
2007-11-04 19:15:06 +00:00
|
|
|
for (end = 0; end < len && msg[end] != '<'; end++)
|
|
|
|
; /* do nothing */
|
2008-02-09 14:40:19 +00:00
|
|
|
|
2008-01-06 12:21:07 +00:00
|
|
|
/*
|
2008-02-09 14:40:19 +00:00
|
|
|
* When end points at the '<' that we found, it should have
|
|
|
|
* matching '>' later, which means 'end' must be strictly
|
|
|
|
* below len - 1.
|
2008-01-06 12:21:07 +00:00
|
|
|
*/
|
2008-02-09 14:40:19 +00:00
|
|
|
if (end >= len - 2)
|
|
|
|
goto skip;
|
|
|
|
|
2009-02-08 14:34:30 +00:00
|
|
|
/* Seek for both name and email part */
|
|
|
|
name_start = msg;
|
|
|
|
name_end = msg+end;
|
|
|
|
while (name_end > name_start && isspace(*(name_end-1)))
|
|
|
|
name_end--;
|
|
|
|
mail_start = msg+end+1;
|
|
|
|
mail_end = mail_start;
|
|
|
|
while (mail_end < msg_end && *mail_end != '>')
|
|
|
|
mail_end++;
|
|
|
|
if (mail_end == msg_end)
|
|
|
|
goto skip;
|
|
|
|
end = mail_end-msg;
|
|
|
|
|
|
|
|
if (part == 'N' || part == 'E') { /* mailmap lookup */
|
|
|
|
strlcpy(person_name, name_start, name_end-name_start+1);
|
|
|
|
strlcpy(person_mail, mail_start, mail_end-mail_start+1);
|
|
|
|
mailmap_name(person_mail, sizeof(person_mail), person_name, sizeof(person_name));
|
|
|
|
name_start = person_name;
|
|
|
|
name_end = name_start + strlen(person_name);
|
|
|
|
mail_start = person_mail;
|
|
|
|
mail_end = mail_start + strlen(person_mail);
|
|
|
|
}
|
2008-07-11 23:28:18 +00:00
|
|
|
if (part == 'n' || part == 'N') { /* name */
|
2009-02-08 14:34:30 +00:00
|
|
|
strbuf_add(sb, name_start, name_end-name_start);
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
2009-02-08 14:34:30 +00:00
|
|
|
if (part == 'e' || part == 'E') { /* email */
|
|
|
|
strbuf_add(sb, mail_start, mail_end-mail_start);
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
2007-11-04 19:15:06 +00:00
|
|
|
|
2008-02-09 14:40:19 +00:00
|
|
|
/* advance 'start' to point to date start delimiter */
|
2007-11-04 19:15:06 +00:00
|
|
|
for (start = end + 1; start < len && isspace(msg[start]); start++)
|
|
|
|
; /* do nothing */
|
|
|
|
if (start >= len)
|
2008-02-09 14:40:19 +00:00
|
|
|
goto skip;
|
2007-11-04 19:15:06 +00:00
|
|
|
date = strtoul(msg + start, &ep, 10);
|
|
|
|
if (msg + start == ep)
|
2008-02-09 14:40:19 +00:00
|
|
|
goto skip;
|
2007-11-04 19:15:06 +00:00
|
|
|
|
2007-11-09 00:49:42 +00:00
|
|
|
if (part == 't') { /* date, UNIX timestamp */
|
|
|
|
strbuf_add(sb, msg + start, ep - (msg + start));
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
/* parse tz */
|
|
|
|
for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
|
|
|
|
; /* do nothing */
|
|
|
|
if (start + 1 < len) {
|
|
|
|
tz = strtoul(msg + start + 1, NULL, 10);
|
|
|
|
if (msg[start] == '-')
|
|
|
|
tz = -tz;
|
|
|
|
}
|
|
|
|
|
2007-11-09 00:49:42 +00:00
|
|
|
switch (part) {
|
|
|
|
case 'd': /* date */
|
2008-08-29 00:54:59 +00:00
|
|
|
strbuf_addstr(sb, show_date(date, tz, dmode));
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'D': /* date, RFC2822 style */
|
|
|
|
strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'r': /* date, relative */
|
|
|
|
strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'i': /* date, ISO 8601 */
|
|
|
|
strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
|
2008-02-09 14:40:19 +00:00
|
|
|
return placeholder_len;
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
2008-02-09 14:40:19 +00:00
|
|
|
|
|
|
|
skip:
|
|
|
|
/*
|
|
|
|
* bogus commit, 'sb' cannot be updated, but we still need to
|
|
|
|
* compute a valid return value.
|
|
|
|
*/
|
|
|
|
if (part == 'n' || part == 'e' || part == 't' || part == 'd'
|
|
|
|
|| part == 'D' || part == 'r' || part == 'i')
|
|
|
|
return placeholder_len;
|
|
|
|
|
|
|
|
return 0; /* unknown placeholder */
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
|
2007-11-10 11:14:20 +00:00
|
|
|
struct chunk {
|
|
|
|
size_t off;
|
|
|
|
size_t len;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct format_commit_context {
|
|
|
|
const struct commit *commit;
|
2008-08-29 00:54:59 +00:00
|
|
|
enum date_mode dmode;
|
2008-12-27 00:49:21 +00:00
|
|
|
unsigned commit_header_parsed:1;
|
|
|
|
unsigned commit_message_parsed:1;
|
2007-11-10 11:14:20 +00:00
|
|
|
|
|
|
|
/* These offsets are relative to the start of the commit message. */
|
|
|
|
struct chunk author;
|
|
|
|
struct chunk committer;
|
|
|
|
struct chunk encoding;
|
2008-12-27 00:49:21 +00:00
|
|
|
size_t message_off;
|
|
|
|
size_t subject_off;
|
2007-11-10 11:14:20 +00:00
|
|
|
size_t body_off;
|
2007-11-10 11:18:26 +00:00
|
|
|
|
|
|
|
/* The following ones are relative to the result struct strbuf. */
|
|
|
|
struct chunk abbrev_commit_hash;
|
|
|
|
struct chunk abbrev_tree_hash;
|
|
|
|
struct chunk abbrev_parent_hashes;
|
2007-11-10 11:14:20 +00:00
|
|
|
};
|
|
|
|
|
2007-11-10 11:18:26 +00:00
|
|
|
static int add_again(struct strbuf *sb, struct chunk *chunk)
|
|
|
|
{
|
|
|
|
if (chunk->len) {
|
|
|
|
strbuf_adddup(sb, chunk->off, chunk->len);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We haven't seen this chunk before. Our caller is surely
|
|
|
|
* going to add it the hard way now. Remember the most likely
|
|
|
|
* start of the to-be-added chunk: the current end of the
|
|
|
|
* struct strbuf.
|
|
|
|
*/
|
|
|
|
chunk->off = sb->len;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-10 11:14:20 +00:00
|
|
|
static void parse_commit_header(struct format_commit_context *context)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
2007-11-10 11:14:20 +00:00
|
|
|
const char *msg = context->commit->buffer;
|
2007-11-04 19:15:06 +00:00
|
|
|
int i;
|
2007-11-10 11:14:20 +00:00
|
|
|
|
2008-12-27 00:49:21 +00:00
|
|
|
for (i = 0; msg[i]; i++) {
|
2007-11-10 11:14:20 +00:00
|
|
|
int eol;
|
|
|
|
for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
|
|
|
|
; /* do nothing */
|
|
|
|
|
|
|
|
if (i == eol) {
|
2008-12-27 00:49:21 +00:00
|
|
|
break;
|
2007-11-10 11:14:20 +00:00
|
|
|
} else if (!prefixcmp(msg + i, "author ")) {
|
|
|
|
context->author.off = i + 7;
|
|
|
|
context->author.len = eol - i - 7;
|
|
|
|
} else if (!prefixcmp(msg + i, "committer ")) {
|
|
|
|
context->committer.off = i + 10;
|
|
|
|
context->committer.len = eol - i - 10;
|
|
|
|
} else if (!prefixcmp(msg + i, "encoding ")) {
|
|
|
|
context->encoding.off = i + 9;
|
|
|
|
context->encoding.len = eol - i - 9;
|
|
|
|
}
|
|
|
|
i = eol;
|
|
|
|
}
|
2008-12-27 00:49:21 +00:00
|
|
|
context->message_off = i;
|
2007-11-10 11:14:20 +00:00
|
|
|
context->commit_header_parsed = 1;
|
|
|
|
}
|
|
|
|
|
2009-01-06 20:41:06 +00:00
|
|
|
const char *format_subject(struct strbuf *sb, const char *msg,
|
|
|
|
const char *line_separator)
|
2008-12-27 00:39:35 +00:00
|
|
|
{
|
|
|
|
int first = 1;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
const char *line = msg;
|
|
|
|
int linelen = get_one_line(line);
|
|
|
|
|
|
|
|
msg += linelen;
|
|
|
|
if (!linelen || is_empty_line(line, &linelen))
|
|
|
|
break;
|
|
|
|
|
2008-12-27 00:49:21 +00:00
|
|
|
if (!sb)
|
|
|
|
continue;
|
2008-12-27 00:39:35 +00:00
|
|
|
strbuf_grow(sb, linelen + 2);
|
|
|
|
if (!first)
|
|
|
|
strbuf_addstr(sb, line_separator);
|
|
|
|
strbuf_add(sb, line, linelen);
|
|
|
|
first = 0;
|
|
|
|
}
|
|
|
|
return msg;
|
|
|
|
}
|
|
|
|
|
2008-12-27 00:49:21 +00:00
|
|
|
static void parse_commit_message(struct format_commit_context *c)
|
|
|
|
{
|
|
|
|
const char *msg = c->commit->buffer + c->message_off;
|
|
|
|
const char *start = c->commit->buffer;
|
|
|
|
|
|
|
|
msg = skip_empty_lines(msg);
|
|
|
|
c->subject_off = msg - start;
|
|
|
|
|
|
|
|
msg = format_subject(NULL, msg, NULL);
|
|
|
|
msg = skip_empty_lines(msg);
|
|
|
|
c->body_off = msg - start;
|
|
|
|
|
|
|
|
c->commit_message_parsed = 1;
|
|
|
|
}
|
|
|
|
|
2008-09-04 21:40:03 +00:00
|
|
|
static void format_decoration(struct strbuf *sb, const struct commit *commit)
|
|
|
|
{
|
|
|
|
struct name_decoration *d;
|
|
|
|
const char *prefix = " (";
|
|
|
|
|
|
|
|
load_ref_decorations();
|
|
|
|
d = lookup_decoration(&name_decoration, &commit->object);
|
|
|
|
while (d) {
|
|
|
|
strbuf_addstr(sb, prefix);
|
|
|
|
prefix = ", ";
|
|
|
|
strbuf_addstr(sb, d->name);
|
|
|
|
d = d->next;
|
|
|
|
}
|
|
|
|
if (prefix[0] == ',')
|
|
|
|
strbuf_addch(sb, ')');
|
|
|
|
}
|
|
|
|
|
2008-02-09 14:40:19 +00:00
|
|
|
static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
|
2007-11-10 11:14:20 +00:00
|
|
|
void *context)
|
|
|
|
{
|
|
|
|
struct format_commit_context *c = context;
|
|
|
|
const struct commit *commit = c->commit;
|
2007-11-04 19:15:06 +00:00
|
|
|
const char *msg = commit->buffer;
|
2007-11-10 11:14:20 +00:00
|
|
|
struct commit_list *p;
|
2008-03-21 15:05:06 +00:00
|
|
|
int h1, h2;
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
/* these are independent of the commit */
|
2007-11-09 00:49:42 +00:00
|
|
|
switch (placeholder[0]) {
|
|
|
|
case 'C':
|
expand --pretty=format color options
Currently, the only colors available to --pretty=format
users are red, green, and blue. Rather than expand it with a
few new colors, this patch makes the usual config color
syntax available, including more colors, backgrounds, and
attributes.
Because colors are no longer bounded to a single word (e.g.,
%Cred), this uses a more advanced syntax that features a
beginning and end delimiter (but the old syntax still
works). So you can now do:
git log --pretty=tformat:'%C(yellow)%h%C(reset) %s'
to emulate --pretty=oneline, or even
git log --pretty=tformat:'%C(cyan magenta bold)%s%C(reset)'
if you want to relive the awesomeness of 4-color CGA.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-17 15:38:46 +00:00
|
|
|
if (placeholder[1] == '(') {
|
|
|
|
const char *end = strchr(placeholder + 2, ')');
|
|
|
|
char color[COLOR_MAXLEN];
|
|
|
|
if (!end)
|
|
|
|
return 0;
|
|
|
|
color_parse_mem(placeholder + 2,
|
|
|
|
end - (placeholder + 2),
|
|
|
|
"--pretty format", color);
|
|
|
|
strbuf_addstr(sb, color);
|
|
|
|
return end - placeholder + 1;
|
|
|
|
}
|
2008-02-09 14:40:19 +00:00
|
|
|
if (!prefixcmp(placeholder + 1, "red")) {
|
2007-11-09 00:49:42 +00:00
|
|
|
strbuf_addstr(sb, "\033[31m");
|
2008-02-09 14:40:19 +00:00
|
|
|
return 4;
|
|
|
|
} else if (!prefixcmp(placeholder + 1, "green")) {
|
2007-11-09 00:49:42 +00:00
|
|
|
strbuf_addstr(sb, "\033[32m");
|
2008-02-09 14:40:19 +00:00
|
|
|
return 6;
|
|
|
|
} else if (!prefixcmp(placeholder + 1, "blue")) {
|
2007-11-09 00:49:42 +00:00
|
|
|
strbuf_addstr(sb, "\033[34m");
|
2008-02-09 14:40:19 +00:00
|
|
|
return 5;
|
|
|
|
} else if (!prefixcmp(placeholder + 1, "reset")) {
|
2007-11-09 00:49:42 +00:00
|
|
|
strbuf_addstr(sb, "\033[m");
|
2008-02-09 14:40:19 +00:00
|
|
|
return 6;
|
|
|
|
} else
|
|
|
|
return 0;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'n': /* newline */
|
|
|
|
strbuf_addch(sb, '\n');
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2008-03-21 15:05:06 +00:00
|
|
|
case 'x':
|
|
|
|
/* %x00 == NUL, %x0a == LF, etc. */
|
|
|
|
if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
|
|
|
|
h1 <= 16 &&
|
|
|
|
0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
|
|
|
|
h2 <= 16) {
|
|
|
|
strbuf_addch(sb, (h1<<4)|h2);
|
|
|
|
return 3;
|
|
|
|
} else
|
|
|
|
return 0;
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
/* these depend on the commit */
|
|
|
|
if (!commit->object.parsed)
|
|
|
|
parse_object(commit->object.sha1);
|
|
|
|
|
2007-11-09 00:49:42 +00:00
|
|
|
switch (placeholder[0]) {
|
|
|
|
case 'H': /* commit hash */
|
|
|
|
strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'h': /* abbreviated commit hash */
|
2007-11-10 11:18:26 +00:00
|
|
|
if (add_again(sb, &c->abbrev_commit_hash))
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
|
|
|
|
DEFAULT_ABBREV));
|
2007-11-10 11:18:26 +00:00
|
|
|
c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'T': /* tree hash */
|
|
|
|
strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 't': /* abbreviated tree hash */
|
2007-11-10 11:18:26 +00:00
|
|
|
if (add_again(sb, &c->abbrev_tree_hash))
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
|
|
|
|
DEFAULT_ABBREV));
|
2007-11-10 11:18:26 +00:00
|
|
|
c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'P': /* parent hashes */
|
|
|
|
for (p = commit->parents; p; p = p->next) {
|
|
|
|
if (p != commit->parents)
|
|
|
|
strbuf_addch(sb, ' ');
|
|
|
|
strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
|
|
|
|
}
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'p': /* abbreviated parent hashes */
|
2007-11-10 11:18:26 +00:00
|
|
|
if (add_again(sb, &c->abbrev_parent_hashes))
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
for (p = commit->parents; p; p = p->next) {
|
|
|
|
if (p != commit->parents)
|
|
|
|
strbuf_addch(sb, ' ');
|
|
|
|
strbuf_addstr(sb, find_unique_abbrev(
|
|
|
|
p->item->object.sha1, DEFAULT_ABBREV));
|
|
|
|
}
|
2007-11-10 11:18:26 +00:00
|
|
|
c->abbrev_parent_hashes.len = sb->len -
|
|
|
|
c->abbrev_parent_hashes.off;
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
case 'm': /* left/right/bottom */
|
|
|
|
strbuf_addch(sb, (commit->object.flags & BOUNDARY)
|
|
|
|
? '-'
|
|
|
|
: (commit->object.flags & SYMMETRIC_LEFT)
|
|
|
|
? '<'
|
|
|
|
: '>');
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2008-09-04 21:40:03 +00:00
|
|
|
case 'd':
|
|
|
|
format_decoration(sb, commit);
|
|
|
|
return 1;
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* For the rest we have to parse the commit header. */
|
2007-11-10 11:14:20 +00:00
|
|
|
if (!c->commit_header_parsed)
|
|
|
|
parse_commit_header(c);
|
2007-11-04 19:15:06 +00:00
|
|
|
|
2007-11-10 11:14:20 +00:00
|
|
|
switch (placeholder[0]) {
|
2008-02-09 14:40:19 +00:00
|
|
|
case 'a': /* author ... */
|
|
|
|
return format_person_part(sb, placeholder[1],
|
2008-08-29 00:54:59 +00:00
|
|
|
msg + c->author.off, c->author.len,
|
|
|
|
c->dmode);
|
2008-02-09 14:40:19 +00:00
|
|
|
case 'c': /* committer ... */
|
|
|
|
return format_person_part(sb, placeholder[1],
|
2008-08-29 00:54:59 +00:00
|
|
|
msg + c->committer.off, c->committer.len,
|
|
|
|
c->dmode);
|
2008-02-09 14:40:19 +00:00
|
|
|
case 'e': /* encoding */
|
2007-11-10 11:14:20 +00:00
|
|
|
strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2008-12-27 00:49:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we need to parse the commit message. */
|
|
|
|
if (!c->commit_message_parsed)
|
|
|
|
parse_commit_message(c);
|
|
|
|
|
|
|
|
switch (placeholder[0]) {
|
|
|
|
case 's': /* subject */
|
|
|
|
format_subject(sb, msg + c->subject_off, " ");
|
|
|
|
return 1;
|
2008-02-09 14:40:19 +00:00
|
|
|
case 'b': /* body */
|
2007-11-10 11:14:20 +00:00
|
|
|
strbuf_addstr(sb, msg + c->body_off);
|
2008-02-09 14:40:19 +00:00
|
|
|
return 1;
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
2008-02-09 14:40:19 +00:00
|
|
|
return 0; /* unknown placeholder */
|
2007-11-09 00:49:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void format_commit_message(const struct commit *commit,
|
2008-08-29 00:54:59 +00:00
|
|
|
const void *format, struct strbuf *sb,
|
|
|
|
enum date_mode dmode)
|
2007-11-09 00:49:42 +00:00
|
|
|
{
|
2007-11-10 11:14:20 +00:00
|
|
|
struct format_commit_context context;
|
|
|
|
|
|
|
|
memset(&context, 0, sizeof(context));
|
|
|
|
context.commit = commit;
|
2008-08-29 00:54:59 +00:00
|
|
|
context.dmode = dmode;
|
2008-02-09 14:40:19 +00:00
|
|
|
strbuf_expand(sb, format, format_commit_item, &context);
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void pp_header(enum cmit_fmt fmt,
|
|
|
|
int abbrev,
|
|
|
|
enum date_mode dmode,
|
|
|
|
const char *encoding,
|
|
|
|
const struct commit *commit,
|
|
|
|
const char **msg_p,
|
|
|
|
struct strbuf *sb)
|
|
|
|
{
|
|
|
|
int parents_shown = 0;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
const char *line = *msg_p;
|
|
|
|
int linelen = get_one_line(*msg_p);
|
|
|
|
|
|
|
|
if (!linelen)
|
|
|
|
return;
|
|
|
|
*msg_p += linelen;
|
|
|
|
|
|
|
|
if (linelen == 1)
|
|
|
|
/* End of header */
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (fmt == CMIT_FMT_RAW) {
|
|
|
|
strbuf_add(sb, line, linelen);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!memcmp(line, "parent ", 7)) {
|
|
|
|
if (linelen != 48)
|
|
|
|
die("bad parent line in commit");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!parents_shown) {
|
|
|
|
struct commit_list *parent;
|
|
|
|
int num;
|
|
|
|
for (parent = commit->parents, num = 0;
|
|
|
|
parent;
|
|
|
|
parent = parent->next, num++)
|
|
|
|
;
|
|
|
|
/* with enough slop */
|
|
|
|
strbuf_grow(sb, num * 50 + 20);
|
|
|
|
add_merge_info(fmt, sb, commit, abbrev);
|
|
|
|
parents_shown = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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)) {
|
|
|
|
strbuf_grow(sb, linelen + 80);
|
2008-02-19 03:56:08 +00:00
|
|
|
pp_user_info("Author", fmt, sb, line + 7, dmode, encoding);
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
if (!memcmp(line, "committer ", 10) &&
|
|
|
|
(fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
|
|
|
|
strbuf_grow(sb, linelen + 80);
|
2008-02-19 03:56:08 +00:00
|
|
|
pp_user_info("Commit", fmt, sb, line + 10, dmode, encoding);
|
2007-11-04 19:15:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-19 03:56:08 +00:00
|
|
|
void pp_title_line(enum cmit_fmt fmt,
|
|
|
|
const char **msg_p,
|
|
|
|
struct strbuf *sb,
|
|
|
|
const char *subject,
|
|
|
|
const char *after_subject,
|
|
|
|
const char *encoding,
|
2008-03-15 07:09:20 +00:00
|
|
|
int need_8bit_cte)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
2008-12-27 00:39:35 +00:00
|
|
|
const char *line_separator = (fmt == CMIT_FMT_EMAIL) ? "\n " : " ";
|
2007-11-04 19:15:06 +00:00
|
|
|
struct strbuf title;
|
|
|
|
|
|
|
|
strbuf_init(&title, 80);
|
2008-12-27 00:39:35 +00:00
|
|
|
*msg_p = format_subject(&title, *msg_p, line_separator);
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
strbuf_grow(sb, title.len + 1024);
|
|
|
|
if (subject) {
|
|
|
|
strbuf_addstr(sb, subject);
|
|
|
|
add_rfc2047(sb, title.buf, title.len, encoding);
|
|
|
|
} else {
|
|
|
|
strbuf_addbuf(sb, &title);
|
|
|
|
}
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
|
2008-03-15 00:10:09 +00:00
|
|
|
if (need_8bit_cte > 0) {
|
2007-11-04 19:15:06 +00:00
|
|
|
const char *header_fmt =
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
"Content-Type: text/plain; charset=%s\n"
|
|
|
|
"Content-Transfer-Encoding: 8bit\n";
|
|
|
|
strbuf_addf(sb, header_fmt, encoding);
|
|
|
|
}
|
|
|
|
if (after_subject) {
|
|
|
|
strbuf_addstr(sb, after_subject);
|
|
|
|
}
|
|
|
|
if (fmt == CMIT_FMT_EMAIL) {
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
}
|
|
|
|
strbuf_release(&title);
|
|
|
|
}
|
|
|
|
|
2008-02-19 03:56:08 +00:00
|
|
|
void pp_remainder(enum cmit_fmt fmt,
|
|
|
|
const char **msg_p,
|
|
|
|
struct strbuf *sb,
|
|
|
|
int indent)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
|
|
|
int first = 1;
|
|
|
|
for (;;) {
|
|
|
|
const char *line = *msg_p;
|
|
|
|
int linelen = get_one_line(line);
|
|
|
|
*msg_p += linelen;
|
|
|
|
|
|
|
|
if (!linelen)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (is_empty_line(line, &linelen)) {
|
|
|
|
if (first)
|
|
|
|
continue;
|
|
|
|
if (fmt == CMIT_FMT_SHORT)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
first = 0;
|
|
|
|
|
|
|
|
strbuf_grow(sb, linelen + indent + 20);
|
|
|
|
if (indent) {
|
|
|
|
memset(sb->buf + sb->len, ' ', indent);
|
|
|
|
strbuf_setlen(sb, sb->len + indent);
|
|
|
|
}
|
|
|
|
strbuf_add(sb, line, linelen);
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-21 20:55:57 +00:00
|
|
|
char *reencode_commit_message(const struct commit *commit, const char **encoding_p)
|
|
|
|
{
|
|
|
|
const char *encoding;
|
|
|
|
|
|
|
|
encoding = (git_log_output_encoding
|
|
|
|
? git_log_output_encoding
|
|
|
|
: git_commit_encoding);
|
|
|
|
if (!encoding)
|
|
|
|
encoding = "utf-8";
|
|
|
|
if (encoding_p)
|
|
|
|
*encoding_p = encoding;
|
|
|
|
return logmsg_reencode(commit, encoding);
|
|
|
|
}
|
|
|
|
|
2007-11-04 19:15:06 +00:00
|
|
|
void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
|
2008-03-15 00:10:09 +00:00
|
|
|
struct strbuf *sb, int abbrev,
|
|
|
|
const char *subject, const char *after_subject,
|
|
|
|
enum date_mode dmode, int need_8bit_cte)
|
2007-11-04 19:15:06 +00:00
|
|
|
{
|
|
|
|
unsigned long beginning_of_body;
|
|
|
|
int indent = 4;
|
|
|
|
const char *msg = commit->buffer;
|
|
|
|
char *reencoded;
|
|
|
|
const char *encoding;
|
|
|
|
|
|
|
|
if (fmt == CMIT_FMT_USERFORMAT) {
|
2008-08-29 00:54:59 +00:00
|
|
|
format_commit_message(commit, user_format, sb, dmode);
|
2007-11-04 19:15:06 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-10-21 20:55:57 +00:00
|
|
|
reencoded = reencode_commit_message(commit, &encoding);
|
2007-11-04 19:15:06 +00:00
|
|
|
if (reencoded) {
|
|
|
|
msg = reencoded;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
|
|
|
|
indent = 0;
|
|
|
|
|
2008-03-15 00:10:09 +00:00
|
|
|
/*
|
|
|
|
* We need to check and emit Content-type: to mark it
|
|
|
|
* as 8-bit if we haven't done so.
|
2007-11-04 19:15:06 +00:00
|
|
|
*/
|
2008-03-15 00:10:09 +00:00
|
|
|
if (fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
|
2007-11-04 19:15:06 +00:00
|
|
|
int i, ch, in_body;
|
|
|
|
|
|
|
|
for (in_body = i = 0; (ch = msg[i]); i++) {
|
|
|
|
if (!in_body) {
|
|
|
|
/* author could be non 7-bit ASCII but
|
|
|
|
* the log may be so; skip over the
|
|
|
|
* header part first.
|
|
|
|
*/
|
|
|
|
if (ch == '\n' && msg[i+1] == '\n')
|
|
|
|
in_body = 1;
|
|
|
|
}
|
|
|
|
else if (non_ascii(ch)) {
|
2008-03-15 00:10:09 +00:00
|
|
|
need_8bit_cte = 1;
|
2007-11-04 19:15:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pp_header(fmt, abbrev, dmode, encoding, commit, &msg, sb);
|
|
|
|
if (fmt != CMIT_FMT_ONELINE && !subject) {
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip excess blank lines at the beginning of body, if any... */
|
2008-12-27 00:32:49 +00:00
|
|
|
msg = skip_empty_lines(msg);
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
/* These formats treat the title line specially. */
|
|
|
|
if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
|
|
|
|
pp_title_line(fmt, &msg, sb, subject,
|
2008-03-15 00:10:09 +00:00
|
|
|
after_subject, encoding, need_8bit_cte);
|
2007-11-04 19:15:06 +00:00
|
|
|
|
|
|
|
beginning_of_body = sb->len;
|
|
|
|
if (fmt != CMIT_FMT_ONELINE)
|
|
|
|
pp_remainder(fmt, &msg, sb, indent);
|
|
|
|
strbuf_rtrim(sb);
|
|
|
|
|
|
|
|
/* Make sure there is an EOLN for the non-oneline case */
|
|
|
|
if (fmt != CMIT_FMT_ONELINE)
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The caller may append additional body text in e-mail
|
|
|
|
* format. Make sure we did not strip the blank line
|
|
|
|
* between the header and the body.
|
|
|
|
*/
|
|
|
|
if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
|
|
|
|
strbuf_addch(sb, '\n');
|
|
|
|
free(reencoded);
|
|
|
|
}
|