[PATCHv3] git-log --format: Add %B tag with %B(x) option
From: Johannes Gilger <hidden>
Date: 2016-06-15 22:47:25
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCHv3] git-log --format: Add %B tag with %B(x) option · Junio C Hamano <hidden>
Since one can simply use spaces to indent any other --pretty field we should have an option to do that with the body too. Also the %B flag strips the trailing newlines, to enable more compact display. Signed-off-by: Johannes Gilger <redacted> --- Changes to PATCHv2: - Make %B() strict: Only nonnegative integers are allowed between the brackets, everything else yields the placemark itself as output to indicate a wrong argument. This also goes for an empty argument. Documentation/pretty-formats.txt | 2 ++ pretty.c | 29 ++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 2a845b1..533bc5e 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt@@ -123,6 +123,8 @@ The placeholders are: - '%s': subject - '%f': sanitized subject line, suitable for a filename - '%b': body +- '%B': body without trailing newline +- '%B(x)': body indented by x spaces - '%Cred': switch color to red - '%Cgreen': switch color to green - '%Cblue': switch color to blue
diff --git a/pretty.c b/pretty.c
index f5983f8..8970378 100644
--- a/pretty.c
+++ b/pretty.c@@ -605,13 +605,17 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder, int h1, h2; /* these are independent of the commit */ + + const char *body = msg + c->body_off; + const char *end = NULL; + /* check if we have arguments to the placeholder */ + if (placeholder[1] == '(') + end = strchr(placeholder + 2, ')'); + switch (placeholder[0]) { case 'C': - if (placeholder[1] == '(') { - const char *end = strchr(placeholder + 2, ')'); + if (end) { char color[COLOR_MAXLEN]; - if (!end) - return 0; color_parse_mem(placeholder + 2, end - (placeholder + 2), "--pretty format", color);
@@ -733,7 +737,20 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder, format_sanitized_subject(sb, msg + c->subject_off); return 1; case 'b': /* body */ - strbuf_addstr(sb, msg + c->body_off); + strbuf_addstr(sb, body); + return 1; + case 'B': /* body without trailing newline */ + if (end) { + char *endp = NULL; + int indent = strtol(placeholder + 2, &endp, 10); + if (placeholder + 2 == endp || *endp != ')' || indent < 0) + return 0; + pp_remainder(CMIT_FMT_MEDIUM, &body, sb, indent); + strbuf_rtrim(sb); + return end - placeholder + 1; + } + strbuf_addstr(sb, body); + strbuf_rtrim(sb); return 1; } return 0; /* unknown placeholder */
@@ -875,6 +892,8 @@ void pp_remainder(enum cmit_fmt fmt, } first = 0; + if (indent < 0) + indent = 0; strbuf_grow(sb, linelen + indent + 20); if (indent) { memset(sb->buf + sb->len, ' ', indent);
--
1.6.5.rc1.20.geb7d9