Ticket #138: scripts_f0ce608e320e.patch

scripts/unify-sources.sh

@@ -25 +25 @@
  *
  */
 "
-        awk 'BEGIN { pm=0; }
+    awk 'BEGIN { pm=0; }
      pm==3 { print }
      /\/\* / && pm==0 { pm=1;}
      /[^:blank:]/ && (pm==0 || pm==2) { pm=3; print;}
      /\*\// && pm==1 { pm=2;}
     ' $1
-        ) >$TMP_FILE
-
-    HEADER_CH=`diff -q $TMP_FILE $FILE_NAME >/dev/null&&echo NO||echo YES`
-
-    rm $FILE_NAME
-    mv $TMP_FILE $FILE_NAME
+       ) >$TMP_FILE
+        
+    if [[ $CHECK_MODE -gt 0 ]];
+    then
+        if ! diff -q $TMP_FILE $FILE_NAME >/dev/null ;
+        then 
+            echo "header failed"
+            FILE_FAILED=YES
+        fi
+    else
+        HEADER_CH=`diff -q $TMP_FILE $FILE_NAME >/dev/null&&echo NO||echo YES`
+        rm $FILE_NAME
+        mv $TMP_FILE $FILE_NAME
+    fi
 }
 
 function update_tabs() {
-    TMP_FILE=`mktemp`
-    FILE_NAME=$1
+    if echo $1 | grep -q -v -E 'Makefile\.am$' ;
+    then
+        OLD_PATTERN=`echo -e '\t'`
+        NEW_PATTERN='        '
+    else
+        OLD_PATTERN='        '
+        NEW_PATTERN=`echo -e '\t'`
+    fi
 
-    cat $1 |
-    sed -e 's/\t/        /g' >$TMP_FILE
-
-    TABS_CH=`diff -q $TMP_FILE $FILE_NAME >/dev/null&&echo NO||echo YES`
-
-    rm $FILE_NAME
-    mv $TMP_FILE $FILE_NAME
+    if [[ $CHECK_MODE -gt 0 ]];
+    then
+        if grep -q -E "$OLD_PATTERN" $1 ;
+        then
+            echo "tabs failed:"
+            grep -n -E "$OLD_PATTERN" $1
+            FILE_FAILED=YES
+        fi
+    else
+        TMP_FILE=`mktemp`
+        cat $1 | sed -e "s/$OLD_PATTERN/$NEW_PATTERN/g" >$TMP_FILE
+        TABS_CH=`diff -q $TMP_FILE $1 >/dev/null&&echo NO||echo YES`
+        rm $1
+        mv $TMP_FILE $1
+    fi
 }
 
