r340:cdbff91c2166
Mon, 20 Oct 2008 12:17:24
[Not Reviewed]
0 comments (0 inline)
0
1
0
| ... | ... |
@@ -212,7 +212,7 @@ |
| 212 | 212 |
TMP_FILE=`mktemp` |
| 213 | 213 |
cat $1 | sed -e 's/ \+$//g' >$TMP_FILE |
| 214 | 214 |
|
| 215 |
"$ACTION"_action "$TMP_FILE" "$1" 'spaces' |
|
| 215 |
"$ACTION"_action "$TMP_FILE" "$1" 'trailing spaces' |
|
| 216 | 216 |
} |
| 217 | 217 |
|
| 218 | 218 |
function long_lines_check() {
|
| ... | ... |
@@ -225,7 +225,7 @@ |
| 225 | 225 |
# process the file |
| 226 | 226 |
|
| 227 | 227 |
function process_file() {
|
| 228 |
echo -n " $ACTION |
|
| 228 |
echo -n " $ACTION $1..." |
|
| 229 | 229 |
|
| 230 | 230 |
CHECKING="header tabs spaces long_lines" |
| 231 | 231 |
|
| ... | ... |
@@ -259,12 +259,12 @@ |
| 259 | 259 |
--dry-run|-n |
| 260 | 260 |
Check the given files, but do not modify them. |
| 261 | 261 |
--interactive|-i |
| 262 |
If --dry-run is specified and files are warned then a message is |
|
| 262 |
If --dry-run is specified and files are warned, then a message is |
|
| 263 | 263 |
prompted whether the warnings should be turned to errors. |
| 264 | 264 |
--werror|-w |
| 265 |
If --dry-run is specified |
|
| 265 |
If --dry-run is specified, the warnings are turned to errors. |
|
| 266 | 266 |
--all|-a |
| 267 |
|
|
| 267 |
Check all source files in the repository. |
|
| 268 | 268 |
--modified|-m |
| 269 | 269 |
Check only the modified source files. This option is proper to |
| 270 | 270 |
use before a commit. E.g. all files which are modified or added |
| ... | ... |
@@ -282,36 +282,36 @@ |
| 282 | 282 |
--help|-h |
| 283 | 283 |
Print this help message. |
| 284 | 284 |
files |
| 285 |
The files to check/unify. If no file names are given, the |
|
| 286 |
modified source will be checked/unified |
|
| 287 |
|
|
| 285 |
The files to check/unify. If no file names are given, the modified |
|
| 286 |
source files will be checked/unified (just like using the |
|
| 287 |
--modified|-m option). |
|
| 288 | 288 |
" |
| 289 | 289 |
exit 0 |
| 290 | 290 |
elif [ "$1" == '--dry-run' ] || [ "$1" == '-n' ] |
| 291 | 291 |
then |
| 292 |
[ -n "$ACTION" ] && echo " |
|
| 292 |
[ -n "$ACTION" ] && echo "Conflicting action options" >&2 && exit 1 |
|
| 293 | 293 |
ACTION=check |
| 294 | 294 |
elif [ "$1" == "--all" ] || [ "$1" == '-a' ] |
| 295 | 295 |
then |
| 296 |
[ -n "$FILES" ] && echo " |
|
| 296 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1 |
|
| 297 | 297 |
FILES=all_files |
| 298 | 298 |
elif [ "$1" == "--changed" ] || [ "$1" == '-c' ] |
| 299 | 299 |
then |
| 300 |
[ -n "$FILES" ] && echo " |
|
| 300 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1 |
|
| 301 | 301 |
FILES=changed_files |
| 302 | 302 |
elif [ "$1" == "--modified" ] || [ "$1" == '-m' ] |
| 303 | 303 |
then |
| 304 |
[ -n "$FILES" ] && echo " |
|
| 304 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1 |
|
| 305 | 305 |
FILES=modified_files |
| 306 | 306 |
elif [ "$1" == "--interactive" ] || [ "$1" == "-i" ] |
| 307 | 307 |
then |
| 308 |
[ -n "$WARNING" ] && echo " |
|
| 308 |
[ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1 |
|
| 309 | 309 |
WARNING='INTERACTIVE' |
| 310 | 310 |
elif [ "$1" == "--werror" ] || [ "$1" == "-w" ] |
| 311 | 311 |
then |
| 312 |
[ -n "$WARNING" ] && echo " |
|
| 312 |
[ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1 |
|
| 313 | 313 |
WARNING='WERROR' |
| 314 |
elif [ $(echo $1 | cut -c |
|
| 314 |
elif [ $(echo x$1 | cut -c 2) == '-' ] |
|
| 315 | 315 |
then |
| 316 | 316 |
echo "Invalid option $1" >&2 && exit 1 |
| 317 | 317 |
else |
0 comments (0 inline)