mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 07:25:18 +00:00
Code Issues Releases Wiki Activity

[#3210] add ability to format changed files

Browse Source
This commit is contained in:
Andrei Pavel
2024-02-21 14:40:18 +02:00
parent 64845de542
commit eb29546cd7
2 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/clang-format.sh
View File

@@ -43,6 +43,9 @@ while test ${#} -gt 0; do
# [-h|--help] print usage (this text). # [-h|--help] print usage (this text).
'-h'|'--help') print_usage; exit 0 ;; '-h'|'--help') print_usage; exit 0 ;;
# [-c|--changed] format changed files only
'-c'|'--changed') changed=true ;;
# Allow extra arguments, they should be directories or files to be formatted. # Allow extra arguments, they should be directories or files to be formatted.
*) break ;; *) break ;;
esac; shift esac; shift
@@ -51,8 +54,11 @@ done
# Get script path. # Get script path.
script_path=$(cd "$(dirname "${0}")" && pwd) script_path=$(cd "$(dirname "${0}")" && pwd)
# Use current directory when called without an argument. list_of_files=
if test ${#} = 0; then if ${changed-false}; then
list_of_files=$(git diff $(git merge-base origin/master HEAD) --name-only | grep -E "${extensions_regex}")
elif test ${#} = 0; then
# Use current directory when called without an argument.
set -- . set -- .
fi fi
@@ -61,16 +67,23 @@ filtered_out=$("${script_path}/print-generated-files.sh")
# For all arguments... # For all arguments...
parameters= parameters=
while test ${#} -gt 0; do while test ${#} -gt 0 || test -n "${list_of_files}"; do
# Preserve parameters that begin with dash and pass them to clang-format. # Preserve parameters that begin with dash and pass them to clang-format.
if test "$(printf '%s' "${1}" | cut -c 1)" = '-'; then if test ${#} -gt 0 && test "$(printf '%s' "${1}" | cut -c 1)" = '-'; then
parameters="${parameters} ${1}" parameters="${parameters} ${1}"
shift shift
continue continue
fi fi
# The rest of the parameters are considered files or directories. if test -n "${list_of_files}"; then
file=${1} # First exhaust list_of_files.
file=$(printf '%s\n' "${list_of_files}" | head -n 1)
list_of_files=$(printf '%s\n' "${list_of_files}" | tail -n +2)
else
# Then exhaust parameters.
file=${1}
shift
fi
# Get absolute path. # Get absolute path.
if test "$(printf '%s' "${file}" | grep -Eo '^.')" != '/'; then if test "$(printf '%s' "${file}" | grep -Eo '^.')" != '/'; then
@@ -97,8 +110,7 @@ while test ${#} -gt 0; do
# Get list of files to format. # Get list of files to format.
cd "$(git rev-parse --show-toplevel)" cd "$(git rev-parse --show-toplevel)"
files=$(git ls-files | xargs -n1 printf "${PWD}/%s\\n" | grep -F "${file}" \ files=$(git ls-files | xargs -n1 printf "${PWD}/%s\\n" | grep -F "${file}" | grep -E "${extensions_regex}")
| grep -E "${extensions_regex}")
# Filter out generated files. # Filter out generated files.
for file in ${filtered_out}; do for file in ${filtered_out}; do
@@ -115,6 +127,4 @@ while test ${#} -gt 0; do
"${0}" "${i}" "${0}" "${i}"
done done
fi fi
shift
done done

30
tools/uncrustify.sh
View File

@@ -43,6 +43,9 @@ while test ${#} -gt 0; do
# [-h|--help] print usage (this text). # [-h|--help] print usage (this text).
'-h'|'--help') print_usage; exit 0 ;; '-h'|'--help') print_usage; exit 0 ;;
# [-c|--changed] format changed files only
'-c'|'--changed') changed=true ;;
# Allow extra arguments, they should be directories or files to be formatted. # Allow extra arguments, they should be directories or files to be formatted.
*) break ;; *) break ;;
esac; shift esac; shift
@@ -51,8 +54,11 @@ done
# Get script path. # Get script path.
script_path=$(cd "$(dirname "${0}")" && pwd) script_path=$(cd "$(dirname "${0}")" && pwd)
# Use current directory when called without an argument. list_of_files=
if test ${#} = 0; then if ${changed-false}; then
list_of_files=$(git diff $(git merge-base origin/master HEAD) --name-only | grep -E "${extensions_regex}")
elif test ${#} = 0; then
# Use current directory when called without an argument.
set -- . set -- .
fi fi
@@ -61,16 +67,23 @@ filtered_out=$("${script_path}/print-generated-files.sh")
# For all arguments... # For all arguments...
parameters= parameters=
while test ${#} -gt 0; do while test ${#} -gt 0 || test -n "${list_of_files}"; do
# Preserve parameters that begin with dash and pass them to uncrustify. # Preserve parameters that begin with dash and pass them to uncrustify.
if test "$(printf '%s' "${1}" | cut -c 1)" = '-'; then if test ${#} -gt 0 && test "$(printf '%s' "${1}" | cut -c 1)" = '-'; then
parameters="${parameters} ${1}" parameters="${parameters} ${1}"
shift shift
continue continue
fi fi
# The rest of the parameters are considered files or directories. if test -n "${list_of_files}"; then
file=${1} # First exhaust list_of_files.
file=$(printf '%s\n' "${list_of_files}" | head -n 1)
list_of_files=$(printf '%s\n' "${list_of_files}" | tail -n +2)
else
# Then exhaust parameters.
file=${1}
shift
fi
# Get absolute path. # Get absolute path.
if test "$(printf '%s' "${file}" | grep -Eo '^.')" != '/'; then if test "$(printf '%s' "${file}" | grep -Eo '^.')" != '/'; then
@@ -97,8 +110,7 @@ while test ${#} -gt 0; do
# Get list of files to format. # Get list of files to format.
cd "$(git rev-parse --show-toplevel)" cd "$(git rev-parse --show-toplevel)"
files=$(git ls-files | xargs -n1 printf "${PWD}/%s\\n" | grep -F "${file}" \ files=$(git ls-files | xargs -n1 printf "${PWD}/%s\\n" | grep -F "${file}" | grep -E "${extensions_regex}")
| grep -E "${extensions_regex}")
# Filter out generated files. # Filter out generated files.
for file in ${filtered_out}; do for file in ${filtered_out}; do
@@ -115,6 +127,4 @@ while test ${#} -gt 0; do
"${0}" "${i}" "${0}" "${i}"
done done
fi fi
shift
done done