... |
... |
@@ -83,23 +83,34 @@
|
83 |
83 |
then
|
84 |
84 |
((++WARNED_FILES))
|
85 |
85 |
fi
|
86 |
86 |
}
|
87 |
87 |
|
88 |
88 |
function check_action() {
|
89 |
89 |
if ! diff -q $1 $2 >/dev/null
|
90 |
90 |
then
|
91 |
|
echo -n " [$3 failed]"
|
|
91 |
echo
|
|
92 |
echo -n " $3 failed at line(s): "
|
|
93 |
echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" |
|
|
94 |
sed "s/,/-/g" | paste -s -d',')
|
92 |
95 |
FAILED=YES
|
93 |
96 |
fi
|
94 |
97 |
}
|
95 |
98 |
|
96 |
99 |
function check_warning() {
|
97 |
|
echo -n " [$2 warning]"
|
|
100 |
echo
|
|
101 |
if [ "$2" == 'long lines' ]
|
|
102 |
then
|
|
103 |
echo -n " $2 warning at line(s): "
|
|
104 |
echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" |
|
|
105 |
cut -f 1 | paste -s -d',')
|
|
106 |
else
|
|
107 |
echo -n " $2 warning"
|
|
108 |
fi
|
98 |
109 |
WARNED=YES
|
99 |
110 |
}
|
100 |
111 |
|
101 |
112 |
function check_init() {
|
102 |
113 |
echo Check source files...
|
103 |
114 |
FAILED_FILES=0
|
104 |
115 |
WARNED_FILES=0
|
105 |
116 |
TOTAL_FILES=0
|
... |
... |
@@ -207,30 +218,30 @@
|
207 |
218 |
|
208 |
219 |
"$ACTION"_action "$TMP_FILE" "$1" 'tabs'
|
209 |
220 |
}
|
210 |
221 |
|
211 |
222 |
function spaces_check() {
|
212 |
223 |
TMP_FILE=`mktemp`
|
213 |
224 |
cat $1 | sed -e 's/ \+$//g' >$TMP_FILE
|
214 |
225 |
|
215 |
|
"$ACTION"_action "$TMP_FILE" "$1" 'spaces'
|
|
226 |
"$ACTION"_action "$TMP_FILE" "$1" 'trailing spaces'
|
216 |
227 |
}
|
217 |
228 |
|
218 |
229 |
function long_lines_check() {
|
219 |
230 |
if cat $1 | grep -q -E '.{81,}'
|
220 |
231 |
then
|
221 |
232 |
"$ACTION"_warning $1 'long lines'
|
222 |
233 |
fi
|
223 |
234 |
}
|
224 |
235 |
|
225 |
236 |
# process the file
|
226 |
237 |
|
227 |
238 |
function process_file() {
|
228 |
|
echo -n " $ACTION " $1...
|
|
239 |
echo -n " $ACTION $1..."
|
229 |
240 |
|
230 |
241 |
CHECKING="header tabs spaces long_lines"
|
231 |
242 |
|
232 |
243 |
"$ACTION"_begin $1
|
233 |
244 |
for check in $CHECKING
|
234 |
245 |
do
|
235 |
246 |
"$check"_check $1
|
236 |
247 |
done
|
... |
... |
@@ -260,62 +271,62 @@
|
260 |
271 |
Check the files, but do not modify them.
|
261 |
272 |
--interactive|-i
|
262 |
273 |
If --dry-run is specified and the checker emits warnings,
|
263 |
274 |
then the user is asked if the warnings should be considered
|
264 |
275 |
errors.
|
265 |
276 |
--werror|-w
|
266 |
277 |
Make all warnings into errors.
|
267 |
278 |
--all|-a
|
268 |
|
All files in the repository will be checked.
|
|
279 |
Check all source files in the repository.
|
269 |
280 |
--modified|-m
|
270 |
281 |
Check only the modified (and new) source files. This option is
|
271 |
282 |
useful to check the modification before making a commit.
|
272 |
283 |
--changed|-c
|
273 |
284 |
Check only the changed source files compared to the parent(s) of
|
274 |
285 |
the current hg node. This option is useful as hg hook script.
|
275 |
286 |
To automatically check all your changes before making a commit,
|
276 |
287 |
add the following section to the appropriate .hg/hgrc file.
|
277 |
288 |
|
278 |
289 |
[hooks]
|
279 |
290 |
pretxncommit.checksources = scripts/unify-sources.sh -c -n -i
|
280 |
291 |
|
281 |
292 |
--help|-h
|
282 |
293 |
Print this help message.
|
283 |
294 |
files
|
284 |
|
The files to check/unify. If no file names are given, the
|
285 |
|
modified source will be checked/unified
|
286 |
|
|
|
295 |
The files to check/unify. If no file names are given, the modified
|
|
296 |
source files will be checked/unified (just like using the
|
|
297 |
--modified|-m option).
|
287 |
298 |
"
|
288 |
299 |
exit 0
|
289 |
300 |
elif [ "$1" == '--dry-run' ] || [ "$1" == '-n' ]
|
290 |
301 |
then
|
291 |
|
[ -n "$ACTION" ] && echo "Invalid option $1" >&2 && exit 1
|
|
302 |
[ -n "$ACTION" ] && echo "Conflicting action options" >&2 && exit 1
|
292 |
303 |
ACTION=check
|
293 |
304 |
elif [ "$1" == "--all" ] || [ "$1" == '-a' ]
|
294 |
305 |
then
|
295 |
|
[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
|
|
306 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1
|
296 |
307 |
FILES=all_files
|
297 |
308 |
elif [ "$1" == "--changed" ] || [ "$1" == '-c' ]
|
298 |
309 |
then
|
299 |
|
[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
|
|
310 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1
|
300 |
311 |
FILES=changed_files
|
301 |
312 |
elif [ "$1" == "--modified" ] || [ "$1" == '-m' ]
|
302 |
313 |
then
|
303 |
|
[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
|
|
314 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1
|
304 |
315 |
FILES=modified_files
|
305 |
316 |
elif [ "$1" == "--interactive" ] || [ "$1" == "-i" ]
|
306 |
317 |
then
|
307 |
|
[ -n "$WARNING" ] && echo "Invalid option $1" >&2 && exit 1
|
|
318 |
[ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1
|
308 |
319 |
WARNING='INTERACTIVE'
|
309 |
320 |
elif [ "$1" == "--werror" ] || [ "$1" == "-w" ]
|
310 |
321 |
then
|
311 |
|
[ -n "$WARNING" ] && echo "Invalid option $1" >&2 && exit 1
|
|
322 |
[ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1
|
312 |
323 |
WARNING='WERROR'
|
313 |
|
elif [ $(echo $1 | cut -c 1) == '-' ]
|
|
324 |
elif [ $(echo x$1 | cut -c 2) == '-' ]
|
314 |
325 |
then
|
315 |
326 |
echo "Invalid option $1" >&2 && exit 1
|
316 |
327 |
else
|
317 |
328 |
[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1
|
318 |
329 |
GIVEN_FILES=$@
|
319 |
330 |
FILES=given_files
|
320 |
331 |
break
|
321 |
332 |
fi
|