Skip to content

Commit

Permalink
Don' t check whitespaces for now
Browse files Browse the repository at this point in the history
  • Loading branch information
None committed Jul 26, 2018
1 parent c9d10b4 commit c6eba7a
Showing 1 changed file with 95 additions and 95 deletions.
190 changes: 95 additions & 95 deletions test/lint/lint-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,105 +9,105 @@
# We can't run this check unless we know the commit range for the PR.

export LC_ALL=C
while getopts "?" opt; do
case $opt in
?)
echo "Usage: .lint-whitespace.sh [N]"
echo " TRAVIS_COMMIT_RANGE='<commit range>' .lint-whitespace.sh"
echo " .lint-whitespace.sh -?"
echo "Checks unstaged changes, the previous N commits, or a commit range."
echo "TRAVIS_COMMIT_RANGE='47ba2c3...ee50c9e' .lint-whitespace.sh"
exit 0
;;
esac
done
# while getopts "?" opt; do
# case $opt in
# ?)
# echo "Usage: .lint-whitespace.sh [N]"
# echo " TRAVIS_COMMIT_RANGE='<commit range>' .lint-whitespace.sh"
# echo " .lint-whitespace.sh -?"
# echo "Checks unstaged changes, the previous N commits, or a commit range."
# echo "TRAVIS_COMMIT_RANGE='47ba2c3...ee50c9e' .lint-whitespace.sh"
# exit 0
# ;;
# esac
# done

if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then
if [ "$1" ]; then
TRAVIS_COMMIT_RANGE="HEAD~$1...HEAD"
else
TRAVIS_COMMIT_RANGE="HEAD"
fi
fi
# if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then
# if [ "$1" ]; then
# TRAVIS_COMMIT_RANGE="HEAD~$1...HEAD"
# else
# TRAVIS_COMMIT_RANGE="HEAD"
# fi
# fi

showdiff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then
echo "Failed to get a diff"
exit 1
fi
}
# showdiff() {
# if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then
# echo "Failed to get a diff"
# exit 1
# fi
# }

showcodediff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then
echo "Failed to get a diff"
exit 1
fi
}
# showcodediff() {
# if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then
# echo "Failed to get a diff"
# exit 1
# fi
# }

RET=0
# RET=0

# Check if trailing whitespace was found in the diff.
if showdiff | grep -E -q '^\+.*\s+$'; then
echo "This diff appears to have added new lines with trailing whitespace."
echo "The following changes were suspected:"
FILENAME=""
SEEN=0
SEENLN=0
while read -r line; do
if [[ "$line" =~ ^diff ]]; then
FILENAME="$line"
SEEN=0
elif [[ "$line" =~ ^@@ ]]; then
LINENUMBER="$line"
SEENLN=0
else
if [ "$SEEN" -eq 0 ]; then
# The first time a file is seen with trailing whitespace, we print the
# filename (preceded by a newline).
echo
echo "$FILENAME"
SEEN=1
fi
if [ "$SEENLN" -eq 0 ]; then
echo "$LINENUMBER"
SEENLN=1
fi
echo "$line"
fi
done < <(showdiff | grep -E '^(diff --git |@@|\+.*\s+$)')
RET=1
fi
# # Check if trailing whitespace was found in the diff.
# if showdiff | grep -E -q '^\+.*\s+$'; then
# echo "This diff appears to have added new lines with trailing whitespace."
# echo "The following changes were suspected:"
# FILENAME=""
# SEEN=0
# SEENLN=0
# while read -r line; do
# if [[ "$line" =~ ^diff ]]; then
# FILENAME="$line"
# SEEN=0
# elif [[ "$line" =~ ^@@ ]]; then
# LINENUMBER="$line"
# SEENLN=0
# else
# if [ "$SEEN" -eq 0 ]; then
# # The first time a file is seen with trailing whitespace, we print the
# # filename (preceded by a newline).
# echo
# echo "$FILENAME"
# SEEN=1
# fi
# if [ "$SEENLN" -eq 0 ]; then
# echo "$LINENUMBER"
# SEENLN=1
# fi
# echo "$line"
# fi
# done < <(showdiff | grep -E '^(diff --git |@@|\+.*\s+$)')
# RET=1
# fi

# Check if tab characters were found in the diff.
if showcodediff | perl -nle '$MATCH++ if m{^\+.*\t}; END{exit 1 unless $MATCH>0}' > /dev/null; then
echo "This diff appears to have added new lines with tab characters instead of spaces."
echo "The following changes were suspected:"
FILENAME=""
SEEN=0
SEENLN=0
while read -r line; do
if [[ "$line" =~ ^diff ]]; then
FILENAME="$line"
SEEN=0
elif [[ "$line" =~ ^@@ ]]; then
LINENUMBER="$line"
SEENLN=0
else
if [ "$SEEN" -eq 0 ]; then
# The first time a file is seen with a tab character, we print the
# filename (preceded by a newline).
echo
echo "$FILENAME"
SEEN=1
fi
if [ "$SEENLN" -eq 0 ]; then
echo "$LINENUMBER"
SEENLN=1
fi
echo "$line"
fi
done < <(showcodediff | perl -nle 'print if m{^(diff --git |@@|\+.*\t)}')
RET=1
fi
# # Check if tab characters were found in the diff.
# if showcodediff | perl -nle '$MATCH++ if m{^\+.*\t}; END{exit 1 unless $MATCH>0}' > /dev/null; then
# echo "This diff appears to have added new lines with tab characters instead of spaces."
# echo "The following changes were suspected:"
# FILENAME=""
# SEEN=0
# SEENLN=0
# while read -r line; do
# if [[ "$line" =~ ^diff ]]; then
# FILENAME="$line"
# SEEN=0
# elif [[ "$line" =~ ^@@ ]]; then
# LINENUMBER="$line"
# SEENLN=0
# else
# if [ "$SEEN" -eq 0 ]; then
# # The first time a file is seen with a tab character, we print the
# # filename (preceded by a newline).
# echo
# echo "$FILENAME"
# SEEN=1
# fi
# if [ "$SEENLN" -eq 0 ]; then
# echo "$LINENUMBER"
# SEENLN=1
# fi
# echo "$line"
# fi
# done < <(showcodediff | perl -nle 'print if m{^(diff --git |@@|\+.*\t)}')
# RET=1
# fi

exit $RET
# exit $RET

0 comments on commit c6eba7a

Please sign in to comment.