1 #define USE_THE_REPOSITORY_VARIABLE
3 #include "git-compat-util.h"
7 #include "environment.h"
12 #include "list-objects.h"
14 #include "run-command.h"
17 #include "oid-array.h"
19 #include "commit-slab.h"
20 #include "commit-reach.h"
21 #include "object-name.h"
22 #include "object-store-ll.h"
26 static struct oid_array good_revs
;
27 static struct oid_array skipped_revs
;
29 static struct object_id
*current_bad_oid
;
31 static const char *term_bad
;
32 static const char *term_good
;
34 /* Remember to update object flag allocation in object.h */
35 #define COUNTED (1u<<16)
38 * This is a truly stupid algorithm, but it's only
39 * used for bisection, and we just don't care enough.
41 * We care just barely enough to avoid recursing for
44 static int count_distance(struct commit_list
*entry
)
49 struct commit
*commit
= entry
->item
;
50 struct commit_list
*p
;
52 if (commit
->object
.flags
& (UNINTERESTING
| COUNTED
))
54 if (!(commit
->object
.flags
& TREESAME
))
56 commit
->object
.flags
|= COUNTED
;
62 nr
+= count_distance(p
);
71 static void clear_distance(struct commit_list
*list
)
74 struct commit
*commit
= list
->item
;
75 commit
->object
.flags
&= ~COUNTED
;
80 define_commit_slab(commit_weight
, int *);
81 static struct commit_weight commit_weight
;
83 #define DEBUG_BISECT 0
85 static inline int weight(struct commit_list
*elem
)
87 return **commit_weight_at(&commit_weight
, elem
->item
);
90 static inline void weight_set(struct commit_list
*elem
, int weight
)
92 **commit_weight_at(&commit_weight
, elem
->item
) = weight
;
95 static int count_interesting_parents(struct commit
*commit
, unsigned bisect_flags
)
97 struct commit_list
*p
;
100 for (count
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
101 if (!(p
->item
->object
.flags
& UNINTERESTING
))
103 if (bisect_flags
& FIND_BISECTION_FIRST_PARENT_ONLY
)
109 static inline int approx_halfway(struct commit_list
*p
, int nr
)
114 * Don't short-cut something we are not going to return!
116 if (p
->item
->object
.flags
& TREESAME
)
121 * For small number of commits 2 and 3 are halfway of 5, and
122 * 3 is halfway of 6 but 2 and 4 are not.
124 diff
= 2 * weight(p
) - nr
;
126 case -1: case 0: case 1:
130 * For large number of commits we are not so strict, it's
131 * good enough if it's within ~0.1% of the halfway point,
132 * e.g. 5000 is exactly halfway of 10000, but we consider
133 * the values [4996, 5004] as halfway as well.
135 if (abs(diff
) < nr
/ 1024)
141 static void show_list(const char *debug
, int counted
, int nr
,
142 struct commit_list
*list
)
144 struct commit_list
*p
;
149 fprintf(stderr
, "%s (%d/%d)\n", debug
, counted
, nr
);
151 for (p
= list
; p
; p
= p
->next
) {
152 struct commit_list
*pp
;
153 struct commit
*commit
= p
->item
;
154 unsigned commit_flags
= commit
->object
.flags
;
155 enum object_type type
;
157 char *buf
= repo_read_object_file(the_repository
,
158 &commit
->object
.oid
, &type
,
160 const char *subject_start
;
164 die(_("unable to read %s"), oid_to_hex(&commit
->object
.oid
));
166 fprintf(stderr
, "%c%c%c ",
167 (commit_flags
& TREESAME
) ? ' ' : 'T',
168 (commit_flags
& UNINTERESTING
) ? 'U' : ' ',
169 (commit_flags
& COUNTED
) ? 'C' : ' ');
170 if (*commit_weight_at(&commit_weight
, p
->item
))
171 fprintf(stderr
, "%3d", weight(p
));
173 fprintf(stderr
, "---");
174 fprintf(stderr
, " %.*s", 8, oid_to_hex(&commit
->object
.oid
));
175 for (pp
= commit
->parents
; pp
; pp
= pp
->next
)
176 fprintf(stderr
, " %.*s", 8,
177 oid_to_hex(&pp
->item
->object
.oid
));
179 subject_len
= find_commit_subject(buf
, &subject_start
);
181 fprintf(stderr
, " %.*s", subject_len
, subject_start
);
182 fprintf(stderr
, "\n");
186 static struct commit_list
*best_bisection(struct commit_list
*list
, int nr
)
188 struct commit_list
*p
, *best
;
189 int best_distance
= -1;
192 for (p
= list
; p
; p
= p
->next
) {
194 unsigned commit_flags
= p
->item
->object
.flags
;
196 if (commit_flags
& TREESAME
)
198 distance
= weight(p
);
199 if (nr
- distance
< distance
)
200 distance
= nr
- distance
;
201 if (distance
> best_distance
) {
203 best_distance
= distance
;
211 struct commit
*commit
;
215 static int compare_commit_dist(const void *a_
, const void *b_
)
217 struct commit_dist
*a
, *b
;
219 a
= (struct commit_dist
*)a_
;
220 b
= (struct commit_dist
*)b_
;
221 if (a
->distance
!= b
->distance
)
222 return b
->distance
- a
->distance
; /* desc sort */
223 return oidcmp(&a
->commit
->object
.oid
, &b
->commit
->object
.oid
);
226 static struct commit_list
*best_bisection_sorted(struct commit_list
*list
, int nr
)
228 struct commit_list
*p
;
229 struct commit_dist
*array
= xcalloc(nr
, sizeof(*array
));
230 struct strbuf buf
= STRBUF_INIT
;
233 for (p
= list
, cnt
= 0; p
; p
= p
->next
) {
235 unsigned commit_flags
= p
->item
->object
.flags
;
237 if (commit_flags
& TREESAME
)
239 distance
= weight(p
);
240 if (nr
- distance
< distance
)
241 distance
= nr
- distance
;
242 array
[cnt
].commit
= p
->item
;
243 array
[cnt
].distance
= distance
;
246 QSORT(array
, cnt
, compare_commit_dist
);
247 for (p
= list
, i
= 0; i
< cnt
; i
++) {
248 struct object
*obj
= &(array
[i
].commit
->object
);
251 strbuf_addf(&buf
, "dist=%d", array
[i
].distance
);
252 add_name_decoration(DECORATION_NONE
, buf
.buf
, obj
);
254 p
->item
= array
[i
].commit
;
259 free_commit_list(p
->next
);
262 strbuf_release(&buf
);
268 * zero or positive weight is the number of interesting commits it can
269 * reach, including itself. Especially, weight = 0 means it does not
270 * reach any tree-changing commits (e.g. just above uninteresting one
271 * but traversal is with pathspec).
273 * weight = -1 means it has one parent and its distance is yet to
276 * weight = -2 means it has more than one parent and its distance is
277 * unknown. After running count_distance() first, they will get zero
278 * or positive distance.
280 static struct commit_list
*do_find_bisection(struct commit_list
*list
,
281 int nr
, int *weights
,
282 unsigned bisect_flags
)
285 struct commit_list
*p
;
289 for (n
= 0, p
= list
; p
; p
= p
->next
) {
290 struct commit
*commit
= p
->item
;
291 unsigned commit_flags
= commit
->object
.flags
;
293 *commit_weight_at(&commit_weight
, p
->item
) = &weights
[n
++];
294 switch (count_interesting_parents(commit
, bisect_flags
)) {
296 if (!(commit_flags
& TREESAME
)) {
299 show_list("bisection 2 count one",
303 * otherwise, it is known not to reach any
304 * tree-changing commit and gets weight 0.
316 show_list("bisection 2 initialize", counted
, nr
, list
);
319 * If you have only one parent in the resulting set
320 * then you can reach one commit more than that parent
321 * can reach. So we do not have to run the expensive
322 * count_distance() for single strand of pearls.
324 * However, if you have more than one parents, you cannot
325 * just add their distance and one for yourself, since
326 * they usually reach the same ancestor and you would
327 * end up counting them twice that way.
329 * So we will first count distance of merges the usual
330 * way, and then fill the blanks using cheaper algorithm.
332 for (p
= list
; p
; p
= p
->next
) {
333 if (p
->item
->object
.flags
& UNINTERESTING
)
337 if (bisect_flags
& FIND_BISECTION_FIRST_PARENT_ONLY
)
338 BUG("shouldn't be calling count-distance in fp mode");
339 weight_set(p
, count_distance(p
));
340 clear_distance(list
);
342 /* Does it happen to be at half-way? */
343 if (!(bisect_flags
& FIND_BISECTION_ALL
) &&
344 approx_halfway(p
, nr
))
349 show_list("bisection 2 count_distance", counted
, nr
, list
);
351 while (counted
< nr
) {
352 for (p
= list
; p
; p
= p
->next
) {
353 struct commit_list
*q
;
354 unsigned commit_flags
= p
->item
->object
.flags
;
359 for (q
= p
->item
->parents
;
361 q
= bisect_flags
& FIND_BISECTION_FIRST_PARENT_ONLY
? NULL
: q
->next
) {
362 if (q
->item
->object
.flags
& UNINTERESTING
)
371 * weight for p is unknown but q is known.
372 * add one for p itself if p is to be counted,
373 * otherwise inherit it from q directly.
375 if (!(commit_flags
& TREESAME
)) {
376 weight_set(p
, weight(q
)+1);
378 show_list("bisection 2 count one",
382 weight_set(p
, weight(q
));
384 /* Does it happen to be at half-way? */
385 if (!(bisect_flags
& FIND_BISECTION_ALL
) &&
386 approx_halfway(p
, nr
))
391 show_list("bisection 2 counted all", counted
, nr
, list
);
393 if (!(bisect_flags
& FIND_BISECTION_ALL
))
394 return best_bisection(list
, nr
);
396 return best_bisection_sorted(list
, nr
);
399 void find_bisection(struct commit_list
**commit_list
, int *reaches
,
400 int *all
, unsigned bisect_flags
)
403 struct commit_list
*list
, *p
, *best
, *next
, *last
;
406 show_list("bisection 2 entry", 0, 0, *commit_list
);
407 init_commit_weight(&commit_weight
);
410 * Count the number of total and tree-changing items on the
411 * list, while reversing the list.
413 for (nr
= on_list
= 0, last
= NULL
, p
= *commit_list
;
416 unsigned commit_flags
= p
->item
->object
.flags
;
419 if (commit_flags
& UNINTERESTING
) {
425 if (!(commit_flags
& TREESAME
))
430 show_list("bisection 2 sorted", 0, nr
, list
);
433 CALLOC_ARRAY(weights
, on_list
);
435 /* Do the real work of finding bisection commit. */
436 best
= do_find_bisection(list
, nr
, weights
, bisect_flags
);
438 if (!(bisect_flags
& FIND_BISECTION_ALL
)) {
439 list
->item
= best
->item
;
440 free_commit_list(list
->next
);
444 *reaches
= weight(best
);
448 clear_commit_weight(&commit_weight
);
451 static int register_ref(const char *refname
, const struct object_id
*oid
,
452 int flags UNUSED
, void *cb_data UNUSED
)
454 struct strbuf good_prefix
= STRBUF_INIT
;
455 strbuf_addstr(&good_prefix
, term_good
);
456 strbuf_addstr(&good_prefix
, "-");
458 if (!strcmp(refname
, term_bad
)) {
459 current_bad_oid
= xmalloc(sizeof(*current_bad_oid
));
460 oidcpy(current_bad_oid
, oid
);
461 } else if (starts_with(refname
, good_prefix
.buf
)) {
462 oid_array_append(&good_revs
, oid
);
463 } else if (starts_with(refname
, "skip-")) {
464 oid_array_append(&skipped_revs
, oid
);
467 strbuf_release(&good_prefix
);
472 static int read_bisect_refs(void)
474 return refs_for_each_ref_in(get_main_ref_store(the_repository
),
475 "refs/bisect/", register_ref
, NULL
);
478 static GIT_PATH_FUNC(git_path_bisect_names
, "BISECT_NAMES")
479 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok
, "BISECT_ANCESTORS_OK")
480 static GIT_PATH_FUNC(git_path_bisect_run
, "BISECT_RUN")
481 static GIT_PATH_FUNC(git_path_bisect_start
, "BISECT_START")
482 static GIT_PATH_FUNC(git_path_bisect_log
, "BISECT_LOG")
483 static GIT_PATH_FUNC(git_path_bisect_terms
, "BISECT_TERMS")
484 static GIT_PATH_FUNC(git_path_bisect_first_parent
, "BISECT_FIRST_PARENT")
486 static void read_bisect_paths(struct strvec
*array
)
488 struct strbuf str
= STRBUF_INIT
;
489 const char *filename
= git_path_bisect_names();
490 FILE *fp
= xfopen(filename
, "r");
492 while (strbuf_getline_lf(&str
, fp
) != EOF
) {
494 if (sq_dequote_to_strvec(str
.buf
, array
))
495 die(_("Badly quoted content in file '%s': %s"),
499 strbuf_release(&str
);
503 static char *join_oid_array_hex(struct oid_array
*array
, char delim
)
505 struct strbuf joined_hexs
= STRBUF_INIT
;
508 for (i
= 0; i
< array
->nr
; i
++) {
509 strbuf_addstr(&joined_hexs
, oid_to_hex(array
->oid
+ i
));
510 if (i
+ 1 < array
->nr
)
511 strbuf_addch(&joined_hexs
, delim
);
514 return strbuf_detach(&joined_hexs
, NULL
);
518 * In this function, passing a not NULL skipped_first is very special.
519 * It means that we want to know if the first commit in the list is
520 * skipped because we will want to test a commit away from it if it is
522 * So if the first commit is skipped, we cannot take the shortcut to
523 * just "return list" when we find the first non skipped commit, we
524 * have to return a fully filtered list.
526 * We use (*skipped_first == -1) to mean "it has been found that the
527 * first commit is not skipped". In this case *skipped_first is set back
528 * to 0 just before the function returns.
530 struct commit_list
*filter_skipped(struct commit_list
*list
,
531 struct commit_list
**tried
,
536 struct commit_list
*filtered
= NULL
, **f
= &filtered
;
545 if (!skipped_revs
.nr
)
549 struct commit_list
*next
= list
->next
;
551 if (0 <= oid_array_lookup(&skipped_revs
, &list
->item
->object
.oid
)) {
552 if (skipped_first
&& !*skipped_first
)
554 /* Move current to tried list */
559 if (!skipped_first
|| !*skipped_first
)
561 } else if (skipped_first
&& !*skipped_first
) {
562 /* This means we know it's not skipped */
565 /* Move current to filtered list */
574 if (skipped_first
&& *skipped_first
== -1)
580 #define PRN_MODULO 32768
583 * This is a pseudo random number generator based on "man 3 rand".
584 * It is not used properly because the seed is the argument and it
585 * is increased by one between each call, but that should not matter
586 * for this application.
588 static unsigned get_prn(unsigned count
)
590 count
= count
* 1103515245 + 12345;
591 return (count
/65536) % PRN_MODULO
;
595 * Custom integer square root from
596 * https://en.wikipedia.org/wiki/Integer_square_root
598 static int sqrti(int val
)
606 float y
= (x
+ (float)val
/ x
) / 2;
607 d
= (y
> x
) ? y
- x
: x
- y
;
614 static struct commit_list
*skip_away(struct commit_list
*list
, int count
)
616 struct commit_list
*cur
, *previous
;
619 prn
= get_prn(count
);
620 index
= (count
* prn
/ PRN_MODULO
) * sqrti(prn
) / sqrti(PRN_MODULO
);
625 for (i
= 0; cur
; cur
= cur
->next
, i
++) {
627 if (!oideq(&cur
->item
->object
.oid
, current_bad_oid
))
639 static struct commit_list
*managed_skipped(struct commit_list
*list
,
640 struct commit_list
**tried
)
642 int count
, skipped_first
;
646 if (!skipped_revs
.nr
)
649 list
= filter_skipped(list
, tried
, 0, &count
, &skipped_first
);
654 return skip_away(list
, count
);
657 static void bisect_rev_setup(struct repository
*r
, struct rev_info
*revs
,
658 struct strvec
*rev_argv
,
660 const char *bad_format
, const char *good_format
,
663 struct setup_revision_opt opt
= {
664 .free_removed_argv_elements
= 1,
668 repo_init_revisions(r
, revs
, prefix
);
670 revs
->commit_format
= CMIT_FMT_UNSPECIFIED
;
672 /* rev_argv.argv[0] will be ignored by setup_revisions */
673 strvec_push(rev_argv
, "bisect_rev_setup");
674 strvec_pushf(rev_argv
, bad_format
, oid_to_hex(current_bad_oid
));
675 for (i
= 0; i
< good_revs
.nr
; i
++)
676 strvec_pushf(rev_argv
, good_format
,
677 oid_to_hex(good_revs
.oid
+ i
));
678 strvec_push(rev_argv
, "--");
680 read_bisect_paths(rev_argv
);
682 setup_revisions(rev_argv
->nr
, rev_argv
->v
, revs
, &opt
);
685 static void bisect_common(struct rev_info
*revs
)
687 if (prepare_revision_walk(revs
))
688 die("revision walk setup failed");
689 if (revs
->tree_objects
)
690 mark_edges_uninteresting(revs
, NULL
, 0);
693 static enum bisect_error
error_if_skipped_commits(struct commit_list
*tried
,
694 const struct object_id
*bad
)
699 printf("There are only 'skip'ped commits left to test.\n"
700 "The first %s commit could be any of:\n", term_bad
);
702 for ( ; tried
; tried
= tried
->next
)
703 printf("%s\n", oid_to_hex(&tried
->item
->object
.oid
));
706 printf("%s\n", oid_to_hex(bad
));
707 printf(_("We cannot bisect more!\n"));
709 return BISECT_ONLY_SKIPPED_LEFT
;
712 static int is_expected_rev(const struct object_id
*oid
)
714 struct object_id expected_oid
;
715 if (refs_read_ref(get_main_ref_store(the_repository
), "BISECT_EXPECTED_REV", &expected_oid
))
717 return oideq(oid
, &expected_oid
);
720 enum bisect_error
bisect_checkout(const struct object_id
*bisect_rev
,
723 struct commit
*commit
;
724 struct pretty_print_context pp
= {0};
725 struct strbuf commit_msg
= STRBUF_INIT
;
727 refs_update_ref(get_main_ref_store(the_repository
), NULL
,
728 "BISECT_EXPECTED_REV", bisect_rev
, NULL
, 0,
729 UPDATE_REFS_DIE_ON_ERR
);
732 refs_update_ref(get_main_ref_store(the_repository
), NULL
,
733 "BISECT_HEAD", bisect_rev
, NULL
, 0,
734 UPDATE_REFS_DIE_ON_ERR
);
736 struct child_process cmd
= CHILD_PROCESS_INIT
;
739 strvec_pushl(&cmd
.args
, "checkout", "-q",
740 oid_to_hex(bisect_rev
), "--", NULL
);
741 if (run_command(&cmd
))
743 * Errors in `run_command()` itself, signaled by res < 0,
744 * and errors in the child process, signaled by res > 0
745 * can both be treated as regular BISECT_FAILED (-1).
747 return BISECT_FAILED
;
750 commit
= lookup_commit_reference(the_repository
, bisect_rev
);
751 repo_format_commit_message(the_repository
, commit
, "[%H] %s%n",
753 fputs(commit_msg
.buf
, stdout
);
754 strbuf_release(&commit_msg
);
759 static struct commit
*get_commit_reference(struct repository
*r
,
760 const struct object_id
*oid
)
762 struct commit
*c
= lookup_commit_reference(r
, oid
);
764 die(_("Not a valid commit name %s"), oid_to_hex(oid
));
768 static struct commit
**get_bad_and_good_commits(struct repository
*r
,
774 ALLOC_ARRAY(rev
, 1 + good_revs
.nr
);
775 rev
[n
++] = get_commit_reference(r
, current_bad_oid
);
776 for (i
= 0; i
< good_revs
.nr
; i
++)
777 rev
[n
++] = get_commit_reference(r
, good_revs
.oid
+ i
);
783 static enum bisect_error
handle_bad_merge_base(void)
785 if (is_expected_rev(current_bad_oid
)) {
786 char *bad_hex
= oid_to_hex(current_bad_oid
);
787 char *good_hex
= join_oid_array_hex(&good_revs
, ' ');
788 if (!strcmp(term_bad
, "bad") && !strcmp(term_good
, "good")) {
789 fprintf(stderr
, _("The merge base %s is bad.\n"
790 "This means the bug has been fixed "
791 "between %s and [%s].\n"),
792 bad_hex
, bad_hex
, good_hex
);
793 } else if (!strcmp(term_bad
, "new") && !strcmp(term_good
, "old")) {
794 fprintf(stderr
, _("The merge base %s is new.\n"
795 "The property has changed "
796 "between %s and [%s].\n"),
797 bad_hex
, bad_hex
, good_hex
);
799 fprintf(stderr
, _("The merge base %s is %s.\n"
800 "This means the first '%s' commit is "
801 "between %s and [%s].\n"),
802 bad_hex
, term_bad
, term_good
, bad_hex
, good_hex
);
804 return BISECT_MERGE_BASE_CHECK
;
807 fprintf(stderr
, _("Some %s revs are not ancestors of the %s rev.\n"
808 "git bisect cannot work properly in this case.\n"
809 "Maybe you mistook %s and %s revs?\n"),
810 term_good
, term_bad
, term_good
, term_bad
);
811 return BISECT_FAILED
;
814 static void handle_skipped_merge_base(const struct object_id
*mb
)
816 char *mb_hex
= oid_to_hex(mb
);
817 char *bad_hex
= oid_to_hex(current_bad_oid
);
818 char *good_hex
= join_oid_array_hex(&good_revs
, ' ');
820 warning(_("the merge base between %s and [%s] "
822 "So we cannot be sure the first %s commit is "
823 "between %s and %s.\n"
824 "We continue anyway."),
825 bad_hex
, good_hex
, term_bad
, mb_hex
, bad_hex
);
830 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
832 * - If one is "bad" (or "new"), it means the user assumed something wrong
833 * and we must return error with a non 0 error code.
834 * - If one is "good" (or "old"), that's good, we have nothing to do.
835 * - If one is "skipped", we can't know but we should warn.
836 * - If we don't know, we should check it out and ask the user to test.
837 * - If a merge base must be tested, on success return
838 * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
839 * for early success, this will be converted back to 0 in
840 * check_good_are_ancestors_of_bad().
842 static enum bisect_error
check_merge_bases(int rev_nr
, struct commit
**rev
, int no_checkout
)
844 enum bisect_error res
= BISECT_OK
;
845 struct commit_list
*result
= NULL
;
847 if (repo_get_merge_bases_many(the_repository
, rev
[0], rev_nr
- 1,
848 rev
+ 1, &result
) < 0)
851 for (; result
; result
= result
->next
) {
852 const struct object_id
*mb
= &result
->item
->object
.oid
;
853 if (oideq(mb
, current_bad_oid
)) {
854 res
= handle_bad_merge_base();
856 } else if (0 <= oid_array_lookup(&good_revs
, mb
)) {
858 } else if (0 <= oid_array_lookup(&skipped_revs
, mb
)) {
859 handle_skipped_merge_base(mb
);
861 printf(_("Bisecting: a merge base must be tested\n"));
862 res
= bisect_checkout(mb
, no_checkout
);
864 /* indicate early success */
865 res
= BISECT_INTERNAL_SUCCESS_MERGE_BASE
;
870 free_commit_list(result
);
874 static int check_ancestors(struct repository
*r
, int rev_nr
,
875 struct commit
**rev
, const char *prefix
)
877 struct strvec rev_argv
= STRVEC_INIT
;
878 struct rev_info revs
;
881 bisect_rev_setup(r
, &revs
, &rev_argv
, prefix
, "^%s", "%s", 0);
883 bisect_common(&revs
);
884 res
= (revs
.commits
!= NULL
);
886 /* Clean up objects used, as they will be reused. */
887 clear_commit_marks_many(rev_nr
, rev
, ALL_REV_FLAGS
);
889 release_revisions(&revs
);
890 strvec_clear(&rev_argv
);
895 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
896 * ancestor of the "bad" rev.
898 * If that's not the case, we need to check the merge bases.
899 * If a merge base must be tested by the user, its source code will be
900 * checked out to be tested by the user and we will return.
903 static enum bisect_error
check_good_are_ancestors_of_bad(struct repository
*r
,
910 enum bisect_error res
= BISECT_OK
;
913 if (!current_bad_oid
)
914 return error(_("a %s revision is needed"), term_bad
);
916 filename
= git_pathdup("BISECT_ANCESTORS_OK");
918 /* Check if file BISECT_ANCESTORS_OK exists. */
919 if (!stat(filename
, &st
) && S_ISREG(st
.st_mode
))
922 /* Bisecting with no good rev is ok. */
926 /* Check if all good revs are ancestor of the bad rev. */
928 rev
= get_bad_and_good_commits(r
, &rev_nr
);
929 if (check_ancestors(r
, rev_nr
, rev
, prefix
))
930 res
= check_merge_bases(rev_nr
, rev
, no_checkout
);
934 /* Create file BISECT_ANCESTORS_OK. */
935 fd
= open(filename
, O_CREAT
| O_TRUNC
| O_WRONLY
, 0600);
938 * BISECT_ANCESTORS_OK file is not absolutely necessary,
939 * the bisection process will continue at the next
941 * So, just signal with a warning that something
944 warning_errno(_("could not create file '%s'"),
955 * Display a commit summary to the user.
957 static void show_commit(struct commit
*commit
)
959 struct child_process show
= CHILD_PROCESS_INIT
;
962 * Call git show with --no-pager, as it would otherwise
963 * paginate the "git show" output only, not the output
964 * from bisect_next_all(); this can be fixed by moving
965 * it into a --format parameter, but that would override
966 * the user's default options for "git show", which we
967 * are trying to honour.
969 strvec_pushl(&show
.args
,
974 "--no-abbrev-commit",
975 "--diff-merges=first-parent",
976 oid_to_hex(&commit
->object
.oid
), NULL
);
978 if (run_command(&show
))
979 die(_("unable to start 'show' for object '%s'"),
980 oid_to_hex(&commit
->object
.oid
));
984 * The terms used for this bisect session are stored in BISECT_TERMS.
985 * We read them and store them to adapt the messages accordingly.
986 * Default is bad/good.
988 void read_bisect_terms(const char **read_bad
, const char **read_good
)
990 struct strbuf str
= STRBUF_INIT
;
991 const char *filename
= git_path_bisect_terms();
992 FILE *fp
= fopen(filename
, "r");
995 if (errno
== ENOENT
) {
1000 die_errno(_("could not read file '%s'"), filename
);
1003 strbuf_getline_lf(&str
, fp
);
1004 *read_bad
= strbuf_detach(&str
, NULL
);
1005 strbuf_getline_lf(&str
, fp
);
1006 *read_good
= strbuf_detach(&str
, NULL
);
1008 strbuf_release(&str
);
1013 * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
1014 * the bisection process finished successfully.
1015 * In this case the calling function or command should not turn a
1016 * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
1018 * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
1019 * in bisect_helper::bisect_next() and only transforming it to 0 at
1020 * the end of bisect_helper::cmd_bisect__helper() helps bypassing
1021 * all the code related to finding a commit to test.
1023 enum bisect_error
bisect_next_all(struct repository
*r
, const char *prefix
)
1025 struct strvec rev_argv
= STRVEC_INIT
;
1026 struct rev_info revs
= REV_INFO_INIT
;
1027 struct commit_list
*tried
;
1028 int reaches
= 0, all
= 0, nr
, steps
;
1029 enum bisect_error res
= BISECT_OK
;
1030 struct object_id
*bisect_rev
;
1033 * If no_checkout is non-zero, the bisection process does not
1034 * checkout the trial commit but instead simply updates BISECT_HEAD.
1036 int no_checkout
= refs_ref_exists(get_main_ref_store(the_repository
),
1038 unsigned bisect_flags
= 0;
1040 read_bisect_terms(&term_bad
, &term_good
);
1041 if (read_bisect_refs())
1042 die(_("reading bisect refs failed"));
1044 if (file_exists(git_path_bisect_first_parent()))
1045 bisect_flags
|= FIND_BISECTION_FIRST_PARENT_ONLY
;
1047 if (skipped_revs
.nr
)
1048 bisect_flags
|= FIND_BISECTION_ALL
;
1050 res
= check_good_are_ancestors_of_bad(r
, prefix
, no_checkout
);
1054 bisect_rev_setup(r
, &revs
, &rev_argv
, prefix
, "%s", "^%s", 1);
1056 revs
.first_parent_only
= !!(bisect_flags
& FIND_BISECTION_FIRST_PARENT_ONLY
);
1059 bisect_common(&revs
);
1061 find_bisection(&revs
.commits
, &reaches
, &all
, bisect_flags
);
1062 revs
.commits
= managed_skipped(revs
.commits
, &tried
);
1064 if (!revs
.commits
) {
1066 * We should return error here only if the "bad"
1067 * commit is also a "skip" commit.
1069 res
= error_if_skipped_commits(tried
, NULL
);
1072 printf(_("%s was both %s and %s\n"),
1073 oid_to_hex(current_bad_oid
),
1077 res
= BISECT_FAILED
;
1082 fprintf(stderr
, _("No testable commit found.\n"
1083 "Maybe you started with bad path arguments?\n"));
1085 res
= BISECT_NO_TESTABLE_COMMIT
;
1089 bisect_rev
= &revs
.commits
->item
->object
.oid
;
1091 if (oideq(bisect_rev
, current_bad_oid
)) {
1092 res
= error_if_skipped_commits(tried
, current_bad_oid
);
1095 printf("%s is the first %s commit\n", oid_to_hex(bisect_rev
),
1098 show_commit(revs
.commits
->item
);
1100 * This means the bisection process succeeded.
1101 * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
1102 * so that the call chain can simply check
1103 * for negative return values for early returns up
1104 * until the cmd_bisect__helper() caller.
1106 res
= BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
;
1110 nr
= all
- reaches
- 1;
1111 steps
= estimate_bisect_steps(all
);
1113 steps_msg
= xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
1116 * TRANSLATORS: the last %s will be replaced with "(roughly %d
1117 * steps)" translation.
1119 printf(Q_("Bisecting: %d revision left to test after this %s\n",
1120 "Bisecting: %d revisions left to test after this %s\n",
1121 nr
), nr
, steps_msg
);
1123 /* Clean up objects used, as they will be reused. */
1124 repo_clear_commit_marks(r
, ALL_REV_FLAGS
);
1126 res
= bisect_checkout(bisect_rev
, no_checkout
);
1128 release_revisions(&revs
);
1129 strvec_clear(&rev_argv
);
1133 static inline int log2i(int n
)
1137 for (; n
> 1; n
>>= 1)
1143 static inline int exp2i(int n
)
1149 * Estimate the number of bisect steps left (after the current step)
1151 * For any x between 0 included and 2^n excluded, the probability for
1152 * n - 1 steps left looks like:
1154 * P(2^n + x) == (2^n - x) / (2^n + x)
1156 * and P(2^n + x) < 0.5 means 2^n < 3x
1158 int estimate_bisect_steps(int all
)
1169 return (e
< 3 * x
) ? n
: n
- 1;
1172 static int mark_for_removal(const char *refname
,
1173 const struct object_id
*oid UNUSED
,
1174 int flag UNUSED
, void *cb_data
)
1176 struct string_list
*refs
= cb_data
;
1177 char *ref
= xstrfmt("refs/bisect%s", refname
);
1178 string_list_append(refs
, ref
);
1182 int bisect_clean_state(void)
1186 /* There may be some refs packed during bisection */
1187 struct string_list refs_for_removal
= STRING_LIST_INIT_NODUP
;
1188 refs_for_each_ref_in(get_main_ref_store(the_repository
),
1189 "refs/bisect", mark_for_removal
,
1190 (void *) &refs_for_removal
);
1191 string_list_append(&refs_for_removal
, xstrdup("BISECT_HEAD"));
1192 string_list_append(&refs_for_removal
, xstrdup("BISECT_EXPECTED_REV"));
1193 result
= refs_delete_refs(get_main_ref_store(the_repository
),
1194 "bisect: remove", &refs_for_removal
,
1196 refs_for_removal
.strdup_strings
= 1;
1197 string_list_clear(&refs_for_removal
, 0);
1198 unlink_or_warn(git_path_bisect_ancestors_ok());
1199 unlink_or_warn(git_path_bisect_log());
1200 unlink_or_warn(git_path_bisect_names());
1201 unlink_or_warn(git_path_bisect_run());
1202 unlink_or_warn(git_path_bisect_terms());
1203 unlink_or_warn(git_path_bisect_first_parent());
1205 * Cleanup BISECT_START last to support the --no-checkout option
1206 * introduced in the commit 4796e823a.
1208 unlink_or_warn(git_path_bisect_start());