From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Lodato Subject: [PATCH 4/5] grep: Colorize filename, line number, and separator Date: Fri, 26 Feb 2010 23:57:49 -0500 Message-ID: <1267246670-19118-5-git-send-email-lodatom@gmail.com> References: <1267246670-19118-1-git-send-email-lodatom@gmail.com> Cc: Mark Lodato To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Feb 27 05:54:26 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NlEh5-0007b4-RN for gcvg-git-2@lo.gmane.org; Sat, 27 Feb 2010 05:54:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967856Ab0B0EyS (ORCPT ); Fri, 26 Feb 2010 23:54:18 -0500 Received: from mail-qy0-f179.google.com ([209.85.221.179]:51848 "EHLO mail-qy0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967850Ab0B0EyR (ORCPT ); Fri, 26 Feb 2010 23:54:17 -0500 Received: by mail-qy0-f179.google.com with SMTP id 9so475291qyk.5 for ; Fri, 26 Feb 2010 20:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=tHfeo23hOcAeKPC6JhoezLEpNpj5h2o3hqd71tl8j9M=; b=C2xd3YXEAyO9rgia8Lf4JrxXIDY3k3/27JJbjdBOGEArt+xkYiDueD7H8Lm1Esv295 u6zwynLDgjZi5vY3JGZ0YNeqyR2OhEihKDYpIdAbS2KMpl5JcpgDIMPefQ+AZeY/FExo l1MKcOaFJDnZh6oan+I0rxrLrfccjkWyVutqE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=aSM2LnL2HGUvbAGi8Hwr0Shlm3HiAw48Wo0Va91pcU6hek3FU39ZFiT4eFxM2ZnGsz syAOi8yA2PmoF+Dp/0hN77BKHJ7FscAvhLhXU3FgJ25I2xBnxZwpnkxoyOPs2rfy5hgf B6q8vJydd77tmYednvel1XSdWwD8Bl4EUjTEE= Received: by 10.224.55.6 with SMTP id s6mr789809qag.58.1267246456642; Fri, 26 Feb 2010 20:54:16 -0800 (PST) Received: from localhost.localdomain (c-68-50-174-152.hsd1.dc.comcast.net [68.50.174.152]) by mx.google.com with ESMTPS id 20sm622133qyk.12.2010.02.26.20.54.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 26 Feb 2010 20:54:15 -0800 (PST) X-Mailer: git-send-email 1.7.0 In-Reply-To: <1267246670-19118-1-git-send-email-lodatom@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Colorize the filename, line number, and separator in git grep output, as GNU grep does. The colors are customizable through color.grep.. The default is to only color the separator (in cyan), since this gives the biggest legibility increase without overwhelming the user with colors. GNU grep also defaults cyan for the separator, but defaults to magenta for the filename and to green for the line number, as well. There are a few differences from GNU grep: 1. With --name-only, GNU grep colors the filenames, but we do not. I do not see any point to making everything the same color. 2. When a binary file matches without -a, GNU grep does not color the in "Binary file matches", but we do. The point of colorization is to highlight important parts, and the filename is an important part. Like GNU grep, if --null is given, the null separators are not colored. For config.txt, use a a sub-list to describe the slots, rather than a single paragraph with parentheses, since this is much more readable. Signed-off-by: Mark Lodato --- Documentation/config.txt | 20 ++++++++++++++-- builtin-grep.c | 31 +++++++++++++++++-------- grep.c | 55 +++++++++++++++++++++++++++++---------------- grep.h | 3 ++ 4 files changed, 76 insertions(+), 33 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 791b065..154bc02 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -687,9 +687,23 @@ color.grep:: `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. Defaults to `false`. -color.grep.match:: - Use customized color for matches. The value of this variable - may be specified as in color.branch.. +color.grep.:: + Use customized color for grep colorization. `` specifies which + part of the line to use the specified color, and is one of ++ +-- +`filename`::: + filename prefix (when not using `-h`) +`linenumber`::: + line number prefix (when using `-n`) +`match`::: + matching text +`separator`::: + separators between fields on a line (`:`, `-`, and `=`) + and between hunks (`--`) + +The values of these variables may be specified as in color.branch.. +-- color.interactive:: When set to `always`, always use colors for interactive prompts diff --git a/builtin-grep.c b/builtin-grep.c index dcc3d48..43b952b 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -289,6 +289,7 @@ static int wait_all(void) static int grep_config(const char *var, const char *value, void *cb) { struct grep_opt *opt = cb; + char *color = NULL; switch (userdiff_config(var, value)) { case 0: break; @@ -296,17 +297,24 @@ static int grep_config(const char *var, const char *value, void *cb) default: return 0; } - if (!strcmp(var, "color.grep")) { + if (!strcmp(var, "color.grep")) opt->color = git_config_colorbool(var, value, -1); - return 0; - } - if (!strcmp(var, "color.grep.match")) { - if (!value) - return config_error_nonbool(var); - color_parse(value, var, opt->color_match); - return 0; - } - return git_color_default_config(var, value, cb); + else if (!strcmp(var, "color.grep.filename")) + color = opt->color_filename; + else if (!strcmp(var, "color.grep.linenumber")) + color = opt->color_lineno; + else if (!strcmp(var, "color.grep.match")) + color = opt->color_match; + else if (!strcmp(var, "color.grep.separator")) + color = opt->color_sep; + else + return git_color_default_config(var, value, cb); + if (!value) + return config_error_nonbool(var); + color_parse(value, var, color); + if (!strcmp(color, GIT_COLOR_RESET)) + color[0] = '\0'; + return 0; } /* @@ -871,7 +879,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix) opt.regflags = REG_NEWLINE; opt.max_depth = -1; + strcpy(opt.color_filename, ""); + strcpy(opt.color_lineno, ""); strcpy(opt.color_match, GIT_COLOR_BOLD_RED); + strcpy(opt.color_sep, GIT_COLOR_CYAN); opt.color = -1; git_config(grep_config, &opt); if (opt.color == -1) diff --git a/grep.c b/grep.c index a0864f1..132798d 100644 --- a/grep.c +++ b/grep.c @@ -506,35 +506,52 @@ static int next_match(struct grep_opt *opt, char *bol, char *eol, return hit; } +static void output_color(struct grep_opt *opt, const void *data, size_t size, + const char *color) +{ + if (opt->color && color && color[0]) { + opt->output(opt, color, strlen(color)); + opt->output(opt, data, size); + opt->output(opt, GIT_COLOR_RESET, strlen(GIT_COLOR_RESET)); + } + else + opt->output(opt, data, size); +} + +static void output_sep(struct grep_opt *opt, char sign) +{ + if (opt->null_following_name) { + sign = '\0'; + opt->output(opt, &sign, 1); + } else + output_color(opt, &sign, 1, opt->color_sep); +} + static void show_line(struct grep_opt *opt, char *bol, char *eol, const char *name, unsigned lno, char sign) { int rest = eol - bol; - char sign_str[1]; - sign_str[0] = sign; if (opt->pre_context || opt->post_context) { if (opt->last_shown == 0) { if (opt->show_hunk_mark) - opt->output(opt, "--\n", 3); + output_color(opt, "--\n", 3, opt->color_sep); else opt->show_hunk_mark = 1; } else if (lno > opt->last_shown + 1) - opt->output(opt, "--\n", 3); + output_color(opt, "--\n", 3, opt->color_sep); } opt->last_shown = lno; - if (opt->null_following_name) - sign_str[0] = '\0'; if (opt->pathname) { - opt->output(opt, name, strlen(name)); - opt->output(opt, sign_str, 1); + output_color(opt, name, strlen(name), opt->color_filename); + output_sep(opt, sign); } if (opt->linenum) { char buf[32]; snprintf(buf, sizeof(buf), "%d", lno); - opt->output(opt, buf, strlen(buf)); - opt->output(opt, sign_str, 1); + output_color(opt, buf, strlen(buf), opt->color_lineno); + output_sep(opt, sign); } if (opt->color) { regmatch_t match; @@ -548,12 +565,9 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol, break; opt->output(opt, bol, match.rm_so); - opt->output(opt, opt->color_match, - strlen(opt->color_match)); - opt->output(opt, bol + match.rm_so, - (int)(match.rm_eo - match.rm_so)); - opt->output(opt, GIT_COLOR_RESET, - strlen(GIT_COLOR_RESET)); + output_color(opt, bol + match.rm_so, + (int)(match.rm_eo - match.rm_so), + opt->color_match); bol += match.rm_eo; rest -= match.rm_eo; eflags = REG_NOTBOL; @@ -823,7 +837,8 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name, return 1; if (binary_match_only) { opt->output(opt, "Binary file ", 12); - opt->output(opt, name, strlen(name)); + output_color(opt, name, strlen(name), + opt->color_filename); opt->output(opt, " matches\n", 9); return 1; } @@ -882,9 +897,9 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name, */ if (opt->count && count) { char buf[32]; - opt->output(opt, name, strlen(name)); - snprintf(buf, sizeof(buf), "%c%u\n", - opt->null_following_name ? '\0' : ':', count); + output_color(opt, name, strlen(name), opt->color_filename); + output_sep(opt, ':'); + snprintf(buf, sizeof(buf), "%u\n", count); opt->output(opt, buf, strlen(buf)); } return !!last_hit; diff --git a/grep.h b/grep.h index 9703087..36919ee 100644 --- a/grep.h +++ b/grep.h @@ -84,7 +84,10 @@ struct grep_opt { int color; int max_depth; int funcname; + char color_filename[COLOR_MAXLEN]; + char color_lineno[COLOR_MAXLEN]; char color_match[COLOR_MAXLEN]; + char color_sep[COLOR_MAXLEN]; int regflags; unsigned pre_context; unsigned post_context; -- 1.7.0