Merge branch 'rs/pretty'

* rs/pretty:
  Fix preprocessor logic that determines the availablity of strchrnul().
  Simplify strchrnul() compat code
  --format=pretty: avoid calculating expensive expansions twice
  add strbuf_adddup()
  --pretty=format: parse commit message only once
  --pretty=format: on-demand format expansion
  Add strchrnul()
This commit is contained in:
Junio C Hamano 2007-11-14 14:03:50 -08:00
commit 37ec2b4c26
5 changed files with 284 additions and 135 deletions

View File

@ -435,9 +435,7 @@ static int pick_rref(int sha1_only, const char *rref, const char *ls_remote_resu
cp++; cp++;
if (!*cp) if (!*cp)
break; break;
np = strchr(cp, '\n'); np = strchrnul(cp, '\n');
if (!np)
np = cp + strlen(cp);
if (pass) { if (pass) {
lrr_list[i].line = cp; lrr_list[i].line = cp;
lrr_list[i].name = cp + 41; lrr_list[i].name = cp + 41;
@ -461,9 +459,7 @@ static int pick_rref(int sha1_only, const char *rref, const char *ls_remote_resu
rref++; rref++;
if (!*rref) if (!*rref)
break; break;
next = strchr(rref, '\n'); next = strchrnul(rref, '\n');
if (!next)
next = rref + strlen(rref);
rreflen = next - rref; rreflen = next - rref;
for (i = 0; i < lrr_count; i++) { for (i = 0; i < lrr_count; i++) {

View File

@ -183,6 +183,22 @@ void *gitmemmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen); const void *needle, size_t needlelen);
#endif #endif
#ifdef __GLIBC_PREREQ
#if __GLIBC_PREREQ(2, 1)
#define HAVE_STRCHRNUL
#endif
#endif
#ifndef HAVE_STRCHRNUL
#define strchrnul gitstrchrnul
static inline char *gitstrchrnul(const char *s, int c)
{
while (*s && *s != c)
s++;
return (char *)s;
}
#endif
extern void release_pack_memory(size_t, int); extern void release_pack_memory(size_t, int);
static inline char* xstrdup(const char *str) static inline char* xstrdup(const char *str)

360
pretty.c
View File

@ -1,6 +1,5 @@
#include "cache.h" #include "cache.h"
#include "commit.h" #include "commit.h"
#include "interpolate.h"
#include "utf8.h" #include "utf8.h"
#include "diff.h" #include "diff.h"
#include "revision.h" #include "revision.h"
@ -283,7 +282,8 @@ static char *logmsg_reencode(const struct commit *commit,
return out; return out;
} }
static void fill_person(struct interp *table, const char *msg, int len) static void format_person_part(struct strbuf *sb, char part,
const char *msg, int len)
{ {
int start, end, tz = 0; int start, end, tz = 0;
unsigned long date; unsigned long date;
@ -295,7 +295,10 @@ static void fill_person(struct interp *table, const char *msg, int len)
start = end + 1; start = end + 1;
while (end > 0 && isspace(msg[end - 1])) while (end > 0 && isspace(msg[end - 1]))
end--; end--;
table[0].value = xmemdupz(msg, end); if (part == 'n') { /* name */
strbuf_add(sb, msg, end);
return;
}
if (start >= len) if (start >= len)
return; return;
@ -307,7 +310,10 @@ static void fill_person(struct interp *table, const char *msg, int len)
if (end >= len) if (end >= len)
return; return;
table[1].value = xmemdupz(msg + start, end - start); if (part == 'e') { /* email */
strbuf_add(sb, msg + start, end - start);
return;
}
/* parse date */ /* parse date */
for (start = end + 1; start < len && isspace(msg[start]); start++) for (start = end + 1; start < len && isspace(msg[start]); start++)
@ -318,7 +324,10 @@ static void fill_person(struct interp *table, const char *msg, int len)
if (msg + start == ep) if (msg + start == ep)
return; return;
table[5].value = xmemdupz(msg + start, ep - (msg + start)); if (part == 't') { /* date, UNIX timestamp */
strbuf_add(sb, msg + start, ep - (msg + start));
return;
}
/* parse tz */ /* parse tz */
for (start = ep - msg + 1; start < len && isspace(msg[start]); start++) for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
@ -329,115 +338,66 @@ static void fill_person(struct interp *table, const char *msg, int len)
tz = -tz; tz = -tz;
} }
interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL)); switch (part) {
interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822)); case 'd': /* date */
interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE)); strbuf_addstr(sb, show_date(date, tz, DATE_NORMAL));
interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601)); return;
case 'D': /* date, RFC2822 style */
strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
return;
case 'r': /* date, relative */
strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
return;
case 'i': /* date, ISO 8601 */
strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
return;
}
} }
void format_commit_message(const struct commit *commit, struct chunk {
const void *format, struct strbuf *sb) size_t off;
size_t len;
};
struct format_commit_context {
const struct commit *commit;
/* These offsets are relative to the start of the commit message. */
int commit_header_parsed;
struct chunk subject;
struct chunk author;
struct chunk committer;
struct chunk encoding;
size_t body_off;
/* 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;
};
static int add_again(struct strbuf *sb, struct chunk *chunk)
{ {
struct interp table[] = { if (chunk->len) {
{ "%H" }, /* commit hash */ strbuf_adddup(sb, chunk->off, chunk->len);
{ "%h" }, /* abbreviated commit hash */ return 1;
{ "%T" }, /* tree hash */ }
{ "%t" }, /* abbreviated tree hash */
{ "%P" }, /* parent hashes */ /*
{ "%p" }, /* abbreviated parent hashes */ * We haven't seen this chunk before. Our caller is surely
{ "%an" }, /* author name */ * going to add it the hard way now. Remember the most likely
{ "%ae" }, /* author email */ * start of the to-be-added chunk: the current end of the
{ "%ad" }, /* author date */ * struct strbuf.
{ "%aD" }, /* author date, RFC2822 style */ */
{ "%ar" }, /* author date, relative */ chunk->off = sb->len;
{ "%at" }, /* author date, UNIX timestamp */ return 0;
{ "%ai" }, /* author date, ISO 8601 */ }
{ "%cn" }, /* committer name */
{ "%ce" }, /* committer email */ static void parse_commit_header(struct format_commit_context *context)
{ "%cd" }, /* committer date */ {
{ "%cD" }, /* committer date, RFC2822 style */ const char *msg = context->commit->buffer;
{ "%cr" }, /* committer date, relative */
{ "%ct" }, /* committer date, UNIX timestamp */
{ "%ci" }, /* committer date, ISO 8601 */
{ "%e" }, /* encoding */
{ "%s" }, /* subject */
{ "%b" }, /* body */
{ "%Cred" }, /* red */
{ "%Cgreen" }, /* green */
{ "%Cblue" }, /* blue */
{ "%Creset" }, /* reset color */
{ "%n" }, /* newline */
{ "%m" }, /* left/right/bottom */
};
enum interp_index {
IHASH = 0, IHASH_ABBREV,
ITREE, ITREE_ABBREV,
IPARENTS, IPARENTS_ABBREV,
IAUTHOR_NAME, IAUTHOR_EMAIL,
IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
ICOMMITTER_NAME, ICOMMITTER_EMAIL,
ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
ICOMMITTER_ISO8601,
IENCODING,
ISUBJECT,
IBODY,
IRED, IGREEN, IBLUE, IRESET_COLOR,
INEWLINE,
ILEFT_RIGHT,
};
struct commit_list *p;
char parents[1024];
unsigned long len;
int i; int i;
enum { HEADER, SUBJECT, BODY } state; enum { HEADER, SUBJECT, BODY } state;
const char *msg = commit->buffer;
if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
die("invalid interp table!");
/* these are independent of the commit */
interp_set_entry(table, IRED, "\033[31m");
interp_set_entry(table, IGREEN, "\033[32m");
interp_set_entry(table, IBLUE, "\033[34m");
interp_set_entry(table, IRESET_COLOR, "\033[m");
interp_set_entry(table, INEWLINE, "\n");
/* these depend on the commit */
if (!commit->object.parsed)
parse_object(commit->object.sha1);
interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
interp_set_entry(table, IHASH_ABBREV,
find_unique_abbrev(commit->object.sha1,
DEFAULT_ABBREV));
interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
interp_set_entry(table, ITREE_ABBREV,
find_unique_abbrev(commit->tree->object.sha1,
DEFAULT_ABBREV));
interp_set_entry(table, ILEFT_RIGHT,
(commit->object.flags & BOUNDARY)
? "-"
: (commit->object.flags & SYMMETRIC_LEFT)
? "<"
: ">");
parents[1] = 0;
for (i = 0, p = commit->parents;
p && i < sizeof(parents) - 1;
p = p->next)
i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
sha1_to_hex(p->item->object.sha1));
interp_set_entry(table, IPARENTS, parents + 1);
parents[1] = 0;
for (i = 0, p = commit->parents;
p && i < sizeof(parents) - 1;
p = p->next)
i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
find_unique_abbrev(p->item->object.sha1,
DEFAULT_ABBREV));
interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
for (i = 0, state = HEADER; msg[i] && state < BODY; i++) { for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
int eol; int eol;
@ -445,7 +405,8 @@ void format_commit_message(const struct commit *commit,
; /* do nothing */ ; /* do nothing */
if (state == SUBJECT) { if (state == SUBJECT) {
table[ISUBJECT].value = xmemdupz(msg + i, eol - i); context->subject.off = i;
context->subject.len = eol - i;
i = eol; i = eol;
} }
if (i == eol) { if (i == eol) {
@ -453,29 +414,170 @@ void format_commit_message(const struct commit *commit,
/* strip empty lines */ /* strip empty lines */
while (msg[eol + 1] == '\n') while (msg[eol + 1] == '\n')
eol++; eol++;
} else if (!prefixcmp(msg + i, "author ")) } else if (!prefixcmp(msg + i, "author ")) {
fill_person(table + IAUTHOR_NAME, context->author.off = i + 7;
msg + i + 7, eol - i - 7); context->author.len = eol - i - 7;
else if (!prefixcmp(msg + i, "committer ")) } else if (!prefixcmp(msg + i, "committer ")) {
fill_person(table + ICOMMITTER_NAME, context->committer.off = i + 10;
msg + i + 10, eol - i - 10); context->committer.len = eol - i - 10;
else if (!prefixcmp(msg + i, "encoding ")) } else if (!prefixcmp(msg + i, "encoding ")) {
table[IENCODING].value = context->encoding.off = i + 9;
xmemdupz(msg + i + 9, eol - i - 9); context->encoding.len = eol - i - 9;
}
i = eol; i = eol;
} }
if (msg[i]) context->body_off = i;
table[IBODY].value = xstrdup(msg + i); context->commit_header_parsed = 1;
}
len = interpolate(sb->buf + sb->len, strbuf_avail(sb), static void format_commit_item(struct strbuf *sb, const char *placeholder,
format, table, ARRAY_SIZE(table)); void *context)
if (len > strbuf_avail(sb)) { {
strbuf_grow(sb, len); struct format_commit_context *c = context;
interpolate(sb->buf + sb->len, strbuf_avail(sb) + 1, const struct commit *commit = c->commit;
format, table, ARRAY_SIZE(table)); const char *msg = commit->buffer;
struct commit_list *p;
/* these are independent of the commit */
switch (placeholder[0]) {
case 'C':
switch (placeholder[3]) {
case 'd': /* red */
strbuf_addstr(sb, "\033[31m");
return;
case 'e': /* green */
strbuf_addstr(sb, "\033[32m");
return;
case 'u': /* blue */
strbuf_addstr(sb, "\033[34m");
return;
case 's': /* reset color */
strbuf_addstr(sb, "\033[m");
return;
}
case 'n': /* newline */
strbuf_addch(sb, '\n');
return;
} }
strbuf_setlen(sb, sb->len + len);
interp_clear_table(table, ARRAY_SIZE(table)); /* these depend on the commit */
if (!commit->object.parsed)
parse_object(commit->object.sha1);
switch (placeholder[0]) {
case 'H': /* commit hash */
strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
return;
case 'h': /* abbreviated commit hash */
if (add_again(sb, &c->abbrev_commit_hash))
return;
strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
DEFAULT_ABBREV));
c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
return;
case 'T': /* tree hash */
strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
return;
case 't': /* abbreviated tree hash */
if (add_again(sb, &c->abbrev_tree_hash))
return;
strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
DEFAULT_ABBREV));
c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
return;
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));
}
return;
case 'p': /* abbreviated parent hashes */
if (add_again(sb, &c->abbrev_parent_hashes))
return;
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));
}
c->abbrev_parent_hashes.len = sb->len -
c->abbrev_parent_hashes.off;
return;
case 'm': /* left/right/bottom */
strbuf_addch(sb, (commit->object.flags & BOUNDARY)
? '-'
: (commit->object.flags & SYMMETRIC_LEFT)
? '<'
: '>');
return;
}
/* For the rest we have to parse the commit header. */
if (!c->commit_header_parsed)
parse_commit_header(c);
switch (placeholder[0]) {
case 's':
strbuf_add(sb, msg + c->subject.off, c->subject.len);
return;
case 'a':
format_person_part(sb, placeholder[1],
msg + c->author.off, c->author.len);
return;
case 'c':
format_person_part(sb, placeholder[1],
msg + c->committer.off, c->committer.len);
return;
case 'e':
strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
return;
case 'b':
strbuf_addstr(sb, msg + c->body_off);
return;
}
}
void format_commit_message(const struct commit *commit,
const void *format, struct strbuf *sb)
{
const char *placeholders[] = {
"H", /* commit hash */
"h", /* abbreviated commit hash */
"T", /* tree hash */
"t", /* abbreviated tree hash */
"P", /* parent hashes */
"p", /* abbreviated parent hashes */
"an", /* author name */
"ae", /* author email */
"ad", /* author date */
"aD", /* author date, RFC2822 style */
"ar", /* author date, relative */
"at", /* author date, UNIX timestamp */
"ai", /* author date, ISO 8601 */
"cn", /* committer name */
"ce", /* committer email */
"cd", /* committer date */
"cD", /* committer date, RFC2822 style */
"cr", /* committer date, relative */
"ct", /* committer date, UNIX timestamp */
"ci", /* committer date, ISO 8601 */
"e", /* encoding */
"s", /* subject */
"b", /* body */
"Cred", /* red */
"Cgreen", /* green */
"Cblue", /* blue */
"Creset", /* reset color */
"n", /* newline */
"m", /* left/right/bottom */
NULL
};
struct format_commit_context context;
memset(&context, 0, sizeof(context));
context.commit = commit;
strbuf_expand(sb, format, placeholders, format_commit_item, &context);
} }
static void pp_header(enum cmit_fmt fmt, static void pp_header(enum cmit_fmt fmt,

View File

@ -106,6 +106,13 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len)
strbuf_setlen(sb, sb->len + len); strbuf_setlen(sb, sb->len + len);
} }
void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len)
{
strbuf_grow(sb, len);
memcpy(sb->buf + sb->len, sb->buf + pos, len);
strbuf_setlen(sb, sb->len + len);
}
void strbuf_addf(struct strbuf *sb, const char *fmt, ...) void strbuf_addf(struct strbuf *sb, const char *fmt, ...)
{ {
int len; int len;
@ -130,6 +137,30 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...)
strbuf_setlen(sb, sb->len + len); strbuf_setlen(sb, sb->len + len);
} }
void strbuf_expand(struct strbuf *sb, const char *format,
const char **placeholders, expand_fn_t fn, void *context)
{
for (;;) {
const char *percent, **p;
percent = strchrnul(format, '%');
strbuf_add(sb, format, percent - format);
if (!*percent)
break;
format = percent + 1;
for (p = placeholders; *p; p++) {
if (!prefixcmp(format, *p))
break;
}
if (*p) {
fn(sb, *p, context);
format += strlen(*p);
} else
strbuf_addch(sb, '%');
}
}
size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f) size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
{ {
size_t res; size_t res;

View File

@ -101,6 +101,10 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) {
static inline void strbuf_addbuf(struct strbuf *sb, struct strbuf *sb2) { static inline void strbuf_addbuf(struct strbuf *sb, struct strbuf *sb2) {
strbuf_add(sb, sb2->buf, sb2->len); strbuf_add(sb, sb2->buf, sb2->len);
} }
extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len);
typedef void (*expand_fn_t) (struct strbuf *sb, const char *placeholder, void *context);
extern void strbuf_expand(struct strbuf *sb, const char *format, const char **placeholders, expand_fn_t fn, void *context);
__attribute__((format(printf,2,3))) __attribute__((format(printf,2,3)))
extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...); extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);