zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Removed OpenCFD-specific behaviour out of hooks

Browse Source
This commit is contained in:
andy
2011-04-06 15:14:25 +01:00
parent a5b19972d9
commit f0554905a1
2 changed files with 4 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bin/tools/pre-commit-hook
View File

@ -39,7 +39,6 @@
# #
# Checks for # Checks for
# - illegal code, e.g. <TAB> # - illegal code, e.g. <TAB>
# - copyright is current, e.g. if present, contains XXX-<current-year>
# - columns greater than 80 for *.[CH] files # - columns greater than 80 for *.[CH] files
# #
# Note # Note
@ -138,8 +137,8 @@ checkIllegalCode()
{ {
echo "$hookName: check bad strings/characters etc ..." 1>&2 echo "$hookName: check bad strings/characters etc ..." 1>&2
reBad="(N""abla|"$'\t'")" reBad="("$'\t'")"
msgBad="N""abla or <TAB>" msgBad="<TAB>"
scope=$(gitScope $@) scope=$(gitScope $@)
@ -167,40 +166,6 @@ checkIllegalCode()
} }
#
# check that OpenCFD copyright is current
#
checkCopyright()
{
year=$(date +%Y)
echo "$hookName: check copyright ..." 1>&2
scope=$(gitScope $@)
badFiles=$(
for f in $fileList
do
# NB: need to have OpenCFD on a separate line to prevent
# this check being caught by itself!
#
# parse line numbers from grep output:
# <lineNr>: contents
#
lines=$(git grep -F -hn -e Copyright \
--and -e OpenCFD \
--and --not -e "$year" \
$scope"$f" |
sed -e 's@:.*@@' |
tr '\n' ' '
)
[ -n "$lines" ] && echo "$Indent$f -- lines: $lines"
done
)
dieOnBadFiles "Update copyright year, e.g. XXXX-$year"
}
# #
# limit line length to 80-columns # limit line length to 80-columns
# #
@ -308,9 +273,6 @@ bad=$(git diff-index --cached --check $against --) || die "$bad"
# check for illegal code, e.g. <TAB>, etc # check for illegal code, e.g. <TAB>, etc
checkIllegalCode checkIllegalCode
# ensure OpenCFD copyright contains correct year
checkCopyright
# ensure code conforms to 80 columns max # ensure code conforms to 80 columns max
checkLineLengthNonDirective checkLineLengthNonDirective

42
bin/tools/pre-receive-hook
View File

@ -39,7 +39,6 @@
# #
# Checks for # Checks for
# - illegal code, e.g. <TAB> # - illegal code, e.g. <TAB>
# - copyright is current, e.g. if present, contains XXX-<current-year>
# - columns greater than 80 for *.[CH] files # - columns greater than 80 for *.[CH] files
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -101,8 +100,8 @@ checkIllegalCode()
{ {
echo "$hookName: check bad strings/characters etc ..." 1>&2 echo "$hookName: check bad strings/characters etc ..." 1>&2
reBad="(N""abla|"$'\t'"|"$'\r\n'")" reBad="("$'\t'"|"$'\r\n'")"
msgBad="N""abla, <TAB> or DOS-line-endings" msgBad="<TAB> or DOS-line-endings"
scope=$(gitScope $@) scope=$(gitScope $@)
@ -130,40 +129,6 @@ checkIllegalCode()
} }
#
# check that OpenCFD copyright is current
#
checkCopyright()
{
year=$(date +%Y)
echo "$hookName: check copyright ..." 1>&2
scope=$(gitScope $@)
badFiles=$(
for f in $fileList
do
# NB: need to have OpenCFD on a separate line to prevent
# this check being caught by itself!
#
# parse line numbers from grep output:
# <lineNr>: contents
#
lines=$(git grep -F -hn -e Copyright \
--and -e OpenCFD \
--and --not -e "$year" \
$scope"$f" |
sed -e 's@:.*@@' |
tr '\n' ' '
)
[ -n "$lines" ] && echo "$Indent$f -- lines: $lines"
done
)
dieOnBadFiles "Update copyright year, e.g. XXXX-$year"
}
# #
# limit line length to 80-columns # limit line length to 80-columns
# #
@ -297,9 +262,6 @@ do
# check for illegal code, e.g. <TAB>, etc # check for illegal code, e.g. <TAB>, etc
checkIllegalCode $newSHA1 checkIllegalCode $newSHA1
# ensure OpenCFD copyright contains correct year
checkCopyright $newSHA1
# ensure code conforms to 80 columns max # ensure code conforms to 80 columns max
checkLineLengthNonDirective $newSHA1 checkLineLengthNonDirective $newSHA1