Changeset 331:2f5c0c42a5cd in lemon-main

Timestamp:

10/22/08 15:37:43 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

325:0fbbb4bc42dd (diff), 329:d900fd1e760f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• scripts/unify-sources.sh (modified) (6 diffs)
• scripts/unify-sources.sh (modified) (5 diffs)

scripts/unify-sources.sh

@@ -89 +89 @@
     if ! diff -q $1 $2 >/dev/null
     then
-        echo -n " [$3 failed]"
+        echo
+        echo -n "      $3 failed at line(s): "
+        echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | 
+                  sed "s/,/-/g" | paste -s -d',')
         FAILED=YES
     fi
@@ -95 +98 @@
 
 function check_warning() {
-    echo -n " [$2 warning]"
+    echo
+    if [ "$2" == 'long lines' ]
+    then
+        echo -n "      $2 warning at line(s): "
+        echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | 
+                  cut -f 1 | paste -s -d',')
+    else
+        echo -n "      $2 warning"
+    fi
     WARNED=YES
 }
@@ -213 +224 @@
     cat $1 | sed -e 's/ \+$//g' >$TMP_FILE
 
-    "$ACTION"_action "$TMP_FILE" "$1" 'spaces'
+    "$ACTION"_action "$TMP_FILE" "$1" 'trailing spaces'
 }
 
@@ -226 +237 @@
 
 function process_file() {
-    echo -n "    $ACTION " $1...
+    echo -n "    $ACTION $1..."
 
     CHECKING="header tabs spaces long_lines"
@@ -266 +277 @@
      Make all warnings into errors.
   --all|-a
-     All files in the repository will be checked.
+     Check all source files in the repository.
   --modified|-m
      Check only the modified (and new) source files. This option is
@@ -282 +293 @@
      Print this help message.
   files
-     The files to check/unify. If no file names are given, the
-     modified source will be checked/unified
-
+     The files to check/unify. If no file names are given, the modified
+     source files will be checked/unified (just like using the
+     --modified|-m option).
 "
         exit 0
     elif [ "$1" == '--dry-run' ] || [ "$1" == '-n' ]
     then
-        [ -n "$ACTION" ] && echo "Invalid option $1" >&2 && exit 1
+        [ -n "$ACTION" ] && echo "Conflicting action options" >&2 && exit 1
         ACTION=check
     elif [ "$1" == "--all" ] || [ "$1" == '-a' ]
     then
-        [ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
+        [ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1
         FILES=all_files
     elif [ "$1" == "--changed" ] || [ "$1" == '-c' ]
     then
-        [ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
+        [ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1
         FILES=changed_files
     elif [ "$1" == "--modified" ] || [ "$1" == '-m' ]
     then
-        [ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
+        [ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1
         FILES=modified_files
     elif [ "$1" == "--interactive" ] || [ "$1" == "-i" ]
     then
-        [ -n "$WARNING" ] && echo "Invalid option $1" >&2 && exit 1
+        [ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1
         WARNING='INTERACTIVE'
     elif [ "$1" == "--werror" ] || [ "$1" == "-w" ]
     then
-        [ -n "$WARNING" ] && echo "Invalid option $1" >&2 && exit 1
+        [ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1
         WARNING='WERROR'
-    elif [ $(echo $1 | cut -c 1) == '-' ]
+    elif [ $(echo x$1 | cut -c 2) == '-' ]
     then
         echo "Invalid option $1" >&2 && exit 1

scripts/unify-sources.sh

@@ -66 +66 @@
 function update_done() {
     echo $CHANGED_FILES out of $TOTAL_FILES files has been changed.
-    echo $WARNED_FILES out of $TOTAL_FILES files has been warned.
+    echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
 }
 
@@ -119 +119 @@
 function check_done() {
     echo $FAILED_FILES out of $TOTAL_FILES files has been failed.
-    echo $WARNED_FILES out of $TOTAL_FILES files has been warned.
+    echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
 
     if [ $FAILED_FILES -gt 0 ]
@@ -128 +128 @@
         if [ "$WARNING" == 'INTERACTIVE' ]
         then
-            echo -n "Assume as normal behaviour? (yes/no) "
+            echo -n "Are the files with warnings acceptable? (yes/no) "
             while read answer
             do
@@ -138 +138 @@
                     return 1
                 fi
-                echo -n "Assume as normal behaviour? (yes/no) "             
+                echo -n "Are the files with warnings acceptable? (yes/no) "
             done
         elif [ "$WARNING" == 'WERROR' ]
@@ -269 +269 @@
 Options:
   --dry-run|-n
-     Check the given files, but do not modify them.
+     Check the files, but do not modify them.
   --interactive|-i
-     If --dry-run is specified and files are warned, then a message is
-     prompted whether the warnings should be turned to errors.
+     If --dry-run is specified and the checker emits warnings,
+     then the user is asked if the warnings should be considered
+     errors.
   --werror|-w
-     If --dry-run is specified, the warnings are turned to errors.
+     Make all warnings into errors.
   --all|-a
      Check all source files in the repository.
   --modified|-m
-     Check only the modified source files. This option is proper to
-     use before a commit. E.g. all files which are modified or added
-     into the repository will be updated.
+     Check only the modified (and new) source files. This option is
+     useful to check the modification before making a commit.
   --changed|-c
      Check only the changed source files compared to the parent(s) of
-     the current hg node.  This option is proper to use as 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.
+     the current hg node.  This option is useful as hg hook script.
+     To automatically check all your changes before making a commit,
+     add the following section to the appropriate .hg/hgrc file.
 
        [hooks]