Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Oct 24, 2007 at 07:01 UTC
155fc795b9c613af79781ebec5fd8eda084e1636
1 file changed
+31
-51
git-bisect.sh
+31
-51
@@ -135,47 +135,33 @@ bisect_write() {
135
test -z "$nolog" && echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
136
}
137
138
-bisect_bad() {
138
+bisect_state() {
139
bisect_autostart
140
- case "$#" in
141
- 0)
142
- rev=$(git rev-parse --verify HEAD) ;;
143
- 1)
144
- rev=$(git rev-parse --verify "$1^{commit}") ;;
140
+ state=$1
141
+ case "$#,$state" in
142
+ 0,*)
143
+ die "Please call 'bisect_state' with at least one argument." ;;
144
+ 1,bad|1,good|1,skip)
145
+ rev=$(git rev-parse --verify HEAD) ||
146
+ die "Bad rev input: HEAD"
147
+ bisect_write "$state" "$rev" ;;
148
+ 2,bad)
149
+ rev=$(git rev-parse --verify "$2^{commit}") ||
150
+ die "Bad rev input: $2"
151
+ bisect_write "$state" "$rev" ;;
152
+ *,good|*,skip)
153
+ shift
154
+ revs=$(git rev-parse --revs-only --no-flags "$@") &&
155
+ test '' != "$revs" || die "Bad rev input: $@"
156
+ for rev in $revs
157
+ do
158
+ rev=$(git rev-parse --verify "$rev^{commit}") ||
159
+ die "Bad rev commit: $rev^{commit}"
160
+ bisect_write "$state" "$rev"
161
+ done ;;
162
*)
163
usage ;;
147
- esac || exit
148
- bisect_write 'bad' "$rev"
149
- bisect_auto_next
150
-}
151
-
152
-bisect_good() {
153
- bisect_autostart
154
- case "$#" in
155
- 0) revs=$(git rev-parse --verify HEAD) || exit ;;
156
- *) revs=$(git rev-parse --revs-only --no-flags "$@") &&
157
- test '' != "$revs" || die "Bad rev input: $@" ;;
164
esac
159
- for rev in $revs
160
- do
161
- rev=$(git rev-parse --verify "$rev^{commit}") || exit
162
- bisect_write 'good' "$rev"
163
- done
164
- bisect_auto_next
165
-}
166
-
167
-bisect_skip() {
168
- bisect_autostart
169
- case "$#" in
170
- 0) revs=$(git rev-parse --verify HEAD) || exit ;;
171
- *) revs=$(git rev-parse --revs-only --no-flags "$@") &&
172
- test '' != "$revs" || die "Bad rev input: $@" ;;
173
- esac
174
- for rev in $revs
175
- do
176
- rev=$(git rev-parse --verify "$rev^{commit}") || exit
177
- bisect_write 'skip' "$rev"
178
- done
165
bisect_auto_next
166
}
167
@@ -405,24 +391,22 @@ bisect_run () {
391
exit $res
392
fi
393
408
- # Use "bisect_good" or "bisect_bad"
409
- # depending on run success or failure.
394
+ # Find current state depending on run success or failure.
395
if [ $res -gt 0 ]; then
411
- next_bisect='bisect_bad'
396
+ state='bad'
397
else
413
- next_bisect='bisect_good'
398
+ state='good'
399
fi
400
416
- # We have to use a subshell because bisect_good or
417
- # bisect_bad functions can exit.
418
- ( $next_bisect > "$GIT_DIR/BISECT_RUN" )
401
+ # We have to use a subshell because "bisect_state" can exit.
402
+ ( bisect_state $state > "$GIT_DIR/BISECT_RUN" )
403
res=$?
404
405
cat "$GIT_DIR/BISECT_RUN"
406
407
if [ $res -ne 0 ]; then
408
echo >&2 "bisect run failed:"
425
- echo >&2 "$next_bisect exited with error code $res"
409
+ echo >&2 "'bisect_state $state' exited with error code $res"
410
exit $res
411
fi
412
@@ -444,12 +428,8 @@ case "$#" in
428
case "$cmd" in
429
start)
430
bisect_start "$@" ;;
447
- bad)
448
- bisect_bad "$@" ;;
449
- good)
450
- bisect_good "$@" ;;
451
- skip)
452
- bisect_skip "$@" ;;
431
+ bad|good|skip)
432
+ bisect_state "$cmd" "$@" ;;
433
next)
434
# Not sure we want "next" at the UI level anymore.
435
bisect_next "$@" ;;