bisect--helper: `write_terms` shell function in C

Reimplement the `write_terms` shell function in C and add a `write-terms`
subcommand to `git bisect--helper` to call it from git-bisect.sh . Also
remove the subcommand `--check-term-format` as it can now be called from
inside the function write_terms() C implementation.

Also `|| exit` is added when calling write-terms subcommand from
git-bisect.sh so as to exit whenever there is an error.

Using `--write-terms` subcommand is a temporary measure to port shell
function to C so as to use the existing test suite. As more functions
are ported, this subcommand will be retired and its implementation will
be called by some other method.

Mentored-by: Lars Schneider <larsxschneider@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index db9091e249454e2678ce37fb7c5c5b391e330bcc..2bd2d396e335df9fe063af0ffcf69c32a798c9ef 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -4,9 +4,11 @@
 #include "bisect.h"
 #include "refs.h"
 
 #include "bisect.h"
 #include "refs.h"
 

+static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
+

 static const char * const git_bisect_helper_usage[] = {
        N_("git bisect--helper --next-all [--no-checkout]"),
 static const char * const git_bisect_helper_usage[] = {
        N_("git bisect--helper --next-all [--no-checkout]"),

-       N_("git bisect--helper --check-term-format <term> <orig_term>"),
+       N_("git bisect--helper --write-terms <bad_term> <good_term>"),

        NULL
 };
 
        NULL
 };
 


@@ -57,18 +59,38 @@ static int check_term_format(const char *term, const char *orig_term)
        return 0;
 }
 
        return 0;
 }
 

+static int write_terms(const char *bad, const char *good)
+{
+       FILE *fp = NULL;
+       int res;
+
+       if (!strcmp(bad, good))
+               return error(_("please use two different terms"));
+
+       if (check_term_format(bad, "bad") || check_term_format(good, "good"))
+               return -1;
+
+       fp = fopen(git_path_bisect_terms(), "w");
+       if (!fp)
+               return error_errno(_("could not open the file BISECT_TERMS"));
+
+       res = fprintf(fp, "%s\n%s\n", bad, good);
+       res |= fclose(fp);
+       return (res < 0) ? -1 : 0;
+}
+

 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        enum {
                NEXT_ALL = 1,
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        enum {
                NEXT_ALL = 1,

-               CHECK_TERM_FMT
+               WRITE_TERMS

        } cmdmode = 0;
        int no_checkout = 0;
        struct option options[] = {
                OPT_CMDMODE(0, "next-all", &cmdmode,
                         N_("perform 'git bisect next'"), NEXT_ALL),
        } cmdmode = 0;
        int no_checkout = 0;
        struct option options[] = {
                OPT_CMDMODE(0, "next-all", &cmdmode,
                         N_("perform 'git bisect next'"), NEXT_ALL),

-               OPT_CMDMODE(0, "check-term-format", &cmdmode,
-                        N_("check format of the term"), CHECK_TERM_FMT),
+               OPT_CMDMODE(0, "write-terms", &cmdmode,
+                        N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),

                OPT_BOOL(0, "no-checkout", &no_checkout,
                         N_("update BISECT_HEAD instead of checking out the current commit")),
                OPT_END()
                OPT_BOOL(0, "no-checkout", &no_checkout,
                         N_("update BISECT_HEAD instead of checking out the current commit")),
                OPT_END()


@@ -83,10 +105,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
        switch (cmdmode) {
        case NEXT_ALL:
                return bisect_next_all(prefix, no_checkout);
        switch (cmdmode) {
        case NEXT_ALL:
                return bisect_next_all(prefix, no_checkout);

-       case CHECK_TERM_FMT:
+       case WRITE_TERMS:

                if (argc != 2)
                if (argc != 2)

-                       return error(_("--check-term-format requires two arguments"));
-               return check_term_format(argv[0], argv[1]);
+                       return error(_("--write-terms requires two arguments"));
+               return write_terms(argv[0], argv[1]);

        default:
                return error("BUG: unknown subcommand '%d'", cmdmode);
        }
        default:
                return error("BUG: unknown subcommand '%d'", cmdmode);
        }

diff --git a/git-bisect.sh b/git-bisect.sh
index a727c59250f13b08ccbc559f50b0c1c60a3dc2ba..a80fc44e524f259341186921b69ae160ff166195 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -209,7 +209,7 @@ bisect_start() {
        eval "$eval true" &&
        if test $must_write_terms -eq 1
        then
        eval "$eval true" &&
        if test $must_write_terms -eq 1
        then

-               write_terms "$TERM_BAD" "$TERM_GOOD"
+               git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit

        fi &&
        echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
        #
        fi &&
        echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
        #


@@ -557,18 +557,6 @@ get_terms () {
        fi
 }
 
        fi
 }
 

-write_terms () {
-       TERM_BAD=$1
-       TERM_GOOD=$2
-       if test "$TERM_BAD" = "$TERM_GOOD"
-       then
-               die "$(gettext "please use two different terms")"
-       fi
-       git bisect--helper --check-term-format "$TERM_BAD" bad || exit
-       git bisect--helper --check-term-format "$TERM_GOOD" good || exit
-       printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS"
-}
-

 check_and_set_terms () {
        cmd="$1"
        case "$cmd" in
 check_and_set_terms () {
        cmd="$1"
        case "$cmd" in


@@ -582,13 +570,17 @@ check_and_set_terms () {
                bad|good)
                        if ! test -s "$GIT_DIR/BISECT_TERMS"
                        then
                bad|good)
                        if ! test -s "$GIT_DIR/BISECT_TERMS"
                        then

-                               write_terms bad good
+                               TERM_BAD=bad
+                               TERM_GOOD=good
+                               git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit

                        fi
                        ;;
                new|old)
                        if ! test -s "$GIT_DIR/BISECT_TERMS"
                        then
                        fi
                        ;;
                new|old)
                        if ! test -s "$GIT_DIR/BISECT_TERMS"
                        then

-                               write_terms new old
+                               TERM_BAD=new
+                               TERM_GOOD=old
+                               git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit

                        fi
                        ;;
                esac ;;
                        fi
                        ;;
                esac ;;