mirror of
https://github.com/capstone-engine/llvm-capstone.git
synced 2024-10-09 12:24:08 +00:00
Use git-clang-format as Arcanist linter
D49116 was using clang-format-diff because at the time of its writing, it needed to handle the subversion repo as well. Differential Revision: https://reviews.llvm.org/D77363
This commit is contained in:
parent
a0983ed3d2
commit
31b6e182f2
@ -10,11 +10,11 @@ set -euo pipefail
|
|||||||
|
|
||||||
# To skip running all linters when creating/updating a diff, use `arc diff --nolint`.
|
# To skip running all linters when creating/updating a diff, use `arc diff --nolint`.
|
||||||
|
|
||||||
if ! hash clang-format-diff >/dev/null; then
|
if ! hash git-clang-format >/dev/null; then
|
||||||
# advice severity level is completely non-disruptive.
|
# advice severity level is completely non-disruptive.
|
||||||
# switch to warning or error if you want to prompt the user.
|
# switch to warning or error if you want to prompt the user.
|
||||||
echo "advice"
|
echo "advice"
|
||||||
echo "clang-format-diff not found in user's PATH; not linting file."
|
echo "git-clang-format not found in user's PATH; not linting file."
|
||||||
echo "===="
|
echo "===="
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@ -37,13 +37,13 @@ trap 'cleanup' INT HUP QUIT TERM EXIT
|
|||||||
|
|
||||||
# Arcanist can filter out lint messages for unchanged lines, but for that, we
|
# Arcanist can filter out lint messages for unchanged lines, but for that, we
|
||||||
# need to generate line by line lint messages. Instead, we generate one lint
|
# need to generate line by line lint messages. Instead, we generate one lint
|
||||||
# message on line 1, char 1 with file content edited using clang-format-diff.
|
# message on line 1, char 1 with file content edited using git-clang-format.
|
||||||
if git rev-parse --git-dir >/dev/null; then
|
if git rev-parse --git-dir >/dev/null; then
|
||||||
arc_base_commit=$(arc which --show-base)
|
arc_base_commit=$(arc which --show-base)
|
||||||
# An alternative is to use git-clang-format.
|
# An alternative is to use git-clang-format.
|
||||||
git diff -U0 --no-color "${arc_base_commit}"| clang-format-diff -style LLVM -i -p1
|
>&2 git-clang-format --quiet --force --style LLVM "${arc_base_commit}"
|
||||||
else
|
else
|
||||||
svn diff --diff-cmd=diff -x -U0 "${src_file}" | clang-format-diff -style LLVM -i
|
>&2 echo "repo is expected to be a git directory"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp -p "${src_file}" "${formatted_file}"
|
cp -p "${src_file}" "${formatted_file}"
|
||||||
|
Loading…
Reference in New Issue
Block a user