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

Merge branch 'rs/pretty-wrap'

Browse Source 
* rs/pretty-wrap:
  log --format: don't ignore %w() at the start of format string
  Implement wrap format %w() as if it is a mode switch

Conflicts:
	pretty.c
This commit is contained in:
Junio C Hamano 2009-11-15 16:41:17 -08:00
commit 934c042c9c
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pretty.c
View File

@ -446,6 +446,7 @@ struct format_commit_context {
const struct pretty_print_context *pretty_ctx; const struct pretty_print_context *pretty_ctx;
unsigned commit_header_parsed:1; unsigned commit_header_parsed:1;
unsigned commit_message_parsed:1; unsigned commit_message_parsed:1;
size_t width, indent1, indent2;
/* These offsets are relative to the start of the commit message. */ /* These offsets are relative to the start of the commit message. */
struct chunk author; struct chunk author;
@ -459,6 +460,7 @@ struct format_commit_context {
struct chunk abbrev_commit_hash; struct chunk abbrev_commit_hash;
struct chunk abbrev_tree_hash; struct chunk abbrev_tree_hash;
struct chunk abbrev_parent_hashes; struct chunk abbrev_parent_hashes;
size_t wrap_start;
}; };
static int add_again(struct strbuf *sb, struct chunk *chunk) static int add_again(struct strbuf *sb, struct chunk *chunk)
@ -596,6 +598,35 @@ static void format_decoration(struct strbuf *sb, const struct commit *commit)
strbuf_addch(sb, ')'); strbuf_addch(sb, ')');
} }
static void strbuf_wrap(struct strbuf *sb, size_t pos,
size_t width, size_t indent1, size_t indent2)
{
struct strbuf tmp = STRBUF_INIT;
if (pos)
strbuf_add(&tmp, sb->buf, pos);
strbuf_add_wrapped_text(&tmp, sb->buf + pos,
(int) indent1, (int) indent2, (int) width);
strbuf_swap(&tmp, sb);
strbuf_release(&tmp);
}
static void rewrap_message_tail(struct strbuf *sb,
struct format_commit_context *c,
size_t new_width, size_t new_indent1,
size_t new_indent2)
{
if (c->width == new_width && c->indent1 == new_indent1 &&
c->indent2 == new_indent2)
return;
if (c->wrap_start < sb->len)
strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
c->wrap_start = sb->len;
c->width = new_width;
c->indent1 = new_indent1;
c->indent2 = new_indent2;
}
static size_t format_commit_item(struct strbuf *sb, const char *placeholder, static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
void *context) void *context)
{ {
@ -646,6 +677,30 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
return 3; return 3;
} else } else
return 0; return 0;
case 'w':
if (placeholder[1] == '(') {
unsigned long width = 0, indent1 = 0, indent2 = 0;
char *next;
const char *start = placeholder + 2;
const char *end = strchr(start, ')');
if (!end)
return 0;
if (end > start) {
width = strtoul(start, &next, 10);
if (*next == ',') {
indent1 = strtoul(next + 1, &next, 10);
if (*next == ',') {
indent2 = strtoul(next + 1,
&next, 10);
}
}
if (*next != ')')
return 0;
}
rewrap_message_tail(sb, c, width, indent1, indent2);
return end - placeholder + 1;
} else
return 0;
} }
/* these depend on the commit */ /* these depend on the commit */
@ -765,7 +820,9 @@ void format_commit_message(const struct commit *commit,
memset(&context, 0, sizeof(context)); memset(&context, 0, sizeof(context));
context.commit = commit; context.commit = commit;
context.pretty_ctx = pretty_ctx; context.pretty_ctx = pretty_ctx;
context.wrap_start = sb->len;
strbuf_expand(sb, format, format_commit_item, &context); strbuf_expand(sb, format, format_commit_item, &context);
rewrap_message_tail(sb, &context, 0, 0, 0);
} }
static void pp_header(enum cmit_fmt fmt, static void pp_header(enum cmit_fmt fmt,