From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 04/19] ls_colors.c: highlight submodules like directories
Date: Sun, 30 Nov 2014 15:55:52 +0700 [thread overview]
Message-ID: <1417337767-4505-5-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1417337767-4505-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/config.txt | 3 ++-
ls_colors.c | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2090866..2290c47 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -944,7 +944,8 @@ color.ls.<slot>::
Use customized color for file name colorization. If not set
and the environment variable LS_COLORS is set, color settings
from $LS_COLORS are used. `<slot>` can be `normal`, `file`,
- `directory`, `symlink`, `fifo`, `socket`, `block`, `char`,
+ `directory`, `submodule`,
+ `symlink`, `fifo`, `socket`, `block`, `char`,
`missing`, `orphan`, `executable`, `door`, `setuid`, `setgid`,
`sticky`, `otherwritable`, `stickyotherwritable`, `cap`,
`multihardlink`. The values of these variables may be
diff --git a/ls_colors.c b/ls_colors.c
index a58da9e..e62e74b 100644
--- a/ls_colors.c
+++ b/ls_colors.c
@@ -29,6 +29,8 @@ enum color_ls {
LS_MH, /* multi hardlink */
LS_CL, /* clear end of line */
+ LS_SUBMODULE,
+
MAX_LS
};
@@ -58,7 +60,8 @@ static char ls_colors[MAX_LS][COLOR_MAXLEN] = {
GIT_COLOR_BLACK_ON_GREEN,
"",
"",
- ""
+ "",
+ GIT_COLOR_BOLD_BLUE
};
static const char *const indicator_name[] = {
@@ -73,6 +76,7 @@ static const char* const config_name[] = {
"fifo", "socket", "block", "char", "missing", "orphan", "executable",
"door", "setuid", "setgid", "sticky", "otherwritable",
"stickyotherwritable", "cap", "multihardlink", "",
+ "submodule",
NULL
};
@@ -448,6 +452,8 @@ void color_filename(struct strbuf *sb, const char *name,
type = LS_DI;
} else if (S_ISLNK (mode))
type = (!linkok && *ls_colors[LS_OR]) ? LS_OR : LS_LN;
+ else if (S_ISGITLINK(mode))
+ type = LS_SUBMODULE;
else if (S_ISFIFO (mode))
type = LS_PI;
else if (S_ISSOCK (mode))
--
2.2.0.60.gb7b3c64
next prev parent reply other threads:[~2014-11-30 8:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-30 8:55 [PATCH 00/19] Add git-list-files Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 01/19] ls_colors.c: add $LS_COLORS parsing code Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 02/19] ls_colors.c: parse color.ls.* from config file Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 03/19] ls_colors.c: add a function to color a file name Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` Nguyễn Thái Ngọc Duy [this message]
2014-11-30 8:55 ` [PATCH 05/19] ls-files: buffer full item in strbuf before printing Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 06/19] ls-files: add --color to highlight file names Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 07/19] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 08/19] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 09/19] Add git-list-files, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-12-02 2:50 ` Eric Sunshine
2014-12-02 12:06 ` Duy Nguyen
2014-11-30 8:55 ` [PATCH 10/19] list-files: -u does not imply showing stages Nguyễn Thái Ngọc Duy
2014-11-30 8:55 ` [PATCH 11/19] list-files: add -R/--recursive short for --max-depth=-1 Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 12/19] list-files: add -1 short for --no-column Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 13/19] list-files: add -t back Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 14/19] list-files: sort output and remove duplicates Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 15/19] list-files: do not show duplicate cached entries Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 16/19] list-files: show directories as well as files Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 17/19] list-files: add -F/--classify Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 18/19] list-files -F: show submodules with the new indicator '&' Nguyễn Thái Ngọc Duy
2014-11-30 8:56 ` [PATCH 19/19] list-files: -M aka diff-cached Nguyễn Thái Ngọc Duy
2014-12-01 20:02 ` [PATCH 00/19] Add git-list-files Junio C Hamano
2014-12-02 11:33 ` Duy Nguyen
2014-12-02 5:42 ` Jeff King
2014-12-02 11:45 ` Duy Nguyen
2014-12-02 20:18 ` Jeff King
2014-12-02 12:40 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417337767-4505-5-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).