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 06/21] ls-files: add --color to highlight file names Date: Sun, 25 Jan 2015 19:37:41 +0700 Message-ID: <1422189476-7518-7-git-send-email-pclouds@gmail.com> References: <1422189476-7518-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jan 25 13:27:36 2015 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 1YFMHv-00020Q-RR for gcvg-git-2@plane.gmane.org; Sun, 25 Jan 2015 13:27:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753257AbbAYM1c convert rfc822-to-quoted-printable (ORCPT ); Sun, 25 Jan 2015 07:27:32 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:62740 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752808AbbAYM1b (ORCPT ); Sun, 25 Jan 2015 07:27:31 -0500 Received: by mail-pa0-f46.google.com with SMTP id lj1so6482749pab.5 for ; Sun, 25 Jan 2015 04:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=xc8LpGBoA017xeRBrVgs/x6criu+ADUtiIxvvBx9DGI=; b=Wg1e0dbi3JL3QMpPuBSIRuFpV58nTa6IQVKWe5gVKN79y0NllzxYegiLzZ8Fv2MttB ECrMMNWTQ+9awLofTCkWNHCCGnQWv+Ztc0G2ufuVu/YMyWODeFs0eu1kXtmKaM5dWXcF r219kb06yLsJPJQb19eKtNh2W9NthYogkohzThlEfI6XYCrXtpL1I+/KpyJGoiuJRd00 MWT2IbGrZFJ3oWHVrFzI6zBU+eznXNHrCcuLvEb32C4iz+g5U4yebbP811uwgnR24rRA 4/nfyhlJ70aFK4IHjAkxbvs9VkfyLG1pAJA8z2E3xZ/daft1T2SDTUqEZqF0pqcXrBiq 7kkA== X-Received: by 10.68.201.201 with SMTP id kc9mr26493309pbc.79.1422188850676; Sun, 25 Jan 2015 04:27:30 -0800 (PST) Received: from lanh ([115.73.204.104]) by mx.google.com with ESMTPSA id qm7sm7113592pbc.46.2015.01.25.04.27.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2015 04:27:29 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sun, 25 Jan 2015 19:38:54 +0700 X-Mailer: git-send-email 2.2.0.84.ge9c7a8a In-Reply-To: <1422189476-7518-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 Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 7 +++++++ builtin/ls-files.c | 38 ++++++++++++++++++++++++++++++++++= +--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-file= s.txt index e26f01f..148f226 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -147,6 +147,13 @@ a space) at the start of each line: possible for manual inspection; the exact format may change at any time. =20 +--color[=3D]:: +--no-color:: + Color file names. The value must be `always`, `never`, or + `auto`. `--no-color` is equivalent to + `--color=3Dnever`. `--color` is equivalent to + `--color=3Dauto`. + \--:: Do not interpret any more arguments as options. =20 diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b6f0d9f..0ee4f19 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -14,6 +14,7 @@ #include "resolve-undo.h" #include "string-list.h" #include "pathspec.h" +#include "color.h" =20 static int abbrev; static int show_deleted; @@ -27,6 +28,7 @@ static int show_killed; static int show_valid_bit; static int line_terminator =3D '\n'; static int debug_mode; +static int use_color; =20 static const char *prefix; static int max_prefix_len; @@ -60,7 +62,6 @@ static void write_name(struct strbuf *sb, const char = *name) strbuf_release(&sb2); } else quote_path_relative(name, real_prefix, sb); - strbuf_addch(sb, line_terminator); } =20 static void strbuf_fputs(struct strbuf *sb, FILE *fp) @@ -68,6 +69,21 @@ static void strbuf_fputs(struct strbuf *sb, FILE *fp= ) fwrite(sb->buf, sb->len, 1, fp); } =20 +static void write_dir_entry(struct strbuf *sb, const struct dir_entry = *ent) +{ + struct strbuf quoted =3D STRBUF_INIT; + struct stat st; + if (stat(ent->name, &st)) + st.st_mode =3D 0; + write_name("ed, ent->name); + if (want_color(use_color)) + color_filename(sb, ent->name, quoted.buf, st.st_mode, 1); + else + strbuf_addbuf(sb, "ed); + strbuf_addch(sb, line_terminator); + strbuf_release("ed); +} + static void show_dir_entry(const char *tag, struct dir_entry *ent) { static struct strbuf sb =3D STRBUF_INIT; @@ -81,7 +97,7 @@ static void show_dir_entry(const char *tag, struct di= r_entry *ent) =20 strbuf_reset(&sb); strbuf_addstr(&sb, tag); - write_name(&sb, ent->name); + write_dir_entry(&sb, ent); strbuf_fputs(&sb, stdout); } =20 @@ -146,6 +162,18 @@ static void show_killed_files(struct dir_struct *d= ir) } } =20 +static void write_ce_name(struct strbuf *sb, const struct cache_entry = *ce) +{ + struct strbuf quoted =3D STRBUF_INIT; + write_name("ed, ce->name); + if (want_color(use_color)) + color_filename(sb, ce->name, quoted.buf, ce->ce_mode, 1); + else + strbuf_addbuf(sb, "ed); + strbuf_addch(sb, line_terminator); + strbuf_release("ed); +} + static void show_ce_entry(const char *tag, const struct cache_entry *c= e) { static struct strbuf sb =3D STRBUF_INIT; @@ -186,7 +214,7 @@ static void show_ce_entry(const char *tag, const st= ruct cache_entry *ce) find_unique_abbrev(ce->sha1, abbrev), ce_stage(ce)); } - write_name(&sb, ce->name); + write_ce_name(&sb, ce); strbuf_fputs(&sb, stdout); if (debug_mode) { const struct stat_data *sd =3D &ce->ce_stat_data; @@ -523,6 +551,7 @@ int cmd_ls_files(int argc, const char **argv, const= char *cmd_prefix) N_("if any is not in the index, treat this as an error")), OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"), N_("pretend that paths removed since are still present")= ), + OPT__COLOR(&use_color, N_("show color")), OPT__ABBREV(&abbrev), OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")), OPT_END() @@ -570,6 +599,9 @@ int cmd_ls_files(int argc, const char **argv, const= char *cmd_prefix) if (require_work_tree && !is_inside_work_tree()) setup_work_tree(); =20 + if (want_color(use_color)) + parse_ls_color(); + parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD | PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, --=20 2.2.0.84.ge9c7a8a