From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 02/12] pretty: share code between format_decoration and show_decorations Date: Sat, 30 Mar 2013 16:35:02 +0700 Message-ID: <1364636112-15065-3-git-send-email-pclouds@gmail.com> References: <1363400683-14813-1-git-send-email-pclouds@gmail.com> <1364636112-15065-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Mar 30 10:36:03 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ULsCW-0002LM-Cl for gcvg-git-2@plane.gmane.org; Sat, 30 Mar 2013 10:35:52 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756171Ab3C3JfX convert rfc822-to-quoted-printable (ORCPT ); Sat, 30 Mar 2013 05:35:23 -0400 Received: from mail-da0-f41.google.com ([209.85.210.41]:54307 "EHLO mail-da0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756030Ab3C3JfV (ORCPT ); Sat, 30 Mar 2013 05:35:21 -0400 Received: by mail-da0-f41.google.com with SMTP id w4so488807dam.0 for ; Sat, 30 Mar 2013 02:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=xhbibbU3T+CleNo1SOyWMq40/xhriw//Y0SVpzuyxSI=; b=NhsJ+UIFUh780+cbLUIbCccT01L1fqGjyYMFqh6unAdGgWB4jAXUpqazSYytKXrNZR fyCJeXPGxz8WI24EK2jyQRum84NjCMY00eljYJ4i3lvGra+/DzV6znEUXeToYHzPYX5l D+GL/6mtZTRKGZzP5cNGp5FiVhIp3Awli1EFhTOuLv4/MmRWdaOp3OnU+4JEJT3So4k0 ECTzzHnC2B8Bq7gBQl+SnfkHGDlBshrOE0GOhHShKymPMF1SvpvZbEsBi2uwDbGAzH0s Ty3n0JJwgf05e9TrzgNX4BNzDs3y44WfUhhSE0TDwaGu3a3Xfsg94tZ3kBrsyHiF9zuj yNfg== X-Received: by 10.68.218.72 with SMTP id pe8mr7733850pbc.112.1364636120389; Sat, 30 Mar 2013 02:35:20 -0700 (PDT) Received: from lanh ([115.74.55.89]) by mx.google.com with ESMTPS id wi7sm6838246pac.9.2013.03.30.02.35.17 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 30 Mar 2013 02:35:19 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Sat, 30 Mar 2013 16:35:25 +0700 X-Mailer: git-send-email 1.8.2.83.gc99314b In-Reply-To: <1364636112-15065-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This also adds color support to format_decoration() Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- log-tree.c | 60 +++++++++++++++++++++++++-------= -------- log-tree.h | 3 ++ pretty.c | 19 +------------ t/t4207-log-decoration-colors.sh | 8 +++--- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/log-tree.c b/log-tree.c index 5dc45c4..7467a1d 100644 --- a/log-tree.c +++ b/log-tree.c @@ -174,36 +174,50 @@ static void show_children(struct rev_info *opt, s= truct commit *commit, int abbre } } =20 -void show_decorations(struct rev_info *opt, struct commit *commit) +void format_decoration(struct strbuf *sb, + const struct commit *commit, + int use_color) { - const char *prefix; - struct name_decoration *decoration; + const char *prefix =3D " ("; + struct name_decoration *d; const char *color_commit =3D - diff_get_color_opt(&opt->diffopt, DIFF_COMMIT); + diff_get_color(use_color, DIFF_COMMIT); const char *color_reset =3D - decorate_get_color_opt(&opt->diffopt, DECORATION_NONE); + decorate_get_color(use_color, DECORATION_NONE); + + load_ref_decorations(DECORATE_SHORT_REFS); + d =3D lookup_decoration(&name_decoration, &commit->object); + if (!d) + return; + while (d) { + strbuf_addstr(sb, color_commit); + strbuf_addstr(sb, prefix); + strbuf_addstr(sb, decorate_get_color(use_color, d->type)); + if (d->type =3D=3D DECORATION_REF_TAG) + strbuf_addstr(sb, "tag: "); + strbuf_addstr(sb, d->name); + strbuf_addstr(sb, color_reset); + prefix =3D ", "; + d =3D d->next; + } + if (prefix[0] =3D=3D ',') { + 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 =3D STRBUF_INIT; =20 if (opt->show_source && commit->util) printf("\t%s", (char *) commit->util); if (!opt->show_decorations) return; - decoration =3D lookup_decoration(&name_decoration, &commit->object); - if (!decoration) - return; - prefix =3D " ("; - while (decoration) { - printf("%s", prefix); - fputs(decorate_get_color_opt(&opt->diffopt, decoration->type), - stdout); - if (decoration->type =3D=3D DECORATION_REF_TAG) - fputs("tag: ", stdout); - printf("%s", decoration->name); - fputs(color_reset, stdout); - fputs(color_commit, stdout); - prefix =3D ", "; - decoration =3D decoration->next; - } - putchar(')'); + format_decoration(&sb, commit, opt->diffopt.use_color); + fputs(sb.buf, stdout); + strbuf_release(&sb); } =20 /* @@ -625,8 +639,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 =3D=3D CMIT_FMT_ONELINE) { putchar(' '); } else { diff --git a/log-tree.h b/log-tree.h index 9140f48..e6a2da5 100644 --- a/log-tree.h +++ b/log-tree.h @@ -13,6 +13,9 @@ 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_decoration(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 *comm= it, const char **subject_p, diff --git a/pretty.c b/pretty.c index eae57ad..79784be 100644 --- a/pretty.c +++ b/pretty.c @@ -898,23 +898,6 @@ static void parse_commit_message(struct format_com= mit_context *c) c->commit_message_parsed =3D 1; } =20 -static void format_decoration(struct strbuf *sb, const struct commit *= commit) -{ - struct name_decoration *d; - const char *prefix =3D " ("; - - load_ref_decorations(DECORATE_SHORT_REFS); - d =3D lookup_decoration(&name_decoration, &commit->object); - while (d) { - strbuf_addstr(sb, prefix); - prefix =3D ", "; - strbuf_addstr(sb, d->name); - d =3D d->next; - } - if (prefix[0] =3D=3D ',') - strbuf_addch(sb, ')'); -} - static void strbuf_wrap(struct strbuf *sb, size_t pos, size_t width, size_t indent1, size_t indent2) { @@ -1146,7 +1129,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); + format_decoration(sb, commit, 0); return 1; case 'g': /* reflog info */ switch(placeholder[1]) { diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-= colors.sh index bbde31b..925f577 100755 --- a/t/t4207-log-decoration-colors.sh +++ b/t/t4207-log-decoration-colors.sh @@ -44,15 +44,15 @@ test_expect_success setup ' ' =20 cat >expected <