-function remove_trailing_space() {
-    TMP_FILE=`mktemp`
-    FILE_NAME=$1
-
-    cat $1 |
-    sed -e 's/ \+$//g' >$TMP_FILE
-
-    SPACES_CH=`diff -q $TMP_FILE $FILE_NAME >/dev/null&&echo NO||echo YES`
-
-    rm $FILE_NAME
-    mv $TMP_FILE $FILE_NAME
+function remove_trailing_spaces() {
+    if [[ $CHECK_MODE -gt 0 ]];
+    then
+        if grep -q -E ' $' $1 ;
+        then
+            echo "trailing spaces failed:"
+            grep -n -E ' $' $1
+            FILE_FAILED=YES
+        fi
+    else
+        TMP_FILE=`mktemp`
+        cat $1 | sed -e 's/ \+$//g' >$TMP_FILE
+        SPACES_CH=`diff -q $TMP_FILE $1 >/dev/null&&echo NO||echo YES`
+        rm $1
+        mv $TMP_FILE $1
+    fi
 }
 
 function long_line_test() {
-    cat $1 |grep -q -E '.{81,}'
+    cat $1 | grep -q -E '.{81,}'
 }
 
 function update_file() {
-    echo -n '    update' $i ...
+    echo -n '    update' $1...
 
-    update_header $1
+    if echo $1 | grep -q -v -E 'Makefile\.am$' ;
+    then
+        update_header $1
+    fi
     update_tabs $1
-    remove_trailing_space $1
+    remove_trailing_spaces $1
 
-    CHANGED=NO;
+    CHANGED=NO
     if [[ $HEADER_CH = YES ]];
     then
-        echo -n '  [header updated]'
-        CHANGED=YES;
+        echo -n '  [header updated]'
+        CHANGED=YES
     fi
     if [[ $TABS_CH = YES ]];
     then
-        echo -n ' [tabs removed]'
-        CHANGED=YES;
+        if echo $1 | grep -q -v -E 'Makefile\.am$' ;
+        then
+            echo -n ' [tabs removed]'
+        else
+            echo -n ' [spaces replaced with tabs]'
+        fi
+        CHANGED=YES
     fi
     if [[ $SPACES_CH = YES ]];
     then
-        echo -n ' [trailing spaces removed]'
-        CHANGED=YES;
+        echo -n ' [trailing spaces removed]'
+        CHANGED=YES
     fi
-    if long_line_test $1 ;
+    if echo $1 | grep -q -v -E '\.dox|Makefile\.am$' ;
     then
-        echo -n ' [LONG LINES]'
-        ((LONG_LINE_FILES++))
+        if long_line_test $1 ;
+        then
+            echo -n ' [LONG LINES]'
+            ((LONG_LINE_FILES++))
+        fi
     fi
     echo
     if [[ $CHANGED = YES ]];
     then
-        ((CHANGED_FILES++))
+        ((CHANGED_FILES++))
     fi
+}
+
+function check_file() {
+    echo '    check' $1...
+
+    FILE_FAILED=NO
+    if echo $1 | grep -q -v -E 'Makefile\.am$' ;
+    then
+        update_header $1
+    fi
+    update_tabs $1
+    remove_trailing_spaces $1
+    if echo $1 | grep -q -v -E '\.dox|Makefile\.am$' ;
+    then
+        if long_line_test $1 ;
+        then
+            echo 'long lines failed:'
+            grep -n -E '.{81,}' $1
+            FILE_FAILED=YES
+        fi
+    fi
+
+    if [[ $FILE_FAILED = YES ]];
+    then
+        GLOBAL_FAILED=YES
+        ((FAILED_FILES++))
+    fi
+}
+
+function list_files() {
+    hg status -a -m -c |
+    cut -d ' ' -f 2 | grep -E  '(\.(cc|h|dox)$|Makefile\.am$)' | sort | uniq
+}
+
+function changed_files() {
+    {
+        if [ -n "$HG_PARENT1" ]
+        then
+            hg status --rev $HG_PARENT1:$HG_NODE -a -m
+        fi
+        if [ -n "$HG_PARENT2" ]
+        then
+            hg status --rev $HG_PARENT2:$HG_NODE -a -m
+        fi
+    } | cut -d ' ' -f 2 | grep -E '(\.(cc|h|dox)$|Makefile\.am$)' | sort | uniq
 }
 
 CHANGED_FILES=0
 TOTAL_FILES=0
 LONG_LINE_FILES=0
-if [ $# == 0 ]; then
+FAILED_FILES=0
+GLOBAL_FAILED=NO
+CHECK_MODE=0
+
+if [ $# == 0 ];
+then
     echo Update all source files...
-    for i in `hg manifest|grep -E  '\.(cc|h|dox)$'`
+    while read i
     do
-        update_file $HGROOT/$i
-        ((TOTAL_FILES++))
-    done
+        update_file "$HGROOT/$i"
+        ((TOTAL_FILES++))
+    done < <(list_files)
     echo '  done.'
+elif [[ ($1 == "--modified") || ($1 == "-modified") || ($1 == "-m") ]];
+then
+    CHECK_MODE=2
+    echo Check all modified source files...
+    while read i
+    do
+        check_file "$HGROOT/$i"
+        ((TOTAL_FILES++))
+    done < <(changed_files)
+    echo '  done.'
+elif [[ ($1 == "--check") || ($1 == "-check") || ($1 == "-c") ]];
+then
+    CHECK_MODE=1
+    if [[ $# == 1 ]];
+    then
+        echo Check all source files...
+        while read i
+        do
+            check_file "$HGROOT/$i"
+            ((TOTAL_FILES++))
+        done < <(list_files)
+        echo '  done.'
+    else
+        echo Check files...
+        shift
+        for i in $@
+        do
+            check_file $i
+            ((TOTAL_FILES++))
+        done
+    fi
+elif [[ ($1 == "--help") || ($1 == "-help") || ($1 == "-h") ]];
+then
+    echo "Usage:
+  $0 [(--check|-c)|(--modified|-m)|(--help|-h)] [files]
+Where:
+  --check|-c
+     Check the given files, but do not modify them.
+  --modified|-m
+     Check only the modified source files, but do not modify them.
+     This option can be used as a hg hook script. E.g. to check all your
+     commited source files with this script add the following section to
+     the appropriate .hg/hgrc file.
+
+       [hooks]
+       pretxncommit.checksources = scripts/unify-sources.sh --modified
+
+  --help|-h
+     Print this help message.
+  files
+     The files to check/unify. If no file names are given, all source
+     will be checked/unified (except for using --modified, which checks
+     only the modified source files).
+     If no option is given, the script unifies the given files, but if
+     --check or --modified is given, it only checks them."
+    exit
 else
-    for i in $*
+    echo Update files...
+    for i in $@
     do
-        update_file $i
-        ((TOTAL_FILES++))
+        update_file $i
+        ((TOTAL_FILES++))
     done
 fi
-echo $CHANGED_FILES out of $TOTAL_FILES files has been changed.
-if [[ $LONG_LINE_FILES -gt 1 ]]; then
+
+if [[ $CHECK_MODE -gt 0 ]];
+then
+    if [[ $FAILED_FILES -gt 0 ]];
+    then
+        echo $FAILED_FILES out of $TOTAL_FILES files has failed.
+    else
+        echo All $TOTAL_FILES files passed.
+    fi
+else 
+    echo $CHANGED_FILES out of $TOTAL_FILES files has been changed.
+fi
+
+if [[ $LONG_LINE_FILES -gt 1 ]];
+then
     echo
-    echo WARNING: $LONG_LINE_FILES files contains long lines!    
+    echo WARNING: $LONG_LINE_FILES files contain long lines!
     echo
-elif [[ $LONG_LINE_FILES -gt 0 ]]; then
+elif [[ $LONG_LINE_FILES -gt 0 ]];
+then
     echo
     echo WARNING: a file contains long lines!
     echo
 fi
+  
+[[ $GLOBAL_FAILED == NO ]]