[PATCH 2/2] pretty: support placeholders %C+ and %C-
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Sep 20, 2012, 12:26 UTC
- Message-ID
- <1348143976-4506-3-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1348143976-4506-1-git-send-email-pclouds@gmail.com>
%C+ tells the next specifiers that color is preferred. %C- the opposite. So far only %H, %h and %d support coloring.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- Documentation/pretty-formats.txt | 2 ++ pretty.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index e3d8a83..6e287d6 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -142,6 +142,8 @@ The placeholders are: - '%Cblue': switch color to blue - '%Creset': reset color - '%C(...)': color specification, as described in color.branch.* config option +- '%C+': enable coloring on the following placeholders if supported +- '%C-': disable coloring on the following placeholders - '%m': left, right or boundary mark - '%n': newline - '%%': a raw '%' diff --git a/pretty.c b/pretty.c index e910679..b1cec71 100644 --- a/pretty.c +++ b/pretty.c @@ -623,6 +623,7 @@ struct format_commit_context { unsigned commit_header_parsed:1; unsigned commit_message_parsed:1; unsigned commit_signature_parsed:1; + unsigned use_color:1; struct { char *gpg_output; char good_bad; @@ -885,6 +886,12 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, "--pretty format", color); strbuf_addstr(sb, color); return end - placeholder + 1; + } else if (placeholder[1] == '+') { + c->use_color = 1; + return 2; + } else if (placeholder[1] == '-') { + c->use_color = 0; + return 2; } if (!prefixcmp(placeholder + 1, "red")) { strbuf_addstr(sb, GIT_COLOR_RED); @@ -945,13 +952,17 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, switch (placeholder[0]) { case 'H': /* commit hash */ + strbuf_addstr(sb, diff_get_color(c->use_color, DIFF_COMMIT)); strbuf_addstr(sb, sha1_to_hex(commit->object.sha1)); + strbuf_addstr(sb, diff_get_color(c->use_color, DIFF_RESET)); return 1; case 'h': /* abbreviated commit hash */ + strbuf_addstr(sb, diff_get_color(c->use_color, DIFF_COMMIT)); if (add_again(sb, &c->abbrev_commit_hash)) return 1; strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1, c->pretty_ctx->abbrev)); + strbuf_addstr(sb, diff_get_color(c->use_color, DIFF_RESET)); c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off; return 1; case 'T': /* tree hash */ @@ -988,7 +999,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, strbuf_addstr(sb, get_revision_mark(NULL, commit)); return 1; case 'd': - format_decoration(sb, commit, 0); + format_decoration(sb, commit, c->use_color); return 1; case 'g': /* reflog info */ switch(placeholder[1]) {
-- 1.7.12.1.383.gda6001e.dirty