From: Harry Jeffery <harry@exec64.co.uk>
To: git@vger.kernel.org
Subject: [PATCH 1/2] log-tree: make format_decorations more flexible
Date: Wed, 10 Sep 2014 22:58:48 +0100 [thread overview]
Message-ID: <5410C998.5060701@exec64.co.uk> (raw)
The prefix, separator and suffix for decorations are hard-coded. Make
format_decorations more flexible by having the caller specify the
prefix, separator and suffix.
Signed-off-by: Harry Jeffery <harry@exec64.co.uk>
---
log-tree.c | 16 +++++++++-------
log-tree.h | 2 +-
pretty.c | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/log-tree.c b/log-tree.c
index 95e9b1d..860694c 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -184,9 +184,11 @@ static void show_children(struct rev_info *opt,
struct commit *commit, int abbre
*/
void format_decorations(struct strbuf *sb,
const struct commit *commit,
- int use_color)
+ int use_color,
+ const char* prefix,
+ const char* sep,
+ const char* suffix)
{
- const char *prefix;
struct name_decoration *decoration;
const char *color_commit =
diff_get_color(use_color, DIFF_COMMIT);
@@ -196,20 +198,20 @@ void format_decorations(struct strbuf *sb,
decoration = lookup_decoration(&name_decoration, &commit->object);
if (!decoration)
return;
- prefix = " (";
+ strbuf_addstr(sb, prefix);
while (decoration) {
strbuf_addstr(sb, color_commit);
- strbuf_addstr(sb, prefix);
strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
if (decoration->type == DECORATION_REF_TAG)
strbuf_addstr(sb, "tag: ");
strbuf_addstr(sb, decoration->name);
+ if(decoration->next)
+ strbuf_addstr(sb, sep);
strbuf_addstr(sb, color_reset);
- prefix = ", ";
decoration = decoration->next;
}
strbuf_addstr(sb, color_commit);
- strbuf_addch(sb, ')');
+ strbuf_addstr(sb, suffix);
strbuf_addstr(sb, color_reset);
}
@@ -221,7 +223,7 @@ void show_decorations(struct rev_info *opt, struct
commit *commit)
printf("\t%s", (char *) commit->util);
if (!opt->show_decorations)
return;
- format_decorations(&sb, commit, opt->diffopt.use_color);
+ format_decorations(&sb, commit, opt->diffopt.use_color, " (", ", ", ")");
fputs(sb.buf, stdout);
strbuf_release(&sb);
}
diff --git a/log-tree.h b/log-tree.h
index d6ecd4d..4816911 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -13,7 +13,7 @@ int log_tree_diff_flush(struct rev_info *);
int log_tree_commit(struct rev_info *, struct commit *);
int log_tree_opt_parse(struct rev_info *, const char **, int);
void show_log(struct rev_info *opt);
-void format_decorations(struct strbuf *sb, const struct commit *commit,
int use_color);
+void format_decorations(struct strbuf *sb, const struct commit *commit,
int use_color, const char* prefix, const char* sep, const char* suffix);
void show_decorations(struct rev_info *opt, struct commit *commit);
void log_write_email_headers(struct rev_info *opt, struct commit *commit,
const char **subject_p,
diff --git a/pretty.c b/pretty.c
index 44b9f64..e4dc093 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1195,7 +1195,7 @@ static size_t format_commit_one(struct strbuf *sb,
/* in UTF-8 */
return 1;
case 'd':
load_ref_decorations(DECORATE_SHORT_REFS);
- format_decorations(sb, commit, c->auto_color);
+ format_decorations(sb, commit, c->auto_color, " (", ", ", ")");
return 1;
case 'g': /* reflog info */
switch(placeholder[1]) {
--
2.1.0
next reply other threads:[~2014-09-10 21:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 21:58 Harry Jeffery [this message]
2014-09-10 22:00 ` [PATCH 2/2] pretty: add %D format specifier Harry Jeffery
2014-09-11 16:56 ` Junio C Hamano
2014-09-11 17:26 ` Harry Jeffery
2014-09-11 19:42 ` Junio C Hamano
2014-09-11 22:39 ` [PATCH 1/2] log-tree: make format_decorations more flexible Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5410C998.5060701@exec64.co.uk \
--to=harry@exec64.co.uk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).