bisect--helper: `get_terms` & `bisect_terms` shell function in C

Reimplement the `get_terms` and `bisect_terms` shell function in C and
add `bisect-terms` subcommand to `git bisect--helper` to call it from
git-bisect.sh .

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

Also use error() to report "no terms defined" and accordingly change the
test in t6030.

We need to use PARSE_OPT_KEEP_UNKNOWN here to allow for parameters that
look like options (e.g --term-good) but should not be parsed by
cmd_bisect__helper(). This change is safe because all other cmdmodes have
strict argc checks already.

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

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 38ae825b9ad305291e4a414f96a3419ef739c9f9..d61edd3c91167cdcb400e9c28bb3c14161bccefe 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -23,6 +23,7 @@ static const char * const git_bisect_helper_usage[] = {
        N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
        N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"),
        N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"),
        N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
        N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"),
        N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"),

+       N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"),

        NULL
 };
 
        NULL
 };
 


@@ -339,6 +340,55 @@ static int bisect_next_check(const struct bisect_terms *terms,
        return retval;
 }
 
        return retval;
 }
 

+static int get_terms(struct bisect_terms *terms)
+{
+       struct strbuf str = STRBUF_INIT;
+       FILE *fp = NULL;
+       int res = 0;
+
+       fp = fopen(git_path_bisect_terms(), "r");
+       if (!fp) {
+               res = -1;
+               goto finish;
+       }
+
+       free_terms(terms);
+       strbuf_getline_lf(&str, fp);
+       terms->term_bad = strbuf_detach(&str, NULL);
+       strbuf_getline_lf(&str, fp);
+       terms->term_good = strbuf_detach(&str, NULL);
+
+finish:
+       if (fp)
+               fclose(fp);
+       strbuf_release(&str);
+       return res;
+}
+
+static int bisect_terms(struct bisect_terms *terms, const char *option)
+{
+       if (get_terms(terms))
+               return error(_("no terms defined"));
+
+       if (option == NULL) {
+               printf(_("Your current terms are %s for the old state\n"
+                        "and %s for the new state.\n"),
+                      terms->term_good, terms->term_bad);
+               return 0;
+       }
+       if (one_of(option, "--term-good", "--term-old", NULL))
+               printf("%s\n", terms->term_good);
+       else if (one_of(option, "--term-bad", "--term-new", NULL))
+               printf("%s\n", terms->term_bad);
+       else
+               return error(_("invalid argument %s for 'git bisect terms'.\n"
+                              "Supported options are: "
+                              "--term-good|--term-old and "
+                              "--term-bad|--term-new."), option);
+
+       return 0;
+}
+

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


@@ -349,7 +399,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                BISECT_RESET,
                BISECT_WRITE,
                CHECK_AND_SET_TERMS,
                BISECT_RESET,
                BISECT_WRITE,
                CHECK_AND_SET_TERMS,

-               BISECT_NEXT_CHECK
+               BISECT_NEXT_CHECK,
+               BISECT_TERMS

        } cmdmode = 0;
        int no_checkout = 0, res = 0, nolog = 0;
        struct option options[] = {
        } cmdmode = 0;
        int no_checkout = 0, res = 0, nolog = 0;
        struct option options[] = {


@@ -369,6 +420,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                         N_("check and set terms in a bisection state"), CHECK_AND_SET_TERMS),
                OPT_CMDMODE(0, "bisect-next-check", &cmdmode,
                         N_("check whether bad or good terms exist"), BISECT_NEXT_CHECK),
                         N_("check and set terms in a bisection state"), CHECK_AND_SET_TERMS),
                OPT_CMDMODE(0, "bisect-next-check", &cmdmode,
                         N_("check whether bad or good terms exist"), BISECT_NEXT_CHECK),

+               OPT_CMDMODE(0, "bisect-terms", &cmdmode,
+                        N_("print out the bisect terms"), BISECT_TERMS),

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


