From 3347f618eb68c3bd8176cd8a9162424da79f55aa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 18 Sep 2009 16:28:10 +0000 Subject: [PATCH] Check that files being checked in use UTF-8. Closes #11116. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- misc/scripts/svn/hooks/pre-commit | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/misc/scripts/svn/hooks/pre-commit b/misc/scripts/svn/hooks/pre-commit index 9cacb13d44..5dabb3cea7 100755 --- a/misc/scripts/svn/hooks/pre-commit +++ b/misc/scripts/svn/hooks/pre-commit @@ -5,20 +5,34 @@ TXN="$2" SVNLOOK=/usr/bin/svnlook -changed_cpp_files=`$SVNLOOK changed "$REPOS" -t "$TXN" | \ +svn_cat() { + $SVNLOOK cat "$REPOS" -t "$TXN" $1 +} + +all_changed_files=`$SVNLOOK changed "$REPOS" -t "$TXN" | \ grep "^[AU]" | \ - sed 's/^....//' | \ + sed 's/^....//'` + +changed_sources=`echo $all_changed_files | \ egrep "\.(cpp|h|py)$" | \ - egrep -v "src/(tiff|regex|jpeg|stc/scintilla)" ` + egrep -v "src/(tiff|regex|jpeg|stc/scintilla)"` rc=0 set -e -for f in $changed_cpp_files; do - if $SVNLOOK cat "$REPOS" -t "$TXN" $f | fgrep -q ' '; then + +for f in $changed_sources; do + if svn_cat $f | fgrep -q ' '; then echo "Please remove TABs from $f before committing." >&2 rc=1 fi done +for f in $all_changed_files; do + if ! svn_cat $f | iconv -f utf8 -t WCHAR_T > /dev/null; then + echo "File $f doesn't use UTF-8, please convert it before committing." >&2 + rc=1 + fi +done + exit $rc -- 2.45.2