pretty: share code between format_decoration and show_decorations
This also adds color support to format_decorations() Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
Junio C Hamano
parent
d2ea4afb03
commit
9d3f002f21
48
log-tree.c
48
log-tree.c
@ -175,36 +175,52 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre
|
||||
}
|
||||
}
|
||||
|
||||
void show_decorations(struct rev_info *opt, struct commit *commit)
|
||||
/*
|
||||
* The caller makes sure there is no funny color before
|
||||
* calling. format_decorations makes sure the same after return.
|
||||
*/
|
||||
void format_decorations(struct strbuf *sb,
|
||||
const struct commit *commit,
|
||||
int use_color)
|
||||
{
|
||||
const char *prefix;
|
||||
struct name_decoration *decoration;
|
||||
const char *color_commit =
|
||||
diff_get_color_opt(&opt->diffopt, DIFF_COMMIT);
|
||||
diff_get_color(use_color, DIFF_COMMIT);
|
||||
const char *color_reset =
|
||||
decorate_get_color_opt(&opt->diffopt, DECORATION_NONE);
|
||||
decorate_get_color(use_color, DECORATION_NONE);
|
||||
|
||||
if (opt->show_source && commit->util)
|
||||
printf("\t%s", (char *) commit->util);
|
||||
if (!opt->show_decorations)
|
||||
return;
|
||||
decoration = lookup_decoration(&name_decoration, &commit->object);
|
||||
if (!decoration)
|
||||
return;
|
||||
prefix = " (";
|
||||
while (decoration) {
|
||||
printf("%s", prefix);
|
||||
fputs(decorate_get_color_opt(&opt->diffopt, decoration->type),
|
||||
stdout);
|
||||
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)
|
||||
fputs("tag: ", stdout);
|
||||
printf("%s", decoration->name);
|
||||
fputs(color_reset, stdout);
|
||||
fputs(color_commit, stdout);
|
||||
strbuf_addstr(sb, "tag: ");
|
||||
strbuf_addstr(sb, decoration->name);
|
||||
strbuf_addstr(sb, color_reset);
|
||||
prefix = ", ";
|
||||
decoration = decoration->next;
|
||||
}
|
||||
putchar(')');
|
||||
strbuf_addstr(sb, color_commit);
|
||||
strbuf_addch(sb, ')');
|
||||
strbuf_addstr(sb, color_reset);
|
||||
}
|
||||
|
||||
void show_decorations(struct rev_info *opt, struct commit *commit)
|
||||
{
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
if (opt->show_source && commit->util)
|
||||
printf("\t%s", (char *) commit->util);
|
||||
if (!opt->show_decorations)
|
||||
return;
|
||||
format_decorations(&sb, commit, opt->diffopt.use_color);
|
||||
fputs(sb.buf, stdout);
|
||||
strbuf_release(&sb);
|
||||
}
|
||||
|
||||
static unsigned int digits_in_number(unsigned int number)
|
||||
@ -540,8 +556,8 @@ void show_log(struct rev_info *opt)
|
||||
printf(" (from %s)",
|
||||
find_unique_abbrev(parent->object.sha1,
|
||||
abbrev_commit));
|
||||
fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
|
||||
show_decorations(opt, commit);
|
||||
printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
|
||||
if (opt->commit_format == CMIT_FMT_ONELINE) {
|
||||
putchar(' ');
|
||||
} else {
|
||||
|
||||
@ -13,6 +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 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,
|
||||
|
||||
20
pretty.c
20
pretty.c
@ -908,23 +908,6 @@ static void parse_commit_message(struct format_commit_context *c)
|
||||
c->commit_message_parsed = 1;
|
||||
}
|
||||
|
||||
static void format_decoration(struct strbuf *sb, const struct commit *commit)
|
||||
{
|
||||
struct name_decoration *d;
|
||||
const char *prefix = " (";
|
||||
|
||||
load_ref_decorations(DECORATE_SHORT_REFS);
|
||||
d = lookup_decoration(&name_decoration, &commit->object);
|
||||
while (d) {
|
||||
strbuf_addstr(sb, prefix);
|
||||
prefix = ", ";
|
||||
strbuf_addstr(sb, d->name);
|
||||
d = d->next;
|
||||
}
|
||||
if (prefix[0] == ',')
|
||||
strbuf_addch(sb, ')');
|
||||
}
|
||||
|
||||
static void strbuf_wrap(struct strbuf *sb, size_t pos,
|
||||
size_t width, size_t indent1, size_t indent2)
|
||||
{
|
||||
@ -1103,7 +1086,8 @@ 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);
|
||||
load_ref_decorations(DECORATE_SHORT_REFS);
|
||||
format_decorations(sb, commit, 0);
|
||||
return 1;
|
||||
case 'g': /* reflog info */
|
||||
switch(placeholder[1]) {
|
||||
|
||||
@ -44,15 +44,15 @@ test_expect_success setup '
|
||||
'
|
||||
|
||||
cat >expected <<EOF
|
||||
${c_commit}COMMIT_ID (${c_HEAD}HEAD${c_reset}${c_commit},\
|
||||
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_HEAD}HEAD${c_reset}${c_commit},\
|
||||
${c_tag}tag: v1.0${c_reset}${c_commit},\
|
||||
${c_tag}tag: B${c_reset}${c_commit},\
|
||||
${c_branch}master${c_reset}${c_commit})${c_reset} B
|
||||
${c_commit}COMMIT_ID (${c_tag}tag: A1${c_reset}${c_commit},\
|
||||
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_tag}tag: A1${c_reset}${c_commit},\
|
||||
${c_remoteBranch}other/master${c_reset}${c_commit})${c_reset} A1
|
||||
${c_commit}COMMIT_ID (${c_stash}refs/stash${c_reset}${c_commit})${c_reset}\
|
||||
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_stash}refs/stash${c_reset}${c_commit})${c_reset}\
|
||||
On master: Changes to A.t
|
||||
${c_commit}COMMIT_ID (${c_tag}tag: A${c_reset}${c_commit})${c_reset} A
|
||||
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_tag}tag: A${c_reset}${c_commit})${c_reset} A
|
||||
EOF
|
||||
|
||||
# We want log to show all, but the second parent to refs/stash is irrelevant
|
||||
|
||||
Loading…
Reference in New Issue
Block a user