@@ -378,7 +431,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
        struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
 
        argc = parse_options(argc, argv, prefix, options,
        struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
 
        argc = parse_options(argc, argv, prefix, options,

-                            git_bisect_helper_usage, 0);
+                            git_bisect_helper_usage, PARSE_OPT_KEEP_UNKNOWN);

 
        if (!cmdmode)
                usage_with_options(git_bisect_helper_usage, options);
 
        if (!cmdmode)
                usage_with_options(git_bisect_helper_usage, options);


@@ -419,6 +472,11 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                set_terms(&terms, argv[1], argv[0]);
                res = bisect_next_check(&terms, argc == 3 ? argv[2] : NULL);
                break;
                set_terms(&terms, argv[1], argv[0]);
                res = bisect_next_check(&terms, argc == 3 ? argv[2] : NULL);
                break;

+       case BISECT_TERMS:
+               if (argc > 1)
+                       return error(_("--bisect-terms requires 0 or 1 argument"));
+               res = bisect_terms(&terms, argc == 1 ? argv[0] : NULL);
+               break;

        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 5ef3e2562167f052bc5564265196024434465ebb..bdb614e3c2de835a329a4d2a9866de35a77ac3de 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -355,7 +355,7 @@ bisect_replay () {
                "$TERM_GOOD"|"$TERM_BAD"|skip)
                        git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
                terms)
                "$TERM_GOOD"|"$TERM_BAD"|skip)
                        git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
                terms)

-                       bisect_terms $rev ;;
+                       git bisect--helper --bisect-terms $rev || exit;;

                *)
                        die "$(gettext "?? what are you talking about?")" ;;
                esac
                *)
                        die "$(gettext "?? what are you talking about?")" ;;
                esac


@@ -439,37 +439,6 @@ get_terms () {
        fi
 }
 
        fi
 }
 

-bisect_terms () {
-       get_terms
-       if ! test -s "$GIT_DIR/BISECT_TERMS"
-       then
-               die "$(gettext "no terms defined")"
-       fi
-       case "$#" in
-       0)
-               gettextln "Your current terms are $TERM_GOOD for the old state
-and $TERM_BAD for the new state."
-               ;;
-       1)
-               arg=$1
-               case "$arg" in
-                       --term-good|--term-old)
-                               printf '%s\n' "$TERM_GOOD"
-                               ;;
-                       --term-bad|--term-new)
-                               printf '%s\n' "$TERM_BAD"
-                               ;;
-                       *)
-                               die "$(eval_gettext "invalid argument \$arg for 'git bisect terms'.
-Supported options are: --term-good|--term-old and --term-bad|--term-new.")"
-                               ;;
-               esac
-               ;;
-       *)
-               usage ;;
-       esac
-}
-

 case "$#" in
 0)
        usage ;;
 case "$#" in
 0)
        usage ;;


@@ -500,7 +469,7 @@ case "$#" in
        run)
                bisect_run "$@" ;;
        terms)
        run)
                bisect_run "$@" ;;
        terms)

-               bisect_terms "$@" ;;
+               git bisect--helper --bisect-terms "$@" || exit;;

        *)
                usage ;;
        esac
        *)
                usage ;;
        esac

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index f84ff941c3624be821fd87a67922ad1d2ca00b34..55835ee4a47158e1f7aeaa9aeb393f1f3d619791 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -802,7 +802,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
        test_must_fail git bisect terms only-one &&
        test_must_fail git bisect terms 1 2 &&
        test_must_fail git bisect terms 2>actual &&
        test_must_fail git bisect terms only-one &&
        test_must_fail git bisect terms 1 2 &&
        test_must_fail git bisect terms 2>actual &&

-       echo "no terms defined" >expected &&
+       echo "error: no terms defined" >expected &&

        test_i18ncmp expected actual
 '
 
        test_i18ncmp expected actual
 '