[PATCH 11/25] list-files: add --color

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 builtin/list-files.c  | 30 +++++++++++++++++++++++++++++-
 t/t7013-list-files.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/builtin/list-files.c b/builtin/list-files.c
index a60ab98..02a088d 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -5,6 +5,7 @@
 #include "dir.h"
 #include "quote.h"
 #include "column.h"
+#include "color.h"
 
 enum item_type {
        FROM_INDEX,
@@ -32,6 +33,7 @@ static int show_tag = -1;
 static unsigned int colopts;
 static int max_depth;
 static int show_dirs;
+static int use_color = -1;
 
 static const char * const ls_usage[] = {
        N_("git list-files [options] [<pathspec>...]"),
@@ -48,6 +50,7 @@ struct option ls_options[] = {
          NULL, 1 },
        OPT_SET_INT('R', "recursive", &max_depth,
                    N_("shortcut for --max-depth=-1"), -1),
+       OPT__COLOR(&use_color, N_("show color")),
        OPT_END()
 };
 
@@ -69,6 +72,17 @@ static void free_item(struct item *item)
        }
 }
 
+static mode_t get_mode(const struct item *item)
+{
+       switch (item->type) {
+       case IS_DIR:
+               return S_IFDIR;
+       case FROM_INDEX:
+               return item->ce->ce_mode;
+       }
+       return S_IFREG;
+}
+
 static void remove_duplicates(struct item_list *list)
 {
        int src, dst;
@@ -220,6 +234,13 @@ static void display(const struct item_list *result)
                        strbuf_addch(&quoted, ' ');
                }
                quote_item(&quoted, item);
+               if (want_color(use_color)) {
+                       struct strbuf sb = STRBUF_INIT;
+                       strbuf_swap(&sb, &quoted);
+                       color_filename(&quoted, item->path, sb.buf,
+                                      get_mode(item), 1);
+                       strbuf_release(&sb);
+               }
                if (column_active(colopts))
                        string_list_append(&s, quoted.buf);
                else
@@ -240,7 +261,11 @@ static int ls_config(const char *var, const char *value, 
void *cb)
 {
        if (starts_with(var, "column."))
                return git_column_config(var, value, "listfiles", &colopts);
-       return git_default_config(var, value, cb);
+       if (!strcmp(var, "color.listfiles")) {
+               use_color = git_config_colorbool(var, value);
+               return 0;
+       }
+       return git_color_default_config(var, value, cb);
 }
 
 int cmd_list_files(int argc, const char **argv, const char *cmd_prefix)
@@ -261,6 +286,9 @@ int cmd_list_files(int argc, const char **argv, const char 
*cmd_prefix)
 
        argc = parse_options(argc, argv, prefix, ls_options, ls_usage, 0);
 
+       if (want_color(use_color))
+               parse_ls_color();
+
        parse_pathspec(&pathspec, 0,
                       PATHSPEC_PREFER_CWD |
                       (max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0) |
diff --git a/t/t7013-list-files.sh b/t/t7013-list-files.sh
index a4916d8..cdbc34a 100755
--- a/t/t7013-list-files.sh
+++ b/t/t7013-list-files.sh
@@ -110,4 +110,48 @@ test_expect_success 'list-files from subdir (2)' '
        )
 '
 
+test_expect_success 'setup 2' '
+       git init 2 &&
+       (
+       cd 2 &&
+       mkdir dir &&
+       touch file dir/file &&
+       git init gitlink &&
+       ( cd gitlink && test_commit foo ) &&
+       git add file dir/file gitlink &&
+       git commit -qm1
+       )
+'
+
+test_expect_success 'LS_COLORS env variable' '
+       (
+       cd 2 &&
+       LS_COLORS="rs=0:fi=31:di=32" &&
+       export LS_COLORS &&
+       git list-files --color=always | test_decode_color | \
+               grep -v gitlink >actual &&
+       cat >expected <<-\EOF &&
+       <GREEN>dir<RESET>
+       <RED>file<RESET>
+       EOF
+       test_cmp expected actual
+       )
+'
+
+test_expect_success 'color.ls.*' '
+       (
+       cd 2 &&
+       test_config color.ls.file red &&
+       test_config color.ls.directory green &&
+       test_config color.ls.submodule yellow &&
+       git list-files --color=always | test_decode_color >actual &&
+       cat >expected <<-\EOF &&
+       <GREEN>dir<RESET>
+       <RED>file<RESET>
+       <YELLOW>gitlink<RESET>
+       EOF
+       test_cmp expected actual
+       )
+'
+
 test_done
-- 
2.3.0.rc1.137.g477eb31

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html