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 v3 09/13] pretty: split color parsing into a separate function Date: Tue, 16 Apr 2013 18:24:58 +1000 Message-ID: <1366100702-31745-10-git-send-email-pclouds@gmail.com> References: <1364636112-15065-1-git-send-email-pclouds@gmail.com> <1366100702-31745-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 Tue Apr 16 10:27:17 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 1US1ES-00075t-Tm for gcvg-git-2@plane.gmane.org; Tue, 16 Apr 2013 10:27:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518Ab3DPI1K convert rfc822-to-quoted-printable (ORCPT ); Tue, 16 Apr 2013 04:27:10 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:43059 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754465Ab3DPI1G (ORCPT ); Tue, 16 Apr 2013 04:27:06 -0400 Received: by mail-pd0-f182.google.com with SMTP id 3so166284pdj.27 for ; Tue, 16 Apr 2013 01:27:06 -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=Q+S8Y4TRZ6E3A/hpu5iNUimZCXin/pww4pFirK5UCvs=; b=PpLNXhqRRAr1Cm6jkJVS2ILBeGbpBUVCGvCL0b6ozjbmxYmIzSrWdhITN4LEQRCJch n8EsZncanp5v8k+mJ7Rl2ood03E0VZWf1liB/ZkZAmjLoeM9F6mTrlAxIXHocQvOZlrv 1HqRMJSzAL01Dk7RbE4OQXI1FeBUcfuMuRisv7qfQ/xtnEdBa2YkUhdujvGlOrsEvFdc 1f+ZG8yTHqiDC0R9MP0IGzpH6uZso+uctt+MqDn/U3385QuBuNJVOD6b1v5p18OOrhLI l6ZiZES+uz3lHNsJDdte+oQYsJCF+vFGxocfd46uH7fa+zSuiiaw0PgxRieOrMhezeMZ Ur2w== X-Received: by 10.66.220.197 with SMTP id py5mr2332310pac.86.1366100826445; Tue, 16 Apr 2013 01:27:06 -0700 (PDT) Received: from pclouds@gmail.com (xinyep.lnk.telstra.net. [110.143.18.114]) by mx.google.com with ESMTPS id ef4sm1172054pbd.38.2013.04.16.01.27.03 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 16 Apr 2013 01:27:05 -0700 (PDT) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Tue, 16 Apr 2013 18:26:52 +1000 X-Mailer: git-send-email 1.8.2.82.gc24b958 In-Reply-To: <1366100702-31745-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: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- pretty.c | 71 +++++++++++++++++++++++++++++++++++---------------------= -------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/pretty.c b/pretty.c index 5947275..e0413e3 100644 --- a/pretty.c +++ b/pretty.c @@ -954,6 +954,44 @@ static int format_reflog_person(struct strbuf *sb, return format_person_part(sb, part, ident, strlen(ident), dmode); } =20 +static size_t parse_color(struct strbuf *sb, /* in UTF-8 */ + const char *placeholder, + struct format_commit_context *c) +{ + if (placeholder[1] =3D=3D '(') { + const char *begin =3D placeholder + 2; + const char *end =3D strchr(begin, ')'); + char color[COLOR_MAXLEN]; + + if (!end) + return 0; + if (!prefixcmp(begin, "auto,")) { + if (!want_color(c->pretty_ctx->color)) + return end - placeholder + 1; + begin +=3D 5; + } + color_parse_mem(begin, + end - begin, + "--pretty format", color); + strbuf_addstr(sb, color); + return end - placeholder + 1; + } + if (!prefixcmp(placeholder + 1, "red")) { + strbuf_addstr(sb, GIT_COLOR_RED); + return 4; + } else if (!prefixcmp(placeholder + 1, "green")) { + strbuf_addstr(sb, GIT_COLOR_GREEN); + return 6; + } else if (!prefixcmp(placeholder + 1, "blue")) { + strbuf_addstr(sb, GIT_COLOR_BLUE); + return 5; + } else if (!prefixcmp(placeholder + 1, "reset")) { + strbuf_addstr(sb, GIT_COLOR_RESET); + return 6; + } else + return 0; +} + static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ const char *placeholder, void *context) @@ -967,38 +1005,7 @@ static size_t format_commit_one(struct strbuf *sb= , /* in UTF-8 */ /* these are independent of the commit */ switch (placeholder[0]) { case 'C': - if (placeholder[1] =3D=3D '(') { - const char *begin =3D placeholder + 2; - const char *end =3D strchr(begin, ')'); - char color[COLOR_MAXLEN]; - - if (!end) - return 0; - if (!prefixcmp(begin, "auto,")) { - if (!want_color(c->pretty_ctx->color)) - return end - placeholder + 1; - begin +=3D 5; - } - color_parse_mem(begin, - end - begin, - "--pretty format", color); - strbuf_addstr(sb, color); - return end - placeholder + 1; - } - if (!prefixcmp(placeholder + 1, "red")) { - strbuf_addstr(sb, GIT_COLOR_RED); - return 4; - } else if (!prefixcmp(placeholder + 1, "green")) { - strbuf_addstr(sb, GIT_COLOR_GREEN); - return 6; - } else if (!prefixcmp(placeholder + 1, "blue")) { - strbuf_addstr(sb, GIT_COLOR_BLUE); - return 5; - } else if (!prefixcmp(placeholder + 1, "reset")) { - strbuf_addstr(sb, GIT_COLOR_RESET); - return 6; - } else - return 0; + return parse_color(sb, placeholder, c); case 'n': /* newline */ strbuf_addch(sb, '\n'); return 1; --=20 1.8.2.82.gc24b958