LEMON/LEMON-main Changeset - r325:0fbbb4bc42dd

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r325:0fbbb4bc42dd

« 324:e05633

331:2f5c0c »

r325:0fbbb4bc42dd

Mon, 20 Oct 2008 20:03:14

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

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

0 1 0

default

1 file changed with 14 insertions and 15 deletions:

scripts/unify-sources.sh

↑ Collapse diff ↑

scripts/unify-sources.sh

Show inline comments

@@ -44,110 +44,110 @@
 		function update_action() {
 		    if ! diff -q $1 $2 >/dev/null
 		    then
 			echo -n " [$3 updated]"
 			rm $2
 			mv $1 $2
 			CHANGED=YES
 		    fi
+		}
 		function update_warning() {
 		    echo -n " [$2 warning]"
 		    WARNED=YES
+		}
 		function update_init() {
 		    echo Update source files...
 		    TOTAL_FILES=0
 		    CHANGED_FILES=0
 		    WARNED_FILES=0
+		}
 		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.
+		}
 		function update_begin() {
 		    ((TOTAL_FILES++))
 		    CHANGED=NO
 		    WARNED=NO
+		}
 		function update_end() {
 		    if [ $CHANGED == YES ]
 		    then
 			((++CHANGED_FILES))
 		    fi
 		    if [ $WARNED == YES ]
 		    then
 			((++WARNED_FILES))
 		    fi
+		}
 		function check_action() {
 		    if ! diff -q $1 $2 >/dev/null
 		    then
 			echo -n " [$3 failed]"
 			FAILED=YES
 		    fi
+		}
 		function check_warning() {
 		    echo -n " [$2 warning]"
 		    WARNED=YES
+		}
 		function check_init() {
 		    echo Check source files...
 		    FAILED_FILES=0
 		    WARNED_FILES=0
 		    TOTAL_FILES=0
+		}
 		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 ]
 		    then
 			return 1
 		    elif [ $WARNED_FILES -gt 0 ]
 		    then
 			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
 				if [ "$answer" == 'yes' ]
 				then
 				    return 0
 				elif [ "$answer" == 'no' ]
 				then
 				    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' ]
 			then
 			    return 1
 			fi
 		    fi
+		}
 		function check_begin() {
 		    ((TOTAL_FILES++))
 		    FAILED=NO
 		    WARNED=NO
+		}
 		function check_end() {
 		    if [ $FAILED == YES ]
 		    then
 			((++FAILED_FILES))
 		    fi
 		    if [ $WARNED == YES ]
 		    then
 			((++WARNED_FILES))
 		    fi
+		}
@@ -236,66 +236,65 @@
 		    done
 		    "$ACTION"_end $1
 		    echo
+		}
 		function process_all {
 		    "$ACTION"_init
 		    while read file
 		    do
 			process_file $file
 		    done < <($FILES)
 		    "$ACTION"_done
+		}
 		while [ $# -gt 0 ]
 		do
 		    if [ "$1" == '--help' ] || [ "$1" == '-h' ]
 		    then
 			echo -n \
 		"Usage:
 		  $0 [OPTIONS] [files]
 		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]
 		       pretxncommit.checksources = scripts/unify-sources.sh -c -n -i
 		  --help|-h
 		     Print this help message.
 		  files
 		     The files to check/unify. If no file names are given, the
 		     modified source will be checked/unified
+		"
 		        exit 0
 		    elif [ "$1" == '--dry-run' ] || [ "$1" == '-n' ]
 		    then
 			[ -n "$ACTION" ] && echo "Invalid option $1" >&2 && exit 1
 			ACTION=check
 		    elif [ "$1" == "--all" ] || [ "$1" == '-a' ]
 		    then
 			[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
 			FILES=all_files
 		    elif [ "$1" == "--changed" ] || [ "$1" == '-c' ]
 		    then
 			[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
 			FILES=changed_files

0 comments (0 inline)

RhodeCode

Login to your account