development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

bisect--helper: emit usage for "git bisect"

Browse source 
In subsequent commits we'll be removing "git-bisect.sh" in favor of
promoting "bisect--helper" to a "bisect" built-in.

In doing that we'll first need to have it support "git bisect--helper
<cmd>" rather than "git bisect--helper --<cmd>", and then finally have
its "-h" output claim to be "bisect" rather than "bisect--helper".

Instead of suffering that churn let's start claiming to be "git
bisect" now. In just a few commits this will be true, and in the
meantime emitting the "wrong" usage information from the helper is a
small price to pay to avoid the churn.

Let's also declare "BUILTIN_*" macros, when we eventually migrate the
sub-commands themselves to parse_options() we'll be able to re-use the
strings. See 0afd556b2e (worktree: define subcommand -h in terms of
command -h, 2022-10-13) for a recent example.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-11-10 23:36:43 +07:00 committed by Taylor Blau
parent 929bf9db28
commit 5512376ae1
1 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
builtin/bisect--helper.c
View file

@ -20,18 +20,40 @@ static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
static const char * const git_bisect_helper_usage[] = { #define BUILTIN_GIT_BISECT_START_USAGE \
N_("git bisect--helper --bisect-reset [<commit>]"), N_("git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]" \
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]", " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]" \
N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]" " [<pathspec>...]")
" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"), #define BUILTIN_GIT_BISECT_STATE_USAGE \
"git bisect--helper --bisect-next", N_("git bisect (good|bad) [<rev>...]")
N_("git bisect--helper --bisect-state (bad|new) [<rev>]"), #define BUILTIN_GIT_BISECT_TERMS_USAGE \
N_("git bisect--helper --bisect-state (good|old) [<rev>...]"), "git bisect terms [--term-good | --term-bad]"
N_("git bisect--helper --bisect-replay <filename>"), #define BUILTIN_GIT_BISECT_SKIP_USAGE \
N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"), N_("git bisect skip [(<rev>|<range>)...]")
"git bisect--helper --bisect-visualize", #define BUILTIN_GIT_BISECT_NEXT_USAGE \
N_("git bisect--helper --bisect-run <cmd>..."), "git bisect next"
#define BUILTIN_GIT_BISECT_RESET_USAGE \
N_("git bisect reset [<commit>]")
#define BUILTIN_GIT_BISECT_VISUALIZE_USAGE \
"git bisect visualize"
#define BUILTIN_GIT_BISECT_REPLAY_USAGE \
N_("git bisect replay <logfile>")
#define BUILTIN_GIT_BISECT_LOG_USAGE \
"git bisect log"
#define BUILTIN_GIT_BISECT_RUN_USAGE \
N_("git bisect run <cmd>...")
static const char * const git_bisect_usage[] = {
BUILTIN_GIT_BISECT_START_USAGE,
BUILTIN_GIT_BISECT_STATE_USAGE,
BUILTIN_GIT_BISECT_TERMS_USAGE,
BUILTIN_GIT_BISECT_SKIP_USAGE,
BUILTIN_GIT_BISECT_NEXT_USAGE,
BUILTIN_GIT_BISECT_RESET_USAGE,
BUILTIN_GIT_BISECT_VISUALIZE_USAGE,
BUILTIN_GIT_BISECT_REPLAY_USAGE,
BUILTIN_GIT_BISECT_LOG_USAGE,
BUILTIN_GIT_BISECT_RUN_USAGE,
NULL NULL
}; };
@ -1411,11 +1433,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
OPT_SUBCOMMAND("run", &fn, cmd_bisect__run), OPT_SUBCOMMAND("run", &fn, cmd_bisect__run),
OPT_END() OPT_END()
}; };
argc = parse_options(argc, argv, prefix, options, argc = parse_options(argc, argv, prefix, options, git_bisect_usage, 0);
git_bisect_helper_usage, 0);
if (!fn) if (!fn)
usage_with_options(git_bisect_helper_usage, options); usage_with_options(git_bisect_usage, options);
argc--; argc--;
argv++; argv++;