ci: reintroduce prevention from perforce being quarantined in macOS
[git/debian.git] / builtin / bisect--helper.c
blob8b2b259ff0d11ebf6d28765b2a926a5efb1b644e
1 #include "builtin.h"
2 #include "cache.h"
3 #include "parse-options.h"
4 #include "bisect.h"
5 #include "refs.h"
6 #include "dir.h"
7 #include "strvec.h"
8 #include "run-command.h"
9 #include "prompt.h"
10 #include "quote.h"
11 #include "revision.h"
13 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
14 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
15 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
16 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
17 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
18 static GIT_PATH_FUNC(git_path_head_name, "head-name")
19 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
20 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
21 static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
23 static const char * const git_bisect_helper_usage[] = {
24 N_("git bisect--helper --bisect-reset [<commit>]"),
25 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]",
26 N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
27 " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
28 "git bisect--helper --bisect-next",
29 N_("git bisect--helper --bisect-state (bad|new) [<rev>]"),
30 N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
31 N_("git bisect--helper --bisect-replay <filename>"),
32 N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
33 "git bisect--helper --bisect-visualize",
34 N_("git bisect--helper --bisect-run <cmd>..."),
35 NULL
38 struct add_bisect_ref_data {
39 struct rev_info *revs;
40 unsigned int object_flags;
43 struct bisect_terms {
44 char *term_good;
45 char *term_bad;
48 static void free_terms(struct bisect_terms *terms)
50 FREE_AND_NULL(terms->term_good);
51 FREE_AND_NULL(terms->term_bad);
54 static void set_terms(struct bisect_terms *terms, const char *bad,
55 const char *good)
57 free((void *)terms->term_good);
58 terms->term_good = xstrdup(good);
59 free((void *)terms->term_bad);
60 terms->term_bad = xstrdup(bad);
63 static const char vocab_bad[] = "bad|new";
64 static const char vocab_good[] = "good|old";
66 static int bisect_autostart(struct bisect_terms *terms);
69 * Check whether the string `term` belongs to the set of strings
70 * included in the variable arguments.
72 LAST_ARG_MUST_BE_NULL
73 static int one_of(const char *term, ...)
75 int res = 0;
76 va_list matches;
77 const char *match;
79 va_start(matches, term);
80 while (!res && (match = va_arg(matches, const char *)))
81 res = !strcmp(term, match);
82 va_end(matches);
84 return res;
88 * return code BISECT_INTERNAL_SUCCESS_MERGE_BASE
89 * and BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND are codes
90 * that indicate special success.
93 static int is_bisect_success(enum bisect_error res)
95 return !res ||
96 res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND ||
97 res == BISECT_INTERNAL_SUCCESS_MERGE_BASE;
100 static int write_in_file(const char *path, const char *mode, const char *format, va_list args)
102 FILE *fp = NULL;
103 int res = 0;
105 if (strcmp(mode, "w") && strcmp(mode, "a"))
106 BUG("write-in-file does not support '%s' mode", mode);
107 fp = fopen(path, mode);
108 if (!fp)
109 return error_errno(_("cannot open file '%s' in mode '%s'"), path, mode);
110 res = vfprintf(fp, format, args);
112 if (res < 0) {
113 int saved_errno = errno;
114 fclose(fp);
115 errno = saved_errno;
116 return error_errno(_("could not write to file '%s'"), path);
119 return fclose(fp);
122 __attribute__((format (printf, 2, 3)))
123 static int write_to_file(const char *path, const char *format, ...)
125 int res;
126 va_list args;
128 va_start(args, format);
129 res = write_in_file(path, "w", format, args);
130 va_end(args);
132 return res;
135 __attribute__((format (printf, 2, 3)))
136 static int append_to_file(const char *path, const char *format, ...)
138 int res;
139 va_list args;
141 va_start(args, format);
142 res = write_in_file(path, "a", format, args);
143 va_end(args);
145 return res;
148 static int print_file_to_stdout(const char *path)
150 int fd = open(path, O_RDONLY);
151 int ret = 0;
153 if (fd < 0)
154 return error_errno(_("cannot open file '%s' for reading"), path);
155 if (copy_fd(fd, 1) < 0)
156 ret = error_errno(_("failed to read '%s'"), path);
157 close(fd);
158 return ret;
161 static int check_term_format(const char *term, const char *orig_term)
163 int res;
164 char *new_term = xstrfmt("refs/bisect/%s", term);
166 res = check_refname_format(new_term, 0);
167 free(new_term);
169 if (res)
170 return error(_("'%s' is not a valid term"), term);
172 if (one_of(term, "help", "start", "skip", "next", "reset",
173 "visualize", "view", "replay", "log", "run", "terms", NULL))
174 return error(_("can't use the builtin command '%s' as a term"), term);
177 * In theory, nothing prevents swapping completely good and bad,
178 * but this situation could be confusing and hasn't been tested
179 * enough. Forbid it for now.
182 if ((strcmp(orig_term, "bad") && one_of(term, "bad", "new", NULL)) ||
183 (strcmp(orig_term, "good") && one_of(term, "good", "old", NULL)))
184 return error(_("can't change the meaning of the term '%s'"), term);
186 return 0;
189 static int write_terms(const char *bad, const char *good)
191 int res;
193 if (!strcmp(bad, good))
194 return error(_("please use two different terms"));
196 if (check_term_format(bad, "bad") || check_term_format(good, "good"))
197 return -1;
199 res = write_to_file(git_path_bisect_terms(), "%s\n%s\n", bad, good);
201 return res;
204 static int bisect_reset(const char *commit)
206 struct strbuf branch = STRBUF_INIT;
208 if (!commit) {
209 if (strbuf_read_file(&branch, git_path_bisect_start(), 0) < 1) {
210 printf(_("We are not bisecting.\n"));
211 return 0;
213 strbuf_rtrim(&branch);
214 } else {
215 struct object_id oid;
217 if (get_oid_commit(commit, &oid))
218 return error(_("'%s' is not a valid commit"), commit);
219 strbuf_addstr(&branch, commit);
222 if (!ref_exists("BISECT_HEAD")) {
223 struct strvec argv = STRVEC_INIT;
225 strvec_pushl(&argv, "checkout", branch.buf, "--", NULL);
226 if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
227 error(_("could not check out original"
228 " HEAD '%s'. Try 'git bisect"
229 " reset <commit>'."), branch.buf);
230 strbuf_release(&branch);
231 strvec_clear(&argv);
232 return -1;
234 strvec_clear(&argv);
237 strbuf_release(&branch);
238 return bisect_clean_state();
241 static void log_commit(FILE *fp, char *fmt, const char *state,
242 struct commit *commit)
244 struct pretty_print_context pp = {0};
245 struct strbuf commit_msg = STRBUF_INIT;
246 char *label = xstrfmt(fmt, state);
248 format_commit_message(commit, "%s", &commit_msg, &pp);
250 fprintf(fp, "# %s: [%s] %s\n", label, oid_to_hex(&commit->object.oid),
251 commit_msg.buf);
253 strbuf_release(&commit_msg);
254 free(label);
257 static int bisect_write(const char *state, const char *rev,
258 const struct bisect_terms *terms, int nolog)
260 struct strbuf tag = STRBUF_INIT;
261 struct object_id oid;
262 struct commit *commit;
263 FILE *fp = NULL;
264 int res = 0;
266 if (!strcmp(state, terms->term_bad)) {
267 strbuf_addf(&tag, "refs/bisect/%s", state);
268 } else if (one_of(state, terms->term_good, "skip", NULL)) {
269 strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev);
270 } else {
271 res = error(_("Bad bisect_write argument: %s"), state);
272 goto finish;
275 if (get_oid(rev, &oid)) {
276 res = error(_("couldn't get the oid of the rev '%s'"), rev);
277 goto finish;
280 if (update_ref(NULL, tag.buf, &oid, NULL, 0,
281 UPDATE_REFS_MSG_ON_ERR)) {
282 res = -1;
283 goto finish;
286 fp = fopen(git_path_bisect_log(), "a");
287 if (!fp) {
288 res = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
289 goto finish;
292 commit = lookup_commit_reference(the_repository, &oid);
293 log_commit(fp, "%s", state, commit);
295 if (!nolog)
296 fprintf(fp, "git bisect %s %s\n", state, rev);
298 finish:
299 if (fp)
300 fclose(fp);
301 strbuf_release(&tag);
302 return res;
305 static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
307 int has_term_file = !is_empty_or_missing_file(git_path_bisect_terms());
309 if (one_of(cmd, "skip", "start", "terms", NULL))
310 return 0;
312 if (has_term_file && strcmp(cmd, terms->term_bad) &&
313 strcmp(cmd, terms->term_good))
314 return error(_("Invalid command: you're currently in a "
315 "%s/%s bisect"), terms->term_bad,
316 terms->term_good);
318 if (!has_term_file) {
319 if (one_of(cmd, "bad", "good", NULL)) {
320 set_terms(terms, "bad", "good");
321 return write_terms(terms->term_bad, terms->term_good);
323 if (one_of(cmd, "new", "old", NULL)) {
324 set_terms(terms, "new", "old");
325 return write_terms(terms->term_bad, terms->term_good);
329 return 0;
332 static int mark_good(const char *refname, const struct object_id *oid,
333 int flag, void *cb_data)
335 int *m_good = (int *)cb_data;
336 *m_good = 0;
337 return 1;
340 static const char need_bad_and_good_revision_warning[] =
341 N_("You need to give me at least one %s and %s revision.\n"
342 "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
344 static const char need_bisect_start_warning[] =
345 N_("You need to start by \"git bisect start\".\n"
346 "You then need to give me at least one %s and %s revision.\n"
347 "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
349 static int decide_next(const struct bisect_terms *terms,
350 const char *current_term, int missing_good,
351 int missing_bad)
353 if (!missing_good && !missing_bad)
354 return 0;
355 if (!current_term)
356 return -1;
358 if (missing_good && !missing_bad &&
359 !strcmp(current_term, terms->term_good)) {
360 char *yesno;
362 * have bad (or new) but not good (or old). We could bisect
363 * although this is less optimum.
365 warning(_("bisecting only with a %s commit"), terms->term_bad);
366 if (!isatty(0))
367 return 0;
369 * TRANSLATORS: Make sure to include [Y] and [n] in your
370 * translation. The program will only accept English input
371 * at this point.
373 yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO);
374 if (starts_with(yesno, "N") || starts_with(yesno, "n"))
375 return -1;
376 return 0;
379 if (!is_empty_or_missing_file(git_path_bisect_start()))
380 return error(_(need_bad_and_good_revision_warning),
381 vocab_bad, vocab_good, vocab_bad, vocab_good);
382 else
383 return error(_(need_bisect_start_warning),
384 vocab_good, vocab_bad, vocab_good, vocab_bad);
387 static int bisect_next_check(const struct bisect_terms *terms,
388 const char *current_term)
390 int missing_good = 1, missing_bad = 1;
391 char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
392 char *good_glob = xstrfmt("%s-*", terms->term_good);
394 if (ref_exists(bad_ref))
395 missing_bad = 0;
397 for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
398 (void *) &missing_good);
400 free(good_glob);
401 free(bad_ref);
403 return decide_next(terms, current_term, missing_good, missing_bad);
406 static int get_terms(struct bisect_terms *terms)
408 struct strbuf str = STRBUF_INIT;
409 FILE *fp = NULL;
410 int res = 0;
412 fp = fopen(git_path_bisect_terms(), "r");
413 if (!fp) {
414 res = -1;
415 goto finish;
418 free_terms(terms);
419 strbuf_getline_lf(&str, fp);
420 terms->term_bad = strbuf_detach(&str, NULL);
421 strbuf_getline_lf(&str, fp);
422 terms->term_good = strbuf_detach(&str, NULL);
424 finish:
425 if (fp)
426 fclose(fp);
427 strbuf_release(&str);
428 return res;
431 static int bisect_terms(struct bisect_terms *terms, const char *option)
433 if (get_terms(terms))
434 return error(_("no terms defined"));
436 if (option == NULL) {
437 printf(_("Your current terms are %s for the old state\n"
438 "and %s for the new state.\n"),
439 terms->term_good, terms->term_bad);
440 return 0;
442 if (one_of(option, "--term-good", "--term-old", NULL))
443 printf("%s\n", terms->term_good);
444 else if (one_of(option, "--term-bad", "--term-new", NULL))
445 printf("%s\n", terms->term_bad);
446 else
447 return error(_("invalid argument %s for 'git bisect terms'.\n"
448 "Supported options are: "
449 "--term-good|--term-old and "
450 "--term-bad|--term-new."), option);
452 return 0;
455 static int bisect_append_log_quoted(const char **argv)
457 int res = 0;
458 FILE *fp = fopen(git_path_bisect_log(), "a");
459 struct strbuf orig_args = STRBUF_INIT;
461 if (!fp)
462 return -1;
464 if (fprintf(fp, "git bisect start") < 1) {
465 res = -1;
466 goto finish;
469 sq_quote_argv(&orig_args, argv);
470 if (fprintf(fp, "%s\n", orig_args.buf) < 1)
471 res = -1;
473 finish:
474 fclose(fp);
475 strbuf_release(&orig_args);
476 return res;
479 static int add_bisect_ref(const char *refname, const struct object_id *oid,
480 int flags, void *cb)
482 struct add_bisect_ref_data *data = cb;
484 add_pending_oid(data->revs, refname, oid, data->object_flags);
486 return 0;
489 static int prepare_revs(struct bisect_terms *terms, struct rev_info *revs)
491 int res = 0;
492 struct add_bisect_ref_data cb = { revs };
493 char *good = xstrfmt("%s-*", terms->term_good);
496 * We cannot use terms->term_bad directly in
497 * for_each_glob_ref_in() and we have to append a '*' to it,
498 * otherwise for_each_glob_ref_in() will append '/' and '*'.
500 char *bad = xstrfmt("%s*", terms->term_bad);
503 * It is important to reset the flags used by revision walks
504 * as the previous call to bisect_next_all() in turn
505 * sets up a revision walk.
507 reset_revision_walk();
508 init_revisions(revs, NULL);
509 setup_revisions(0, NULL, revs, NULL);
510 for_each_glob_ref_in(add_bisect_ref, bad, "refs/bisect/", &cb);
511 cb.object_flags = UNINTERESTING;
512 for_each_glob_ref_in(add_bisect_ref, good, "refs/bisect/", &cb);
513 if (prepare_revision_walk(revs))
514 res = error(_("revision walk setup failed\n"));
516 free(good);
517 free(bad);
518 return res;
521 static int bisect_skipped_commits(struct bisect_terms *terms)
523 int res;
524 FILE *fp = NULL;
525 struct rev_info revs;
526 struct commit *commit;
527 struct pretty_print_context pp = {0};
528 struct strbuf commit_name = STRBUF_INIT;
530 res = prepare_revs(terms, &revs);
531 if (res)
532 return res;
534 fp = fopen(git_path_bisect_log(), "a");
535 if (!fp)
536 return error_errno(_("could not open '%s' for appending"),
537 git_path_bisect_log());
539 if (fprintf(fp, "# only skipped commits left to test\n") < 0)
540 return error_errno(_("failed to write to '%s'"), git_path_bisect_log());
542 while ((commit = get_revision(&revs)) != NULL) {
543 strbuf_reset(&commit_name);
544 format_commit_message(commit, "%s",
545 &commit_name, &pp);
546 fprintf(fp, "# possible first %s commit: [%s] %s\n",
547 terms->term_bad, oid_to_hex(&commit->object.oid),
548 commit_name.buf);
552 * Reset the flags used by revision walks in case
553 * there is another revision walk after this one.
555 reset_revision_walk();
557 strbuf_release(&commit_name);
558 fclose(fp);
559 return 0;
562 static int bisect_successful(struct bisect_terms *terms)
564 struct object_id oid;
565 struct commit *commit;
566 struct pretty_print_context pp = {0};
567 struct strbuf commit_name = STRBUF_INIT;
568 char *bad_ref = xstrfmt("refs/bisect/%s",terms->term_bad);
569 int res;
571 read_ref(bad_ref, &oid);
572 commit = lookup_commit_reference_by_name(bad_ref);
573 format_commit_message(commit, "%s", &commit_name, &pp);
575 res = append_to_file(git_path_bisect_log(), "# first %s commit: [%s] %s\n",
576 terms->term_bad, oid_to_hex(&commit->object.oid),
577 commit_name.buf);
579 strbuf_release(&commit_name);
580 free(bad_ref);
581 return res;
584 static enum bisect_error bisect_next(struct bisect_terms *terms, const char *prefix)
586 enum bisect_error res;
588 if (bisect_autostart(terms))
589 return BISECT_FAILED;
591 if (bisect_next_check(terms, terms->term_good))
592 return BISECT_FAILED;
594 /* Perform all bisection computation */
595 res = bisect_next_all(the_repository, prefix);
597 if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) {
598 res = bisect_successful(terms);
599 return res ? res : BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
600 } else if (res == BISECT_ONLY_SKIPPED_LEFT) {
601 res = bisect_skipped_commits(terms);
602 return res ? res : BISECT_ONLY_SKIPPED_LEFT;
604 return res;
607 static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix)
609 if (bisect_next_check(terms, NULL))
610 return BISECT_OK;
612 return bisect_next(terms, prefix);
615 static enum bisect_error bisect_start(struct bisect_terms *terms, const char **argv, int argc)
617 int no_checkout = 0;
618 int first_parent_only = 0;
619 int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0;
620 int flags, pathspec_pos;
621 enum bisect_error res = BISECT_OK;
622 struct string_list revs = STRING_LIST_INIT_DUP;
623 struct string_list states = STRING_LIST_INIT_DUP;
624 struct strbuf start_head = STRBUF_INIT;
625 struct strbuf bisect_names = STRBUF_INIT;
626 struct object_id head_oid;
627 struct object_id oid;
628 const char *head;
630 if (is_bare_repository())
631 no_checkout = 1;
634 * Check for one bad and then some good revisions
636 for (i = 0; i < argc; i++) {
637 if (!strcmp(argv[i], "--")) {
638 has_double_dash = 1;
639 break;
643 for (i = 0; i < argc; i++) {
644 const char *arg = argv[i];
645 if (!strcmp(argv[i], "--")) {
646 break;
647 } else if (!strcmp(arg, "--no-checkout")) {
648 no_checkout = 1;
649 } else if (!strcmp(arg, "--first-parent")) {
650 first_parent_only = 1;
651 } else if (!strcmp(arg, "--term-good") ||
652 !strcmp(arg, "--term-old")) {
653 i++;
654 if (argc <= i)
655 return error(_("'' is not a valid term"));
656 must_write_terms = 1;
657 free((void *) terms->term_good);
658 terms->term_good = xstrdup(argv[i]);
659 } else if (skip_prefix(arg, "--term-good=", &arg) ||
660 skip_prefix(arg, "--term-old=", &arg)) {
661 must_write_terms = 1;
662 free((void *) terms->term_good);
663 terms->term_good = xstrdup(arg);
664 } else if (!strcmp(arg, "--term-bad") ||
665 !strcmp(arg, "--term-new")) {
666 i++;
667 if (argc <= i)
668 return error(_("'' is not a valid term"));
669 must_write_terms = 1;
670 free((void *) terms->term_bad);
671 terms->term_bad = xstrdup(argv[i]);
672 } else if (skip_prefix(arg, "--term-bad=", &arg) ||
673 skip_prefix(arg, "--term-new=", &arg)) {
674 must_write_terms = 1;
675 free((void *) terms->term_bad);
676 terms->term_bad = xstrdup(arg);
677 } else if (starts_with(arg, "--")) {
678 return error(_("unrecognized option: '%s'"), arg);
679 } else if (!get_oidf(&oid, "%s^{commit}", arg)) {
680 string_list_append(&revs, oid_to_hex(&oid));
681 } else if (has_double_dash) {
682 die(_("'%s' does not appear to be a valid "
683 "revision"), arg);
684 } else {
685 break;
688 pathspec_pos = i;
691 * The user ran "git bisect start <sha1> <sha1>", hence did not
692 * explicitly specify the terms, but we are already starting to
693 * set references named with the default terms, and won't be able
694 * to change afterwards.
696 if (revs.nr)
697 must_write_terms = 1;
698 for (i = 0; i < revs.nr; i++) {
699 if (bad_seen) {
700 string_list_append(&states, terms->term_good);
701 } else {
702 bad_seen = 1;
703 string_list_append(&states, terms->term_bad);
708 * Verify HEAD
710 head = resolve_ref_unsafe("HEAD", 0, &head_oid, &flags);
711 if (!head)
712 if (get_oid("HEAD", &head_oid))
713 return error(_("bad HEAD - I need a HEAD"));
716 * Check if we are bisecting
718 if (!is_empty_or_missing_file(git_path_bisect_start())) {
719 /* Reset to the rev from where we started */
720 strbuf_read_file(&start_head, git_path_bisect_start(), 0);
721 strbuf_trim(&start_head);
722 if (!no_checkout) {
723 struct strvec argv = STRVEC_INIT;
725 strvec_pushl(&argv, "checkout", start_head.buf,
726 "--", NULL);
727 if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
728 res = error(_("checking out '%s' failed."
729 " Try 'git bisect start "
730 "<valid-branch>'."),
731 start_head.buf);
732 goto finish;
735 } else {
736 /* Get the rev from where we start. */
737 if (!get_oid(head, &head_oid) &&
738 !starts_with(head, "refs/heads/")) {
739 strbuf_reset(&start_head);
740 strbuf_addstr(&start_head, oid_to_hex(&head_oid));
741 } else if (!get_oid(head, &head_oid) &&
742 skip_prefix(head, "refs/heads/", &head)) {
744 * This error message should only be triggered by
745 * cogito usage, and cogito users should understand
746 * it relates to cg-seek.
748 if (!is_empty_or_missing_file(git_path_head_name()))
749 return error(_("won't bisect on cg-seek'ed tree"));
750 strbuf_addstr(&start_head, head);
751 } else {
752 return error(_("bad HEAD - strange symbolic ref"));
757 * Get rid of any old bisect state.
759 if (bisect_clean_state())
760 return BISECT_FAILED;
763 * Write new start state
765 write_file(git_path_bisect_start(), "%s\n", start_head.buf);
767 if (first_parent_only)
768 write_file(git_path_bisect_first_parent(), "\n");
770 if (no_checkout) {
771 if (get_oid(start_head.buf, &oid) < 0) {
772 res = error(_("invalid ref: '%s'"), start_head.buf);
773 goto finish;
775 if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
776 UPDATE_REFS_MSG_ON_ERR)) {
777 res = BISECT_FAILED;
778 goto finish;
782 if (pathspec_pos < argc - 1)
783 sq_quote_argv(&bisect_names, argv + pathspec_pos);
784 write_file(git_path_bisect_names(), "%s\n", bisect_names.buf);
786 for (i = 0; i < states.nr; i++)
787 if (bisect_write(states.items[i].string,
788 revs.items[i].string, terms, 1)) {
789 res = BISECT_FAILED;
790 goto finish;
793 if (must_write_terms && write_terms(terms->term_bad,
794 terms->term_good)) {
795 res = BISECT_FAILED;
796 goto finish;
799 res = bisect_append_log_quoted(argv);
800 if (res)
801 res = BISECT_FAILED;
803 finish:
804 string_list_clear(&revs, 0);
805 string_list_clear(&states, 0);
806 strbuf_release(&start_head);
807 strbuf_release(&bisect_names);
808 if (res)
809 return res;
811 res = bisect_auto_next(terms, NULL);
812 if (!is_bisect_success(res))
813 bisect_clean_state();
814 return res;
817 static inline int file_is_not_empty(const char *path)
819 return !is_empty_or_missing_file(path);
822 static int bisect_autostart(struct bisect_terms *terms)
824 int res;
825 const char *yesno;
827 if (file_is_not_empty(git_path_bisect_start()))
828 return 0;
830 fprintf_ln(stderr, _("You need to start by \"git bisect "
831 "start\"\n"));
833 if (!isatty(STDIN_FILENO))
834 return -1;
837 * TRANSLATORS: Make sure to include [Y] and [n] in your
838 * translation. The program will only accept English input
839 * at this point.
841 yesno = git_prompt(_("Do you want me to do it for you "
842 "[Y/n]? "), PROMPT_ECHO);
843 res = tolower(*yesno) == 'n' ?
844 -1 : bisect_start(terms, empty_strvec, 0);
846 return res;
849 static enum bisect_error bisect_state(struct bisect_terms *terms, const char **argv,
850 int argc)
852 const char *state;
853 int i, verify_expected = 1;
854 struct object_id oid, expected;
855 struct strbuf buf = STRBUF_INIT;
856 struct oid_array revs = OID_ARRAY_INIT;
858 if (!argc)
859 return error(_("Please call `--bisect-state` with at least one argument"));
861 if (bisect_autostart(terms))
862 return BISECT_FAILED;
864 state = argv[0];
865 if (check_and_set_terms(terms, state) ||
866 !one_of(state, terms->term_good, terms->term_bad, "skip", NULL))
867 return BISECT_FAILED;
869 argv++;
870 argc--;
871 if (argc > 1 && !strcmp(state, terms->term_bad))
872 return error(_("'git bisect %s' can take only one argument."), terms->term_bad);
874 if (argc == 0) {
875 const char *head = "BISECT_HEAD";
876 enum get_oid_result res_head = get_oid(head, &oid);
878 if (res_head == MISSING_OBJECT) {
879 head = "HEAD";
880 res_head = get_oid(head, &oid);
883 if (res_head)
884 error(_("Bad rev input: %s"), head);
885 oid_array_append(&revs, &oid);
889 * All input revs must be checked before executing bisect_write()
890 * to discard junk revs.
893 for (; argc; argc--, argv++) {
894 struct commit *commit;
896 if (get_oid(*argv, &oid)){
897 error(_("Bad rev input: %s"), *argv);
898 oid_array_clear(&revs);
899 return BISECT_FAILED;
902 commit = lookup_commit_reference(the_repository, &oid);
903 if (!commit)
904 die(_("Bad rev input (not a commit): %s"), *argv);
906 oid_array_append(&revs, &commit->object.oid);
909 if (strbuf_read_file(&buf, git_path_bisect_expected_rev(), 0) < the_hash_algo->hexsz ||
910 get_oid_hex(buf.buf, &expected) < 0)
911 verify_expected = 0; /* Ignore invalid file contents */
912 strbuf_release(&buf);
914 for (i = 0; i < revs.nr; i++) {
915 if (bisect_write(state, oid_to_hex(&revs.oid[i]), terms, 0)) {
916 oid_array_clear(&revs);
917 return BISECT_FAILED;
919 if (verify_expected && !oideq(&revs.oid[i], &expected)) {
920 unlink_or_warn(git_path_bisect_ancestors_ok());
921 unlink_or_warn(git_path_bisect_expected_rev());
922 verify_expected = 0;
926 oid_array_clear(&revs);
927 return bisect_auto_next(terms, NULL);
930 static enum bisect_error bisect_log(void)
932 int fd, status;
933 const char* filename = git_path_bisect_log();
935 if (is_empty_or_missing_file(filename))
936 return error(_("We are not bisecting."));
938 fd = open(filename, O_RDONLY);
939 if (fd < 0)
940 return BISECT_FAILED;
942 status = copy_fd(fd, STDOUT_FILENO);
943 close(fd);
944 return status ? BISECT_FAILED : BISECT_OK;
947 static int process_replay_line(struct bisect_terms *terms, struct strbuf *line)
949 const char *p = line->buf + strspn(line->buf, " \t");
950 char *word_end, *rev;
952 if ((!skip_prefix(p, "git bisect", &p) &&
953 !skip_prefix(p, "git-bisect", &p)) || !isspace(*p))
954 return 0;
955 p += strspn(p, " \t");
957 word_end = (char *)p + strcspn(p, " \t");
958 rev = word_end + strspn(word_end, " \t");
959 *word_end = '\0'; /* NUL-terminate the word */
961 get_terms(terms);
962 if (check_and_set_terms(terms, p))
963 return -1;
965 if (!strcmp(p, "start")) {
966 struct strvec argv = STRVEC_INIT;
967 int res;
968 sq_dequote_to_strvec(rev, &argv);
969 res = bisect_start(terms, argv.v, argv.nr);
970 strvec_clear(&argv);
971 return res;
974 if (one_of(p, terms->term_good,
975 terms->term_bad, "skip", NULL))
976 return bisect_write(p, rev, terms, 0);
978 if (!strcmp(p, "terms")) {
979 struct strvec argv = STRVEC_INIT;
980 int res;
981 sq_dequote_to_strvec(rev, &argv);
982 res = bisect_terms(terms, argv.nr == 1 ? argv.v[0] : NULL);
983 strvec_clear(&argv);
984 return res;
986 error(_("'%s'?? what are you talking about?"), p);
988 return -1;
991 static enum bisect_error bisect_replay(struct bisect_terms *terms, const char *filename)
993 FILE *fp = NULL;
994 enum bisect_error res = BISECT_OK;
995 struct strbuf line = STRBUF_INIT;
997 if (is_empty_or_missing_file(filename))
998 return error(_("cannot read file '%s' for replaying"), filename);
1000 if (bisect_reset(NULL))
1001 return BISECT_FAILED;
1003 fp = fopen(filename, "r");
1004 if (!fp)
1005 return BISECT_FAILED;
1007 while ((strbuf_getline(&line, fp) != EOF) && !res)
1008 res = process_replay_line(terms, &line);
1010 strbuf_release(&line);
1011 fclose(fp);
1013 if (res)
1014 return BISECT_FAILED;
1016 return bisect_auto_next(terms, NULL);
1019 static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **argv, int argc)
1021 int i;
1022 enum bisect_error res;
1023 struct strvec argv_state = STRVEC_INIT;
1025 strvec_push(&argv_state, "skip");
1027 for (i = 0; i < argc; i++) {
1028 const char *dotdot = strstr(argv[i], "..");
1030 if (dotdot) {
1031 struct rev_info revs;
1032 struct commit *commit;
1034 init_revisions(&revs, NULL);
1035 setup_revisions(2, argv + i - 1, &revs, NULL);
1037 if (prepare_revision_walk(&revs))
1038 die(_("revision walk setup failed\n"));
1039 while ((commit = get_revision(&revs)) != NULL)
1040 strvec_push(&argv_state,
1041 oid_to_hex(&commit->object.oid));
1043 reset_revision_walk();
1044 } else {
1045 strvec_push(&argv_state, argv[i]);
1048 res = bisect_state(terms, argv_state.v, argv_state.nr);
1050 strvec_clear(&argv_state);
1051 return res;
1054 static int bisect_visualize(struct bisect_terms *terms, const char **argv, int argc)
1056 struct strvec args = STRVEC_INIT;
1057 int flags = RUN_COMMAND_NO_STDIN, res = 0;
1058 struct strbuf sb = STRBUF_INIT;
1060 if (bisect_next_check(terms, NULL) != 0)
1061 return BISECT_FAILED;
1063 if (!argc) {
1064 if ((getenv("DISPLAY") || getenv("SESSIONNAME") || getenv("MSYSTEM") ||
1065 getenv("SECURITYSESSIONID")) && exists_in_PATH("gitk")) {
1066 strvec_push(&args, "gitk");
1067 } else {
1068 strvec_push(&args, "log");
1069 flags |= RUN_GIT_CMD;
1071 } else {
1072 if (argv[0][0] == '-') {
1073 strvec_push(&args, "log");
1074 flags |= RUN_GIT_CMD;
1075 } else if (strcmp(argv[0], "tig") && !starts_with(argv[0], "git"))
1076 flags |= RUN_GIT_CMD;
1078 strvec_pushv(&args, argv);
1081 strvec_pushl(&args, "--bisect", "--", NULL);
1083 strbuf_read_file(&sb, git_path_bisect_names(), 0);
1084 sq_dequote_to_strvec(sb.buf, &args);
1085 strbuf_release(&sb);
1087 res = run_command_v_opt(args.v, flags);
1088 strvec_clear(&args);
1089 return res;
1092 static int get_first_good(const char *refname, const struct object_id *oid,
1093 int flag, void *cb_data)
1095 oidcpy(cb_data, oid);
1096 return 1;
1099 static int verify_good(const struct bisect_terms *terms,
1100 const char **quoted_argv)
1102 int rc;
1103 enum bisect_error res;
1104 struct object_id good_rev;
1105 struct object_id current_rev;
1106 char *good_glob = xstrfmt("%s-*", terms->term_good);
1107 int no_checkout = ref_exists("BISECT_HEAD");
1109 for_each_glob_ref_in(get_first_good, good_glob, "refs/bisect/",
1110 &good_rev);
1111 free(good_glob);
1113 if (read_ref(no_checkout ? "BISECT_HEAD" : "HEAD", &current_rev))
1114 return -1;
1116 res = bisect_checkout(&good_rev, no_checkout);
1117 if (res != BISECT_OK)
1118 return -1;
1120 printf(_("running %s\n"), quoted_argv[0]);
1121 rc = run_command_v_opt(quoted_argv, RUN_USING_SHELL);
1123 res = bisect_checkout(&current_rev, no_checkout);
1124 if (res != BISECT_OK)
1125 return -1;
1127 return rc;
1130 static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
1132 int res = BISECT_OK;
1133 struct strbuf command = STRBUF_INIT;
1134 struct strvec run_args = STRVEC_INIT;
1135 const char *new_state;
1136 int temporary_stdout_fd, saved_stdout;
1137 int is_first_run = 1;
1139 if (bisect_next_check(terms, NULL))
1140 return BISECT_FAILED;
1142 if (argc)
1143 sq_quote_argv(&command, argv);
1144 else {
1145 error(_("bisect run failed: no command provided."));
1146 return BISECT_FAILED;
1149 strvec_push(&run_args, command.buf);
1151 while (1) {
1152 printf(_("running %s\n"), command.buf);
1153 res = run_command_v_opt(run_args.v, RUN_USING_SHELL);
1156 * Exit code 126 and 127 can either come from the shell
1157 * if it was unable to execute or even find the script,
1158 * or from the script itself. Check with a known-good
1159 * revision to avoid trashing the bisect run due to a
1160 * missing or non-executable script.
1162 if (is_first_run && (res == 126 || res == 127)) {
1163 int rc = verify_good(terms, run_args.v);
1164 is_first_run = 0;
1165 if (rc < 0) {
1166 error(_("unable to verify '%s' on good"
1167 " revision"), command.buf);
1168 res = BISECT_FAILED;
1169 break;
1171 if (rc == res) {
1172 error(_("bogus exit code %d for good revision"),
1173 rc);
1174 res = BISECT_FAILED;
1175 break;
1179 if (res < 0 || 128 <= res) {
1180 error(_("bisect run failed: exit code %d from"
1181 " '%s' is < 0 or >= 128"), res, command.buf);
1182 break;
1185 if (res == 125)
1186 new_state = "skip";
1187 else if (!res)
1188 new_state = terms->term_good;
1189 else
1190 new_state = terms->term_bad;
1192 temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
1194 if (temporary_stdout_fd < 0) {
1195 res = error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
1196 break;
1199 fflush(stdout);
1200 saved_stdout = dup(1);
1201 dup2(temporary_stdout_fd, 1);
1203 res = bisect_state(terms, &new_state, 1);
1205 fflush(stdout);
1206 dup2(saved_stdout, 1);
1207 close(saved_stdout);
1208 close(temporary_stdout_fd);
1210 print_file_to_stdout(git_path_bisect_run());
1212 if (res == BISECT_ONLY_SKIPPED_LEFT)
1213 error(_("bisect run cannot continue any more"));
1214 else if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) {
1215 printf(_("bisect run success"));
1216 res = BISECT_OK;
1217 } else if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) {
1218 printf(_("bisect found first bad commit"));
1219 res = BISECT_OK;
1220 } else if (res) {
1221 error(_("bisect run failed: 'git bisect--helper --bisect-state"
1222 " %s' exited with error code %d"), new_state, res);
1223 } else {
1224 continue;
1226 break;
1229 strbuf_release(&command);
1230 strvec_clear(&run_args);
1231 return res;
1234 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
1236 enum {
1237 BISECT_RESET = 1,
1238 BISECT_NEXT_CHECK,
1239 BISECT_TERMS,
1240 BISECT_START,
1241 BISECT_AUTOSTART,
1242 BISECT_NEXT,
1243 BISECT_STATE,
1244 BISECT_LOG,
1245 BISECT_REPLAY,
1246 BISECT_SKIP,
1247 BISECT_VISUALIZE,
1248 BISECT_RUN,
1249 } cmdmode = 0;
1250 int res = 0, nolog = 0;
1251 struct option options[] = {
1252 OPT_CMDMODE(0, "bisect-reset", &cmdmode,
1253 N_("reset the bisection state"), BISECT_RESET),
1254 OPT_CMDMODE(0, "bisect-next-check", &cmdmode,
1255 N_("check whether bad or good terms exist"), BISECT_NEXT_CHECK),
1256 OPT_CMDMODE(0, "bisect-terms", &cmdmode,
1257 N_("print out the bisect terms"), BISECT_TERMS),
1258 OPT_CMDMODE(0, "bisect-start", &cmdmode,
1259 N_("start the bisect session"), BISECT_START),
1260 OPT_CMDMODE(0, "bisect-next", &cmdmode,
1261 N_("find the next bisection commit"), BISECT_NEXT),
1262 OPT_CMDMODE(0, "bisect-state", &cmdmode,
1263 N_("mark the state of ref (or refs)"), BISECT_STATE),
1264 OPT_CMDMODE(0, "bisect-log", &cmdmode,
1265 N_("list the bisection steps so far"), BISECT_LOG),
1266 OPT_CMDMODE(0, "bisect-replay", &cmdmode,
1267 N_("replay the bisection process from the given file"), BISECT_REPLAY),
1268 OPT_CMDMODE(0, "bisect-skip", &cmdmode,
1269 N_("skip some commits for checkout"), BISECT_SKIP),
1270 OPT_CMDMODE(0, "bisect-visualize", &cmdmode,
1271 N_("visualize the bisection"), BISECT_VISUALIZE),
1272 OPT_CMDMODE(0, "bisect-run", &cmdmode,
1273 N_("use <cmd>... to automatically bisect"), BISECT_RUN),
1274 OPT_BOOL(0, "no-log", &nolog,
1275 N_("no log for BISECT_WRITE")),
1276 OPT_END()
1278 struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
1280 argc = parse_options(argc, argv, prefix, options,
1281 git_bisect_helper_usage,
1282 PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_UNKNOWN);
1284 if (!cmdmode)
1285 usage_with_options(git_bisect_helper_usage, options);
1287 switch (cmdmode) {
1288 case BISECT_RESET:
1289 if (argc > 1)
1290 return error(_("--bisect-reset requires either no argument or a commit"));
1291 res = bisect_reset(argc ? argv[0] : NULL);
1292 break;
1293 case BISECT_TERMS:
1294 if (argc > 1)
1295 return error(_("--bisect-terms requires 0 or 1 argument"));
1296 res = bisect_terms(&terms, argc == 1 ? argv[0] : NULL);
1297 break;
1298 case BISECT_START:
1299 set_terms(&terms, "bad", "good");
1300 res = bisect_start(&terms, argv, argc);
1301 break;
1302 case BISECT_NEXT:
1303 if (argc)
1304 return error(_("--bisect-next requires 0 arguments"));
1305 get_terms(&terms);
1306 res = bisect_next(&terms, prefix);
1307 break;
1308 case BISECT_STATE:
1309 set_terms(&terms, "bad", "good");
1310 get_terms(&terms);
1311 res = bisect_state(&terms, argv, argc);
1312 break;
1313 case BISECT_LOG:
1314 if (argc)
1315 return error(_("--bisect-log requires 0 arguments"));
1316 res = bisect_log();
1317 break;
1318 case BISECT_REPLAY:
1319 if (argc != 1)
1320 return error(_("no logfile given"));
1321 set_terms(&terms, "bad", "good");
1322 res = bisect_replay(&terms, argv[0]);
1323 break;
1324 case BISECT_SKIP:
1325 set_terms(&terms, "bad", "good");
1326 get_terms(&terms);
1327 res = bisect_skip(&terms, argv, argc);
1328 break;
1329 case BISECT_VISUALIZE:
1330 get_terms(&terms);
1331 res = bisect_visualize(&terms, argv, argc);
1332 break;
1333 case BISECT_RUN:
1334 if (!argc)
1335 return error(_("bisect run failed: no command provided."));
1336 get_terms(&terms);
1337 res = bisect_run(&terms, argv, argc);
1338 break;
1339 default:
1340 BUG("unknown subcommand %d", cmdmode);
1342 free_terms(&terms);
1345 * Handle early success
1346 * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
1348 if ((res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) || (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND))
1349 res = BISECT_OK;
1351 return -res;