third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-19 17:14:43 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1382 from pre-commit/better_windows_color

Browse source 
support colors on windows during git better
This commit is contained in:
Anthony Sottile 2020-04-02 07:48:17 -07:00 • committed by GitHub
commit 30a36a8a00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pre_commit/color.py
View file

@ -11,7 +11,7 @@ if sys.platform == 'win32': # pragma: no cover (windows)
from ctypes.wintypes import DWORD from ctypes.wintypes import DWORD
from ctypes.wintypes import HANDLE from ctypes.wintypes import HANDLE
STD_OUTPUT_HANDLE = -11 STD_ERROR_HANDLE = -12
ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4 ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
def bool_errcheck(result, func, args): def bool_errcheck(result, func, args):
@ -40,9 +40,9 @@ if sys.platform == 'win32': # pragma: no cover (windows)
# #
# More info on the escape sequences supported: # More info on the escape sequences supported:
# https://msdn.microsoft.com/en-us/library/windows/desktop/mt638032(v=vs.85).aspx # https://msdn.microsoft.com/en-us/library/windows/desktop/mt638032(v=vs.85).aspx
stdout = GetStdHandle(STD_OUTPUT_HANDLE) stderr = GetStdHandle(STD_ERROR_HANDLE)
flags = GetConsoleMode(stdout) flags = GetConsoleMode(stderr)
SetConsoleMode(stdout, flags | ENABLE_VIRTUAL_TERMINAL_PROCESSING) SetConsoleMode(stderr, flags | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
try: try:
_enable() _enable()
@ -90,7 +90,7 @@ def use_color(setting: str) -> bool:
return ( return (
setting == 'always' or ( setting == 'always' or (
setting == 'auto' and setting == 'auto' and
sys.stdout.isatty() and sys.stderr.isatty() and
terminal_supports_color and terminal_supports_color and
os.getenv('TERM') != 'dumb' os.getenv('TERM') != 'dumb'
) )

8
tests/color_test.py
View file

@ -29,26 +29,26 @@ def test_use_color_always():
def test_use_color_no_tty(): def test_use_color_no_tty():
with mock.patch.object(sys.stdout, 'isatty', return_value=False): with mock.patch.object(sys.stderr, 'isatty', return_value=False):
assert use_color('auto') is False assert use_color('auto') is False
def test_use_color_tty_with_color_support(): def test_use_color_tty_with_color_support():
with mock.patch.object(sys.stdout, 'isatty', return_value=True): with mock.patch.object(sys.stderr, 'isatty', return_value=True):
with mock.patch('pre_commit.color.terminal_supports_color', True): with mock.patch('pre_commit.color.terminal_supports_color', True):
with envcontext.envcontext((('TERM', envcontext.UNSET),)): with envcontext.envcontext((('TERM', envcontext.UNSET),)):
assert use_color('auto') is True assert use_color('auto') is True
def test_use_color_tty_without_color_support(): def test_use_color_tty_without_color_support():
with mock.patch.object(sys.stdout, 'isatty', return_value=True): with mock.patch.object(sys.stderr, 'isatty', return_value=True):
with mock.patch('pre_commit.color.terminal_supports_color', False): with mock.patch('pre_commit.color.terminal_supports_color', False):
with envcontext.envcontext((('TERM', envcontext.UNSET),)): with envcontext.envcontext((('TERM', envcontext.UNSET),)):
assert use_color('auto') is False assert use_color('auto') is False
def test_use_color_dumb_term(): def test_use_color_dumb_term():
with mock.patch.object(sys.stdout, 'isatty', return_value=True): with mock.patch.object(sys.stderr, 'isatty', return_value=True):
with mock.patch('pre_commit.color.terminal_supports_color', True): with mock.patch('pre_commit.color.terminal_supports_color', True):
with envcontext.envcontext((('TERM', 'dumb'),)): with envcontext.envcontext((('TERM', 'dumb'),)):
assert use_color('auto') is False assert use_color('auto') is False