From 243377ffacc74b234e47cd5928207cd8911d757b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 30 Mar 2020 09:03:38 +0200 Subject: [PATCH] Hooks: Use pygmentize if available to visualize diff (cherry picked from commit 4d52761da6f15ee0374a4cac958cc7cd12507adc) --- misc/hooks/pre-commit-black | 8 ++++++-- misc/hooks/pre-commit-clang-format | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/misc/hooks/pre-commit-black b/misc/hooks/pre-commit-black index 3dd0a13330d..2dcc2e8cf1a 100755 --- a/misc/hooks/pre-commit-black +++ b/misc/hooks/pre-commit-black @@ -18,8 +18,12 @@ FILE_EXTS="py" # Use pygmentize instead of cat to parse diff with highlighting. # Install it with `pip install pygments` (Linux) or `easy_install Pygments` (Mac) -# READER="pygmentize -l diff" -READER=cat +PYGMENTIZE=`which pygmentize` +if [ ! -z "$PYGMENTIZE" ]; then + READER="pygmentize -l diff" +else + READER=cat +fi ################################################################## # There should be no need to change anything below this line. diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index f3689890dff..c5cf4ecbb1f 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -31,8 +31,12 @@ FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx .m .mm .inc .java .glsl" # Use pygmentize instead of cat to parse diff with highlighting. # Install it with `pip install pygments` (Linux) or `easy_install Pygments` (Mac) -# READER="pygmentize -l diff" -READER=cat +PYGMENTIZE=`which pygmentize` +if [ ! -z "$PYGMENTIZE" ]; then + READER="pygmentize -l diff" +else + READER=cat +fi ################################################################## # There should be no need to change anything below this line.