global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-07 23:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

log --format: teach %C(auto,black) to respect color config

Browse Source 
Traditionally, %C(color attr) always emitted the ANSI color
sequence; it was up to the scripts that wanted to conditionally
color their output to omit %C(...) specifier when they do not want
colors.

Optionally allow "auto," to be prefixed to the color, so that the
output is colored iff we would color regular "log" output
(e.g., taking into account color.* and --color command line
options).

Tests and pretty_context bits by Jeff King <peff@peff.net>.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-12-17 17:56:49 -05:00
parent 2581ad5e85
commit 30825178fb
5 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
t/t6006-rev-list-format.sh
View File

@@ -3,6 +3,7 @@
test_description='git rev-list --pretty=format test'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
test_tick
test_expect_success 'setup' '
@@ -19,6 +20,18 @@ test_format () {
"
}
# Feed to --format to provide predictable colored sequences.
AUTO_COLOR='%C(auto,red)foo%C(auto,reset)'
has_color () {
printf '\033[31mfoo\033[m\n' >expect &&
test_cmp expect "$1"
}
has_no_color () {
echo foo >expect &&
test_cmp expect "$1"
}
test_format percent %%h <<'EOF'
commit 131a310eb913d107dd3c09a65d1651175898735d
%h
@@ -124,6 +137,48 @@ commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
foo
EOF
test_expect_success '%C(auto) does not enable color by default' '
git log --format=$AUTO_COLOR -1 >actual &&
has_no_color actual
'
test_expect_success '%C(auto) enables colors for color.diff' '
git -c color.diff=always log --format=$AUTO_COLOR -1 >actual &&
has_color actual
'
test_expect_success '%C(auto) enables colors for color.ui' '
git -c color.ui=always log --format=$AUTO_COLOR -1 >actual &&
has_color actual
'
test_expect_success '%C(auto) respects --color' '
git log --format=$AUTO_COLOR -1 --color >actual &&
has_color actual
'
test_expect_success '%C(auto) respects --no-color' '
git -c color.ui=always log --format=$AUTO_COLOR -1 --no-color >actual &&
has_no_color actual
'
test_expect_success TTY '%C(auto) respects --color=auto (stdout is tty)' '
(
TERM=vt100 && export TERM &&
test_terminal \
git log --format=$AUTO_COLOR -1 --color=auto >actual &&
has_color actual
)
'
test_expect_success '%C(auto) respects --color=auto (stdout not tty)' '
(
TERM=vt100 && export TERM &&
git log --format=$AUTO_COLOR -1 --color=auto >actual &&
has_no_color actual
)
'
cat >commit-msg <<'EOF'
Test printing of complex bodies