bisect--helper: reimplement `bisect_log` shell function in C

Reimplement the `bisect_log()` shell function in C and also add
`--bisect-log` subcommand to `git bisect--helper` to call it from
git-bisect.sh .

Using `--bisect-log` subcommand is a temporary measure to port shell
function to C so as to use the existing test suite.

Mentored-by: Lars Schneider <larsxschneider@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Helped-by: Rafael Silva <rafaeloliveira.cs@gmail.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 709eb713a3ba469f39ef5b4536583a84cc0c4a52..ce1138312545d014f5fd26af6552380359a2d9d5 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -904,6 +904,23 @@ static enum bisect_error bisect_state(struct bisect_terms *terms, const char **a
        return bisect_auto_next(terms, NULL);
 }
 
+static enum bisect_error bisect_log(void)
+{
+       int fd, status;
+       const char* filename = git_path_bisect_log();
+
+       if (is_empty_or_missing_file(filename))
+               return error(_("We are not bisecting."));
+
+       fd = open(filename, O_RDONLY);
+       if (fd < 0)
+               return BISECT_FAILED;
+
+       status = copy_fd(fd, STDOUT_FILENO);
+       close(fd);
+       return status ? BISECT_FAILED : BISECT_OK;
+}
+
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        enum {
@@ -916,7 +933,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                BISECT_AUTOSTART,
                BISECT_NEXT,
                BISECT_AUTO_NEXT,
-               BISECT_STATE
+               BISECT_STATE,
+               BISECT_LOG
        } cmdmode = 0;
        int res = 0, nolog = 0;
        struct option options[] = {
@@ -938,6 +956,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                         N_("verify the next bisection state then checkout the next bisection commit"), BISECT_AUTO_NEXT),
                OPT_CMDMODE(0, "bisect-state", &cmdmode,
                         N_("mark the state of ref (or refs)"), BISECT_STATE),
+               OPT_CMDMODE(0, "bisect-log", &cmdmode,
+                        N_("list the bisection steps so far"), BISECT_LOG),
                OPT_BOOL(0, "no-log", &nolog,
                         N_("no log for BISECT_WRITE")),
                OPT_END()
@@ -1000,6 +1020,11 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                get_terms(&terms);
                res = bisect_state(&terms, argv, argc);
                break;
+       case BISECT_LOG:
+               if (argc)
+                       return error(_("--bisect-log requires 0 arguments"));
+               res = bisect_log();
+               break;
        default:
                BUG("unknown subcommand %d", cmdmode);
        }

diff --git a/git-bisect.sh b/git-bisect.sh
index 1f3f6e9fc5684d3e9dd2a0ac0260556955c9fa4b..05863cc1428c91d77e0d844326f45aad81669fd0 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -169,11 +169,6 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
        done
 }
 
-bisect_log () {
-       test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")"
-       cat "$GIT_DIR/BISECT_LOG"
-}
-
 get_terms () {
        if test -s "$GIT_DIR/BISECT_TERMS"
        then
@@ -210,7 +205,7 @@ case "$#" in
        replay)
                bisect_replay "$@" ;;
        log)
-               bisect_log ;;
+               git bisect--helper --bisect-log || exit ;;
        run)
                bisect_run "$@" ;;
        terms)