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 v3 02/18] ls_colors.c: parse color.ls.* from config file
Date: Sun, 30 Mar 2014 20:55:53 +0700 [thread overview]
Message-ID: <1396187769-30863-3-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1396187769-30863-1-git-send-email-pclouds@gmail.com>
This is the second (and preferred) source for color information. This
will override $LS_COLORS.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/config.txt | 11 +++++++++++
ls_colors.c | 26 ++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 73c8973..3fb754e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -909,6 +909,17 @@ color.status.<slot>::
to red). The values of these variables may be specified as in
color.branch.<slot>.
+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`,
+ `missing`, `orphan`, `executable`, `door`, `setuid`, `setgid`,
+ `sticky`, `otherwritable`, `stickyotherwritable`, `cap`,
+ `multihardlink`. The values of these variables may be
+ specified as in color.branch.<slot>.
+
+
color.ui::
This variable determines the default value for variables such
as `color.diff` and `color.grep` that control the use of color
diff --git a/ls_colors.c b/ls_colors.c
index eb944f4..cef5a92 100644
--- a/ls_colors.c
+++ b/ls_colors.c
@@ -68,6 +68,14 @@ static const char *const indicator_name[] = {
NULL
};
+static const char* const config_name[] = {
+ "", "", "", "", "normal", "file", "directory", "symlink",
+ "fifo", "socket", "block", "char", "missing", "orphan", "executable",
+ "door", "setuid", "setgid", "sticky", "otherwritable",
+ "stickyotherwritable", "cap", "multihardlink", "",
+ NULL
+};
+
struct bin_str {
size_t len; /* Number of bytes */
const char *string; /* Pointer to the same */
@@ -285,6 +293,23 @@ static int get_funky_string(char **dest, const char **src, int equals_end,
return state != ST_ERROR;
}
+static int ls_colors_config(const char *var, const char *value, void *cb)
+{
+ int slot;
+ if (!starts_with(var, "color.ls."))
+ return 0;
+ var += 9;
+ for (slot = 0; config_name[slot]; slot++)
+ if (!strcasecmp(var, config_name[slot]))
+ break;
+ if (!config_name[slot])
+ return 0;
+ if (!value)
+ return config_error_nonbool(var);
+ color_parse(value, var, ls_colors[slot]);
+ return 0;
+}
+
void parse_ls_color(void)
{
const char *p; /* Pointer to character being parsed */
@@ -395,4 +420,5 @@ void parse_ls_color(void)
if (!strcmp(ls_colors[LS_LN], "target"))
color_symlink_as_referent = 1;
+ git_config(ls_colors_config, NULL);
}
--
1.9.1.345.ga1a145c
next prev parent reply other threads:[~2014-03-30 13:56 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 10:15 [PATCH/RFC 0/8] git-ls Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 1/8] Import $LS_COLORS parsing code from coreutils Nguyễn Thái Ngọc Duy
2014-03-20 19:09 ` David Tran
2014-03-21 11:54 ` Duy Nguyen
2014-03-21 20:01 ` David Tran
2014-03-20 10:15 ` [PATCH 2/8] ls_colors.c: a bit of document on print_color_indicator input Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 3/8] ls_colors.c: enable coloring on u+x files Nguyễn Thái Ngọc Duy
2014-03-20 11:46 ` Matthieu Moy
2014-03-20 12:14 ` Duy Nguyen
2014-03-20 17:41 ` Junio C Hamano
2014-03-21 11:52 ` Duy Nguyen
2014-03-20 10:15 ` [PATCH 4/8] ls_colors.c: new color descriptors Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 5/8] ls-files: add --color to highlight based on $LS_COLORS Nguyễn Thái Ngọc Duy
2014-03-20 10:15 ` [PATCH 6/8] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-03-25 11:34 ` Matthieu Moy
2014-03-20 10:15 ` [PATCH 7/8] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-03-25 8:55 ` Matthieu Moy
2014-03-25 11:15 ` Duy Nguyen
2014-03-27 14:36 ` Duy Nguyen
2014-03-28 13:52 ` Matthieu Moy
2014-03-28 14:15 ` Duy Nguyen
2014-03-28 14:38 ` Duy Nguyen
2014-03-20 10:15 ` [PATCH 8/8] Add git-ls, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-03-20 11:56 ` Matthieu Moy
2014-03-26 13:48 ` [PATCH v2 00/17] git-ls Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 01/17] ls_colors.c: add $LS_COLORS parsing code Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 02/17] ls_colors.c: parse color.ls.* from config file Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 03/17] ls_colors.c: add function to color a file name Nguyễn Thái Ngọc Duy
2014-03-26 19:14 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 04/17] ls_colors.c: highlight submodules like directories Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 05/17] ls-files: buffer full item in strbuf before printing Nguyễn Thái Ngọc Duy
2014-03-26 19:22 ` Eric Sunshine
2014-03-26 23:18 ` Duy Nguyen
2014-03-27 5:22 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 06/17] ls-files: add --color to highlight file names Nguyễn Thái Ngọc Duy
2014-03-26 19:13 ` Eric Sunshine
2014-03-26 23:15 ` Duy Nguyen
2014-03-28 0:49 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 07/17] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-03-26 19:46 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 08/17] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-03-26 19:50 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 09/17] ls-files: split main ls-files logic into ls_files() function Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 10/17] Add git-ls, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-03-26 20:16 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 11/17] ls: -u does not imply showing stages Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 12/17] ls: add -R/--recursive short for --max-depth=-1 Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 13/17] ls: add -1 short for --no-column in the spirit of GNU ls Nguyễn Thái Ngọc Duy
2014-03-28 3:52 ` Eric Sunshine
2014-03-26 13:48 ` [PATCH v2 14/17] ls: add -t back Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 15/17] ls: sort output and remove duplicates Nguyễn Thái Ngọc Duy
2014-03-26 13:48 ` [PATCH v2 16/17] ls: do not show duplicate cached entries Nguyễn Thái Ngọc Duy
2014-03-28 4:04 ` Eric Sunshine
2014-03-28 13:18 ` [PATCH] ls-files: do not trust stat info if lstat() fails Nguyễn Thái Ngọc Duy
2014-04-02 18:15 ` Junio C Hamano
2014-04-03 12:40 ` Duy Nguyen
2014-04-03 16:30 ` Junio C Hamano
2014-04-05 8:03 ` Duy Nguyen
2014-04-07 17:13 ` Junio C Hamano
2014-03-26 13:48 ` [PATCH v2 17/17] ls: show directories as well as files Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 00/18] git-ls Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 01/18] ls_colors.c: add $LS_COLORS parsing code Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` Nguyễn Thái Ngọc Duy [this message]
2014-03-30 13:55 ` [PATCH v3 03/18] ls_colors.c: add a function to color a file name Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 04/18] ls_colors.c: highlight submodules like directories Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 05/18] ls-files: buffer full item in strbuf before printing Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 06/18] ls-files: add --color to highlight file names Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 07/18] ls-files: add --column Nguyễn Thái Ngọc Duy
2014-03-30 13:55 ` [PATCH v3 08/18] ls-files: support --max-depth Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 09/18] Add git-list-files, a user friendly version of ls-files and more Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 10/18] list-files: -u does not imply showing stages Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 11/18] list-files: add -R/--recursive short for --max-depth=-1 Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 12/18] list-files: add -1 short for --no-column Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 13/18] list-files: add -t back Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 14/18] list-files: sort output and remove duplicates Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 15/18] list-files: do not show duplicate cached entries Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 16/18] list-files: show directories as well as files Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 17/18] list-files: add -F/--classify Nguyễn Thái Ngọc Duy
2014-03-30 13:56 ` [PATCH v3 18/18] list-files -F: show submodules with the new indicator '&' Nguyễn Thái Ngọc Duy
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=1396187769-30863-3-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).