Changeset 337:0fbbb4bc42dd in lemon

Timestamp:

10/20/08 20:03:14 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Better help message and user question in unify-sources.sh

File:

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

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.
 }
 
@@ -108 +108 @@
 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 ]
@@ -117 +117 @@
         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
@@ -127 +127 @@
                     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' ]
@@ -258 +258 @@
 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 and the warnings are turned to errors.
+     Make all warnings into errors.
   --all|-a
      All files in the repository will be checked.
   --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]