Improve clang-format detection & enforcement (#3462)

* Improve the detection of non-clang-format-compliant commits/diffs

* Fix formatting

* Add .clang-format to version control; have it consistent and fixed across environments

.clang-format.base → .clang-format

@@ -34,7 +34,6 @@ BraceWrapping:
   AfterClass: true
   BeforeCatch: true
   BeforeElse: true
-  BeforeLambdaBody: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
 SortIncludes: true

.gitignore

@@ -82,6 +82,3 @@ Testing
 
 # Autogenerated Build Prep artifacts
 util/build_prep/*/prep.sh
-
-# Autogenerated Tooling
-.clang-format

ci/check-commit-format.sh

@@ -2,19 +2,21 @@
 
 set -e
 
-source "$(dirname "$BASH_SOURCE")/detect-clang-format.sh"
+if [[ ! -z $(git status --untracked-files=no --porcelain) ]]; then
+    echo "Unable to run script: working directory not clean (see git status)"
+    exit 1
+fi
+
 source "$(dirname "$BASH_SOURCE")/common.sh"
 
-"$REPO_ROOT/ci/update-clang-format"
+"$REPO_ROOT/ci/clang-format-all.sh"
 
-clang_format_result=$(python "$REPO_ROOT/ci/git-clang-format.py" --diff --extensions "hpp,cpp")
-if [[ $clang_format_result != "no modified files to format" ]] &&
-   [[ $clang_format_result != "clang-format did not modify any files" ]]; then
-    python "$REPO_ROOT/ci/git-clang-format.py" --diff --extensions "hpp,cpp"
-    echo
+if [[ ! -z $(git status --untracked-files=no --porcelain) ]]; then
     echo "Code formatting differs from expected - please run ci/clang-format-all.sh"
+    git diff
+    git reset --hard HEAD > /dev/null
     exit 1
-else
-    echo "clang-format passed"
-    exit 0
 fi
+
+echo "clang-format passed"
+exit 0

ci/clang-format-all.sh

@@ -2,9 +2,7 @@
 
 set -e
 
-source $(dirname $BASH_SOURCE)/detect-clang-format.sh
-source $(dirname $BASH_SOURCE)/common.sh
+source "$(dirname "$BASH_SOURCE")/detect-clang-format.sh"
+source "$(dirname "$BASH_SOURCE")/common.sh"
 
-cd "$REPO_ROOT"
-./ci/update-clang-format
-find nano -iname '*.h' -o -iname '*.hpp' -o -iname '*.cpp' | xargs "$CLANG_FORMAT" -i
+find "$REPO_ROOT/nano" -iname '*.h' -o -iname '*.hpp' -o -iname '*.cpp' | xargs "$CLANG_FORMAT" -i -style=file

ci/detect-clang-format.sh

@@ -39,3 +39,5 @@ if [[ -z $CLANG_FORMAT ]]; then
     echo "No 'clang-format' of version '$CLANG_FORMAT_VERSION' could be detected in your PATH."
     exit 1
 fi
+
+echo "Using '$CLANG_FORMAT' version '$CLANG_FORMAT_VERSION'"