Skip to content
Permalink
Browse files

update indentation script

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12175 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Nov 18, 2009
1 parent 675cf05 commit af957ffc72ccb39b9f0d584de8d84ab0c89e9788
Showing with 27 additions and 4 deletions.
  1. +27 −4 scripts/update-indent.sh
@@ -8,10 +8,21 @@ if ! type -p colordiff >/dev/null; then
}
fi

if ! type -p flip >/dev/null; then
echo flip not found
exit 1
fi

set -e

# determine last commit
REV0=$(svn info | sed -ne "s/Revision: //p")
if [ -f .lastcommit ]; then
REV0=$(<.lastcommit)
svn revert -R .
svn update -r$REV0
else
REV0=$(svn info | sed -ne "s/Revision: //p")
fi

# update
MODIFIED=$(svn update | sed -ne "s/^[^ ]* *//p")
@@ -30,11 +41,22 @@ ASTYLEDIFF=astyle.r$REV0-r$REV1.diff
# reformat
for f in $MODIFIED; do
case "$f" in
src/core/spatialite/*)
echo $f skipped
continue
;;

*.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
cmd=astyle.sh
;;

*.ui|*.qgm|*.txt|*.t2t|*.py|*.sip|resources/context_help/*)
cmd="flip -ub"
;;

*)
continue
echo $f skipped
continue
;;
esac

@@ -46,7 +68,7 @@ for f in $MODIFIED; do
m=$f.r$REV1.prepare

cp $f $m
astyle.sh $f
$cmd $f
if diff -u $m $f >>$ASTYLEDIFF; then
# no difference found
rm $m
@@ -62,7 +84,8 @@ if [ -s "$ASTYLEDIFF" ]; then
fi

# just echo for now
echo svn commit -m "automatic indentation update (r$REV0-r$REV1)"
echo "svn commit -m \"automatic indentation update (r$REV0-r$REV1)\""
echo $REV1 >.lastcommit
else
echo "No indentation updates."
rm $ASTYLEDIFF

0 comments on commit af957ff

Please sign in to comment.