]>
Commit | Line | Data |
---|---|---|
a2ad79ce | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
a2ad79ce CC |
3 | #include "commit.h" |
4 | #include "diff.h" | |
5 | #include "revision.h" | |
1bf072e3 CC |
6 | #include "refs.h" |
7 | #include "list-objects.h" | |
3b437b0d | 8 | #include "quote.h" |
4eb5b646 | 9 | #include "sha1-lookup.h" |
ef24c7ca | 10 | #include "run-command.h" |
e22278c0 | 11 | #include "log-tree.h" |
a2ad79ce | 12 | #include "bisect.h" |
902bb364 | 13 | #include "sha1-array.h" |
8a534b61 | 14 | #include "argv-array.h" |
bb408ac9 | 15 | #include "commit-slab.h" |
64043556 | 16 | #include "commit-reach.h" |
b0eb92bb | 17 | #include "object-store.h" |
6212b1aa | 18 | |
910650d2 | 19 | static struct oid_array good_revs; |
20 | static struct oid_array skipped_revs; | |
1bf072e3 | 21 | |
3c5ff995 | 22 | static struct object_id *current_bad_oid; |
ef24c7ca | 23 | |
ef24c7ca CC |
24 | static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; |
25 | static const char *argv_show_branch[] = {"show-branch", NULL, NULL}; | |
26 | ||
43f9d9f3 AD |
27 | static const char *term_bad; |
28 | static const char *term_good; | |
29 | ||
208acbfb | 30 | /* Remember to update object flag allocation in object.h */ |
a2ad79ce CC |
31 | #define COUNTED (1u<<16) |
32 | ||
33 | /* | |
34 | * This is a truly stupid algorithm, but it's only | |
35 | * used for bisection, and we just don't care enough. | |
36 | * | |
37 | * We care just barely enough to avoid recursing for | |
38 | * non-merge entries. | |
39 | */ | |
40 | static int count_distance(struct commit_list *entry) | |
41 | { | |
42 | int nr = 0; | |
43 | ||
44 | while (entry) { | |
45 | struct commit *commit = entry->item; | |
46 | struct commit_list *p; | |
47 | ||
48 | if (commit->object.flags & (UNINTERESTING | COUNTED)) | |
49 | break; | |
50 | if (!(commit->object.flags & TREESAME)) | |
51 | nr++; | |
52 | commit->object.flags |= COUNTED; | |
53 | p = commit->parents; | |
54 | entry = p; | |
55 | if (p) { | |
56 | p = p->next; | |
57 | while (p) { | |
58 | nr += count_distance(p); | |
59 | p = p->next; | |
60 | } | |
61 | } | |
62 | } | |
63 | ||
64 | return nr; | |
65 | } | |
66 | ||
67 | static void clear_distance(struct commit_list *list) | |
68 | { | |
69 | while (list) { | |
70 | struct commit *commit = list->item; | |
71 | commit->object.flags &= ~COUNTED; | |
72 | list = list->next; | |
73 | } | |
74 | } | |
75 | ||
bb408ac9 NTND |
76 | define_commit_slab(commit_weight, int *); |
77 | static struct commit_weight commit_weight; | |
78 | ||
a2ad79ce CC |
79 | #define DEBUG_BISECT 0 |
80 | ||
81 | static inline int weight(struct commit_list *elem) | |
82 | { | |
bb408ac9 | 83 | return **commit_weight_at(&commit_weight, elem->item); |
a2ad79ce CC |
84 | } |
85 | ||
86 | static inline void weight_set(struct commit_list *elem, int weight) | |
87 | { | |
bb408ac9 | 88 | **commit_weight_at(&commit_weight, elem->item) = weight; |
a2ad79ce CC |
89 | } |
90 | ||
91 | static int count_interesting_parents(struct commit *commit) | |
92 | { | |
93 | struct commit_list *p; | |
94 | int count; | |
95 | ||
96 | for (count = 0, p = commit->parents; p; p = p->next) { | |
97 | if (p->item->object.flags & UNINTERESTING) | |
98 | continue; | |
99 | count++; | |
100 | } | |
101 | return count; | |
102 | } | |
103 | ||
104 | static inline int halfway(struct commit_list *p, int nr) | |
105 | { | |
106 | /* | |
107 | * Don't short-cut something we are not going to return! | |
108 | */ | |
109 | if (p->item->object.flags & TREESAME) | |
110 | return 0; | |
111 | if (DEBUG_BISECT) | |
112 | return 0; | |
113 | /* | |
114 | * 2 and 3 are halfway of 5. | |
115 | * 3 is halfway of 6 but 2 and 4 are not. | |
116 | */ | |
117 | switch (2 * weight(p) - nr) { | |
118 | case -1: case 0: case 1: | |
119 | return 1; | |
120 | default: | |
121 | return 0; | |
122 | } | |
123 | } | |
124 | ||
a2ad79ce CC |
125 | static void show_list(const char *debug, int counted, int nr, |
126 | struct commit_list *list) | |
127 | { | |
128 | struct commit_list *p; | |
129 | ||
b0eb92bb NTND |
130 | if (!DEBUG_BISECT) |
131 | return; | |
132 | ||
a2ad79ce CC |
133 | fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr); |
134 | ||
135 | for (p = list; p; p = p->next) { | |
136 | struct commit_list *pp; | |
137 | struct commit *commit = p->item; | |
138 | unsigned flags = commit->object.flags; | |
139 | enum object_type type; | |
140 | unsigned long size; | |
b4f5aca4 | 141 | char *buf = read_object_file(&commit->object.oid, &type, |
142 | &size); | |
56ff3794 CC |
143 | const char *subject_start; |
144 | int subject_len; | |
a2ad79ce CC |
145 | |
146 | fprintf(stderr, "%c%c%c ", | |
147 | (flags & TREESAME) ? ' ' : 'T', | |
148 | (flags & UNINTERESTING) ? 'U' : ' ', | |
149 | (flags & COUNTED) ? 'C' : ' '); | |
b0eb92bb | 150 | if (*commit_weight_at(&commit_weight, p->item)) |
a2ad79ce CC |
151 | fprintf(stderr, "%3d", weight(p)); |
152 | else | |
153 | fprintf(stderr, "---"); | |
14ced556 | 154 | fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid)); |
a2ad79ce CC |
155 | for (pp = commit->parents; pp; pp = pp->next) |
156 | fprintf(stderr, " %.*s", 8, | |
14ced556 | 157 | oid_to_hex(&pp->item->object.oid)); |
a2ad79ce | 158 | |
56ff3794 CC |
159 | subject_len = find_commit_subject(buf, &subject_start); |
160 | if (subject_len) | |
161 | fprintf(stderr, " %.*s", subject_len, subject_start); | |
a2ad79ce CC |
162 | fprintf(stderr, "\n"); |
163 | } | |
164 | } | |
a2ad79ce CC |
165 | |
166 | static struct commit_list *best_bisection(struct commit_list *list, int nr) | |
167 | { | |
168 | struct commit_list *p, *best; | |
169 | int best_distance = -1; | |
170 | ||
171 | best = list; | |
172 | for (p = list; p; p = p->next) { | |
173 | int distance; | |
174 | unsigned flags = p->item->object.flags; | |
175 | ||
176 | if (flags & TREESAME) | |
177 | continue; | |
178 | distance = weight(p); | |
179 | if (nr - distance < distance) | |
180 | distance = nr - distance; | |
181 | if (distance > best_distance) { | |
182 | best = p; | |
183 | best_distance = distance; | |
184 | } | |
185 | } | |
186 | ||
187 | return best; | |
188 | } | |
189 | ||
190 | struct commit_dist { | |
191 | struct commit *commit; | |
192 | int distance; | |
193 | }; | |
194 | ||
195 | static int compare_commit_dist(const void *a_, const void *b_) | |
196 | { | |
197 | struct commit_dist *a, *b; | |
198 | ||
199 | a = (struct commit_dist *)a_; | |
200 | b = (struct commit_dist *)b_; | |
201 | if (a->distance != b->distance) | |
202 | return b->distance - a->distance; /* desc sort */ | |
f2fd0760 | 203 | return oidcmp(&a->commit->object.oid, &b->commit->object.oid); |
a2ad79ce CC |
204 | } |
205 | ||
206 | static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr) | |
207 | { | |
208 | struct commit_list *p; | |
209 | struct commit_dist *array = xcalloc(nr, sizeof(*array)); | |
5b1ef2ce | 210 | struct strbuf buf = STRBUF_INIT; |
a2ad79ce CC |
211 | int cnt, i; |
212 | ||
213 | for (p = list, cnt = 0; p; p = p->next) { | |
214 | int distance; | |
215 | unsigned flags = p->item->object.flags; | |
216 | ||
217 | if (flags & TREESAME) | |
218 | continue; | |
219 | distance = weight(p); | |
220 | if (nr - distance < distance) | |
221 | distance = nr - distance; | |
222 | array[cnt].commit = p->item; | |
223 | array[cnt].distance = distance; | |
224 | cnt++; | |
225 | } | |
9ed0d8d6 | 226 | QSORT(array, cnt, compare_commit_dist); |
a2ad79ce | 227 | for (p = list, i = 0; i < cnt; i++) { |
a2ad79ce CC |
228 | struct object *obj = &(array[i].commit->object); |
229 | ||
5b1ef2ce JK |
230 | strbuf_reset(&buf); |
231 | strbuf_addf(&buf, "dist=%d", array[i].distance); | |
232 | add_name_decoration(DECORATION_NONE, buf.buf, obj); | |
662174d2 | 233 | |
a2ad79ce | 234 | p->item = array[i].commit; |
7c117184 MÅ |
235 | if (i < cnt - 1) |
236 | p = p->next; | |
a2ad79ce | 237 | } |
2e9fdc79 ÆAB |
238 | if (p) { |
239 | free_commit_list(p->next); | |
240 | p->next = NULL; | |
241 | } | |
5b1ef2ce | 242 | strbuf_release(&buf); |
a2ad79ce CC |
243 | free(array); |
244 | return list; | |
245 | } | |
246 | ||
247 | /* | |
248 | * zero or positive weight is the number of interesting commits it can | |
249 | * reach, including itself. Especially, weight = 0 means it does not | |
250 | * reach any tree-changing commits (e.g. just above uninteresting one | |
251 | * but traversal is with pathspec). | |
252 | * | |
253 | * weight = -1 means it has one parent and its distance is yet to | |
254 | * be computed. | |
255 | * | |
256 | * weight = -2 means it has more than one parent and its distance is | |
257 | * unknown. After running count_distance() first, they will get zero | |
258 | * or positive distance. | |
259 | */ | |
260 | static struct commit_list *do_find_bisection(struct commit_list *list, | |
261 | int nr, int *weights, | |
262 | int find_all) | |
263 | { | |
264 | int n, counted; | |
265 | struct commit_list *p; | |
266 | ||
267 | counted = 0; | |
268 | ||
269 | for (n = 0, p = list; p; p = p->next) { | |
270 | struct commit *commit = p->item; | |
271 | unsigned flags = commit->object.flags; | |
272 | ||
bb408ac9 | 273 | *commit_weight_at(&commit_weight, p->item) = &weights[n++]; |
a2ad79ce CC |
274 | switch (count_interesting_parents(commit)) { |
275 | case 0: | |
276 | if (!(flags & TREESAME)) { | |
277 | weight_set(p, 1); | |
278 | counted++; | |
279 | show_list("bisection 2 count one", | |
280 | counted, nr, list); | |
281 | } | |
282 | /* | |
283 | * otherwise, it is known not to reach any | |
284 | * tree-changing commit and gets weight 0. | |
285 | */ | |
286 | break; | |
287 | case 1: | |
288 | weight_set(p, -1); | |
289 | break; | |
290 | default: | |
291 | weight_set(p, -2); | |
292 | break; | |
293 | } | |
294 | } | |
295 | ||
296 | show_list("bisection 2 initialize", counted, nr, list); | |
297 | ||
298 | /* | |
299 | * If you have only one parent in the resulting set | |
300 | * then you can reach one commit more than that parent | |
301 | * can reach. So we do not have to run the expensive | |
302 | * count_distance() for single strand of pearls. | |
303 | * | |
304 | * However, if you have more than one parents, you cannot | |
305 | * just add their distance and one for yourself, since | |
306 | * they usually reach the same ancestor and you would | |
307 | * end up counting them twice that way. | |
308 | * | |
309 | * So we will first count distance of merges the usual | |
310 | * way, and then fill the blanks using cheaper algorithm. | |
311 | */ | |
312 | for (p = list; p; p = p->next) { | |
313 | if (p->item->object.flags & UNINTERESTING) | |
314 | continue; | |
315 | if (weight(p) != -2) | |
316 | continue; | |
317 | weight_set(p, count_distance(p)); | |
318 | clear_distance(list); | |
319 | ||
320 | /* Does it happen to be at exactly half-way? */ | |
321 | if (!find_all && halfway(p, nr)) | |
322 | return p; | |
323 | counted++; | |
324 | } | |
325 | ||
326 | show_list("bisection 2 count_distance", counted, nr, list); | |
327 | ||
328 | while (counted < nr) { | |
329 | for (p = list; p; p = p->next) { | |
330 | struct commit_list *q; | |
331 | unsigned flags = p->item->object.flags; | |
332 | ||
333 | if (0 <= weight(p)) | |
334 | continue; | |
335 | for (q = p->item->parents; q; q = q->next) { | |
336 | if (q->item->object.flags & UNINTERESTING) | |
337 | continue; | |
338 | if (0 <= weight(q)) | |
339 | break; | |
340 | } | |
341 | if (!q) | |
342 | continue; | |
343 | ||
344 | /* | |
345 | * weight for p is unknown but q is known. | |
346 | * add one for p itself if p is to be counted, | |
347 | * otherwise inherit it from q directly. | |
348 | */ | |
349 | if (!(flags & TREESAME)) { | |
350 | weight_set(p, weight(q)+1); | |
351 | counted++; | |
352 | show_list("bisection 2 count one", | |
353 | counted, nr, list); | |
354 | } | |
355 | else | |
356 | weight_set(p, weight(q)); | |
357 | ||
358 | /* Does it happen to be at exactly half-way? */ | |
359 | if (!find_all && halfway(p, nr)) | |
360 | return p; | |
361 | } | |
362 | } | |
363 | ||
364 | show_list("bisection 2 counted all", counted, nr, list); | |
365 | ||
366 | if (!find_all) | |
367 | return best_bisection(list, nr); | |
368 | else | |
369 | return best_bisection_sorted(list, nr); | |
370 | } | |
371 | ||
24d707f6 MÅ |
372 | void find_bisection(struct commit_list **commit_list, int *reaches, |
373 | int *all, int find_all) | |
a2ad79ce CC |
374 | { |
375 | int nr, on_list; | |
24d707f6 | 376 | struct commit_list *list, *p, *best, *next, *last; |
a2ad79ce CC |
377 | int *weights; |
378 | ||
24d707f6 | 379 | show_list("bisection 2 entry", 0, 0, *commit_list); |
bb408ac9 | 380 | init_commit_weight(&commit_weight); |
a2ad79ce CC |
381 | |
382 | /* | |
383 | * Count the number of total and tree-changing items on the | |
384 | * list, while reversing the list. | |
385 | */ | |
24d707f6 | 386 | for (nr = on_list = 0, last = NULL, p = *commit_list; |
a2ad79ce CC |
387 | p; |
388 | p = next) { | |
389 | unsigned flags = p->item->object.flags; | |
390 | ||
391 | next = p->next; | |
fc5c40bb MÅ |
392 | if (flags & UNINTERESTING) { |
393 | free(p); | |
a2ad79ce | 394 | continue; |
fc5c40bb | 395 | } |
a2ad79ce CC |
396 | p->next = last; |
397 | last = p; | |
398 | if (!(flags & TREESAME)) | |
399 | nr++; | |
400 | on_list++; | |
401 | } | |
402 | list = last; | |
403 | show_list("bisection 2 sorted", 0, nr, list); | |
404 | ||
405 | *all = nr; | |
406 | weights = xcalloc(on_list, sizeof(*weights)); | |
407 | ||
408 | /* Do the real work of finding bisection commit. */ | |
409 | best = do_find_bisection(list, nr, weights, find_all); | |
410 | if (best) { | |
f4e45cb3 MÅ |
411 | if (!find_all) { |
412 | list->item = best->item; | |
413 | free_commit_list(list->next); | |
414 | best = list; | |
a2ad79ce | 415 | best->next = NULL; |
f4e45cb3 | 416 | } |
a2ad79ce CC |
417 | *reaches = weight(best); |
418 | } | |
419 | free(weights); | |
24d707f6 | 420 | *commit_list = best; |
bb408ac9 | 421 | clear_commit_weight(&commit_weight); |
a2ad79ce CC |
422 | } |
423 | ||
eed25148 | 424 | static int register_ref(const char *refname, const struct object_id *oid, |
1bf072e3 CC |
425 | int flags, void *cb_data) |
426 | { | |
43f9d9f3 AD |
427 | struct strbuf good_prefix = STRBUF_INIT; |
428 | strbuf_addstr(&good_prefix, term_good); | |
429 | strbuf_addstr(&good_prefix, "-"); | |
430 | ||
431 | if (!strcmp(refname, term_bad)) { | |
3c5ff995 | 432 | current_bad_oid = xmalloc(sizeof(*current_bad_oid)); |
eed25148 | 433 | oidcpy(current_bad_oid, oid); |
43f9d9f3 | 434 | } else if (starts_with(refname, good_prefix.buf)) { |
910650d2 | 435 | oid_array_append(&good_revs, oid); |
59556548 | 436 | } else if (starts_with(refname, "skip-")) { |
910650d2 | 437 | oid_array_append(&skipped_revs, oid); |
1bf072e3 CC |
438 | } |
439 | ||
43f9d9f3 AD |
440 | strbuf_release(&good_prefix); |
441 | ||
1bf072e3 CC |
442 | return 0; |
443 | } | |
444 | ||
445 | static int read_bisect_refs(void) | |
446 | { | |
eed25148 | 447 | return for_each_ref_in("refs/bisect/", register_ref, NULL); |
1bf072e3 CC |
448 | } |
449 | ||
f932729c JK |
450 | static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") |
451 | static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV") | |
fb71a329 PB |
452 | static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK") |
453 | static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") | |
454 | static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START") | |
455 | static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") | |
f5d284f6 | 456 | static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") |
fb71a329 | 457 | static GIT_PATH_FUNC(git_path_head_name, "head-name") |
f932729c | 458 | |
2af202be | 459 | static void read_bisect_paths(struct argv_array *array) |
3b437b0d CC |
460 | { |
461 | struct strbuf str = STRBUF_INIT; | |
f932729c | 462 | const char *filename = git_path_bisect_names(); |
23a9e071 | 463 | FILE *fp = xfopen(filename, "r"); |
3b437b0d | 464 | |
8f309aeb | 465 | while (strbuf_getline_lf(&str, fp) != EOF) { |
3b437b0d | 466 | strbuf_trim(&str); |
8a534b61 | 467 | if (sq_dequote_to_argv_array(str.buf, array)) |
14dc4899 | 468 | die(_("Badly quoted content in file '%s': %s"), |
8a534b61 | 469 | filename, str.buf); |
3b437b0d CC |
470 | } |
471 | ||
472 | strbuf_release(&str); | |
473 | fclose(fp); | |
474 | } | |
475 | ||
910650d2 | 476 | static char *join_sha1_array_hex(struct oid_array *array, char delim) |
c0537662 CC |
477 | { |
478 | struct strbuf joined_hexs = STRBUF_INIT; | |
479 | int i; | |
480 | ||
902bb364 | 481 | for (i = 0; i < array->nr; i++) { |
ee3051bd | 482 | strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i)); |
902bb364 | 483 | if (i + 1 < array->nr) |
c0537662 CC |
484 | strbuf_addch(&joined_hexs, delim); |
485 | } | |
486 | ||
487 | return strbuf_detach(&joined_hexs, NULL); | |
488 | } | |
489 | ||
9af3589e CC |
490 | /* |
491 | * In this function, passing a not NULL skipped_first is very special. | |
492 | * It means that we want to know if the first commit in the list is | |
493 | * skipped because we will want to test a commit away from it if it is | |
494 | * indeed skipped. | |
495 | * So if the first commit is skipped, we cannot take the shortcut to | |
496 | * just "return list" when we find the first non skipped commit, we | |
497 | * have to return a fully filtered list. | |
498 | * | |
499 | * We use (*skipped_first == -1) to mean "it has been found that the | |
500 | * first commit is not skipped". In this case *skipped_first is set back | |
501 | * to 0 just before the function returns. | |
502 | */ | |
95188648 CC |
503 | struct commit_list *filter_skipped(struct commit_list *list, |
504 | struct commit_list **tried, | |
9af3589e CC |
505 | int show_all, |
506 | int *count, | |
507 | int *skipped_first) | |
95188648 CC |
508 | { |
509 | struct commit_list *filtered = NULL, **f = &filtered; | |
510 | ||
511 | *tried = NULL; | |
512 | ||
9af3589e CC |
513 | if (skipped_first) |
514 | *skipped_first = 0; | |
515 | if (count) | |
516 | *count = 0; | |
517 | ||
902bb364 | 518 | if (!skipped_revs.nr) |
95188648 CC |
519 | return list; |
520 | ||
95188648 CC |
521 | while (list) { |
522 | struct commit_list *next = list->next; | |
523 | list->next = NULL; | |
910650d2 | 524 | if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) { |
9af3589e CC |
525 | if (skipped_first && !*skipped_first) |
526 | *skipped_first = 1; | |
95188648 CC |
527 | /* Move current to tried list */ |
528 | *tried = list; | |
529 | tried = &list->next; | |
530 | } else { | |
9af3589e CC |
531 | if (!show_all) { |
532 | if (!skipped_first || !*skipped_first) | |
533 | return list; | |
534 | } else if (skipped_first && !*skipped_first) { | |
535 | /* This means we know it's not skipped */ | |
536 | *skipped_first = -1; | |
537 | } | |
95188648 CC |
538 | /* Move current to filtered list */ |
539 | *f = list; | |
540 | f = &list->next; | |
9af3589e CC |
541 | if (count) |
542 | (*count)++; | |
95188648 CC |
543 | } |
544 | list = next; | |
545 | } | |
546 | ||
9af3589e CC |
547 | if (skipped_first && *skipped_first == -1) |
548 | *skipped_first = 0; | |
549 | ||
95188648 CC |
550 | return filtered; |
551 | } | |
1bf072e3 | 552 | |
ebc9529f CC |
553 | #define PRN_MODULO 32768 |
554 | ||
555 | /* | |
556 | * This is a pseudo random number generator based on "man 3 rand". | |
557 | * It is not used properly because the seed is the argument and it | |
558 | * is increased by one between each call, but that should not matter | |
559 | * for this application. | |
560 | */ | |
3b335762 NTND |
561 | static unsigned get_prn(unsigned count) |
562 | { | |
ebc9529f | 563 | count = count * 1103515245 + 12345; |
7b96d888 | 564 | return (count/65536) % PRN_MODULO; |
ebc9529f CC |
565 | } |
566 | ||
567 | /* | |
568 | * Custom integer square root from | |
5e68729f | 569 | * https://en.wikipedia.org/wiki/Integer_square_root |
ebc9529f CC |
570 | */ |
571 | static int sqrti(int val) | |
572 | { | |
573 | float d, x = val; | |
574 | ||
b8e3b2f3 | 575 | if (!val) |
ebc9529f CC |
576 | return 0; |
577 | ||
578 | do { | |
579 | float y = (x + (float)val / x) / 2; | |
580 | d = (y > x) ? y - x : x - y; | |
581 | x = y; | |
582 | } while (d >= 0.5); | |
583 | ||
584 | return (int)x; | |
585 | } | |
586 | ||
587 | static struct commit_list *skip_away(struct commit_list *list, int count) | |
62d0b0da | 588 | { |
62d0b0da | 589 | struct commit_list *cur, *previous; |
ebc9529f CC |
590 | int prn, index, i; |
591 | ||
592 | prn = get_prn(count); | |
593 | index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO); | |
62d0b0da CC |
594 | |
595 | cur = list; | |
596 | previous = NULL; | |
62d0b0da CC |
597 | |
598 | for (i = 0; cur; cur = cur->next, i++) { | |
599 | if (i == index) { | |
9001dc2a | 600 | if (!oideq(&cur->item->object.oid, current_bad_oid)) |
62d0b0da CC |
601 | return cur; |
602 | if (previous) | |
603 | return previous; | |
604 | return list; | |
605 | } | |
606 | previous = cur; | |
607 | } | |
608 | ||
609 | return list; | |
610 | } | |
611 | ||
612 | static struct commit_list *managed_skipped(struct commit_list *list, | |
613 | struct commit_list **tried) | |
614 | { | |
615 | int count, skipped_first; | |
62d0b0da CC |
616 | |
617 | *tried = NULL; | |
618 | ||
902bb364 | 619 | if (!skipped_revs.nr) |
62d0b0da CC |
620 | return list; |
621 | ||
622 | list = filter_skipped(list, tried, 0, &count, &skipped_first); | |
623 | ||
624 | if (!skipped_first) | |
625 | return list; | |
626 | ||
ebc9529f | 627 | return skip_away(list, count); |
62d0b0da CC |
628 | } |
629 | ||
69d2cfe6 NTND |
630 | static void bisect_rev_setup(struct repository *r, struct rev_info *revs, |
631 | const char *prefix, | |
a22347c6 CC |
632 | const char *bad_format, const char *good_format, |
633 | int read_paths) | |
1bf072e3 | 634 | { |
8a534b61 | 635 | struct argv_array rev_argv = ARGV_ARRAY_INIT; |
fad2d31d CC |
636 | int i; |
637 | ||
69d2cfe6 | 638 | repo_init_revisions(r, revs, prefix); |
3b437b0d CC |
639 | revs->abbrev = 0; |
640 | revs->commit_format = CMIT_FMT_UNSPECIFIED; | |
1bf072e3 | 641 | |
1c953a1f | 642 | /* rev_argv.argv[0] will be ignored by setup_revisions */ |
8a534b61 | 643 | argv_array_push(&rev_argv, "bisect_rev_setup"); |
3c5ff995 | 644 | argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid)); |
902bb364 | 645 | for (i = 0; i < good_revs.nr; i++) |
8a534b61 | 646 | argv_array_pushf(&rev_argv, good_format, |
ee3051bd | 647 | oid_to_hex(good_revs.oid + i)); |
8a534b61 | 648 | argv_array_push(&rev_argv, "--"); |
a22347c6 CC |
649 | if (read_paths) |
650 | read_bisect_paths(&rev_argv); | |
3b437b0d | 651 | |
8a534b61 JK |
652 | setup_revisions(rev_argv.argc, rev_argv.argv, revs, NULL); |
653 | /* XXX leak rev_argv, as "revs" may still be pointing to it */ | |
3b437b0d CC |
654 | } |
655 | ||
a22347c6 | 656 | static void bisect_common(struct rev_info *revs) |
2ace9727 | 657 | { |
2ace9727 CC |
658 | if (prepare_revision_walk(revs)) |
659 | die("revision walk setup failed"); | |
660 | if (revs->tree_objects) | |
4f6d26b1 | 661 | mark_edges_uninteresting(revs, NULL, 0); |
2ace9727 CC |
662 | } |
663 | ||
ce58b5d8 | 664 | static enum bisect_error error_if_skipped_commits(struct commit_list *tried, |
3c5ff995 | 665 | const struct object_id *bad) |
ef24c7ca CC |
666 | { |
667 | if (!tried) | |
ce58b5d8 | 668 | return BISECT_OK; |
ef24c7ca CC |
669 | |
670 | printf("There are only 'skip'ped commits left to test.\n" | |
43f9d9f3 | 671 | "The first %s commit could be any of:\n", term_bad); |
54307ea7 JH |
672 | |
673 | for ( ; tried; tried = tried->next) | |
674 | printf("%s\n", oid_to_hex(&tried->item->object.oid)); | |
675 | ||
ef24c7ca | 676 | if (bad) |
3c5ff995 | 677 | printf("%s\n", oid_to_hex(bad)); |
14dc4899 | 678 | printf(_("We cannot bisect more!\n")); |
ce58b5d8 PB |
679 | |
680 | return BISECT_ONLY_SKIPPED_LEFT; | |
ef24c7ca CC |
681 | } |
682 | ||
3c5ff995 | 683 | static int is_expected_rev(const struct object_id *oid) |
c0537662 | 684 | { |
f932729c | 685 | const char *filename = git_path_bisect_expected_rev(); |
c0537662 CC |
686 | struct stat st; |
687 | struct strbuf str = STRBUF_INIT; | |
688 | FILE *fp; | |
689 | int res = 0; | |
690 | ||
691 | if (stat(filename, &st) || !S_ISREG(st.st_mode)) | |
692 | return 0; | |
693 | ||
e9d983f1 | 694 | fp = fopen_or_warn(filename, "r"); |
c0537662 CC |
695 | if (!fp) |
696 | return 0; | |
697 | ||
8f309aeb | 698 | if (strbuf_getline_lf(&str, fp) != EOF) |
3c5ff995 | 699 | res = !strcmp(str.buf, oid_to_hex(oid)); |
c0537662 CC |
700 | |
701 | strbuf_release(&str); | |
702 | fclose(fp); | |
703 | ||
704 | return res; | |
705 | } | |
706 | ||
e8e3ce67 | 707 | static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout) |
ef24c7ca | 708 | { |
dc01505f | 709 | char bisect_rev_hex[GIT_MAX_HEXSZ + 1]; |
e8e3ce67 | 710 | enum bisect_error res = BISECT_OK; |
ef24c7ca | 711 | |
95518faa | 712 | memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1); |
ae077771 | 713 | update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); |
ef24c7ca CC |
714 | |
715 | argv_checkout[2] = bisect_rev_hex; | |
fee92fc1 | 716 | if (no_checkout) { |
ae077771 | 717 | update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, |
718 | UPDATE_REFS_DIE_ON_ERR); | |
fee92fc1 JS |
719 | } else { |
720 | res = run_command_v_opt(argv_checkout, RUN_GIT_CMD); | |
721 | if (res) | |
e8e3ce67 PB |
722 | /* |
723 | * Errors in `run_command()` itself, signaled by res < 0, | |
724 | * and errors in the child process, signaled by res > 0 | |
725 | * can both be treated as regular BISECT_FAILURE (-1). | |
726 | */ | |
727 | return -abs(res); | |
fee92fc1 | 728 | } |
ef24c7ca CC |
729 | |
730 | argv_show_branch[1] = bisect_rev_hex; | |
e8e3ce67 PB |
731 | res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD); |
732 | /* | |
733 | * Errors in `run_command()` itself, signaled by res < 0, | |
734 | * and errors in the child process, signaled by res > 0 | |
735 | * can both be treated as regular BISECT_FAILURE (-1). | |
736 | */ | |
737 | return -abs(res); | |
ef24c7ca CC |
738 | } |
739 | ||
69d2cfe6 NTND |
740 | static struct commit *get_commit_reference(struct repository *r, |
741 | const struct object_id *oid) | |
c0537662 | 742 | { |
69d2cfe6 NTND |
743 | struct commit *c = lookup_commit_reference(r, oid); |
744 | if (!c) | |
ee3051bd | 745 | die(_("Not a valid commit name %s"), oid_to_hex(oid)); |
69d2cfe6 | 746 | return c; |
c0537662 CC |
747 | } |
748 | ||
69d2cfe6 NTND |
749 | static struct commit **get_bad_and_good_commits(struct repository *r, |
750 | int *rev_nr) | |
c0537662 | 751 | { |
b32fa95f | 752 | struct commit **rev; |
c0537662 CC |
753 | int i, n = 0; |
754 | ||
b32fa95f | 755 | ALLOC_ARRAY(rev, 1 + good_revs.nr); |
69d2cfe6 | 756 | rev[n++] = get_commit_reference(r, current_bad_oid); |
902bb364 | 757 | for (i = 0; i < good_revs.nr; i++) |
69d2cfe6 | 758 | rev[n++] = get_commit_reference(r, good_revs.oid + i); |
c0537662 CC |
759 | *rev_nr = n; |
760 | ||
761 | return rev; | |
762 | } | |
763 | ||
9ec598e0 | 764 | static enum bisect_error handle_bad_merge_base(void) |
c0537662 | 765 | { |
3c5ff995 | 766 | if (is_expected_rev(current_bad_oid)) { |
767 | char *bad_hex = oid_to_hex(current_bad_oid); | |
c0537662 | 768 | char *good_hex = join_sha1_array_hex(&good_revs, ' '); |
43f9d9f3 | 769 | if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) { |
14dc4899 | 770 | fprintf(stderr, _("The merge base %s is bad.\n" |
43f9d9f3 | 771 | "This means the bug has been fixed " |
14dc4899 | 772 | "between %s and [%s].\n"), |
43f9d9f3 | 773 | bad_hex, bad_hex, good_hex); |
21e5cfd8 | 774 | } else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) { |
14dc4899 | 775 | fprintf(stderr, _("The merge base %s is new.\n" |
21e5cfd8 | 776 | "The property has changed " |
14dc4899 | 777 | "between %s and [%s].\n"), |
21e5cfd8 | 778 | bad_hex, bad_hex, good_hex); |
43f9d9f3 | 779 | } else { |
14dc4899 | 780 | fprintf(stderr, _("The merge base %s is %s.\n" |
43f9d9f3 | 781 | "This means the first '%s' commit is " |
14dc4899 | 782 | "between %s and [%s].\n"), |
43f9d9f3 AD |
783 | bad_hex, term_bad, term_good, bad_hex, good_hex); |
784 | } | |
9ec598e0 | 785 | return BISECT_MERGE_BASE_CHECK; |
c0537662 CC |
786 | } |
787 | ||
3f407b76 | 788 | fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n" |
c0537662 | 789 | "git bisect cannot work properly in this case.\n" |
14dc4899 | 790 | "Maybe you mistook %s and %s revs?\n"), |
43f9d9f3 | 791 | term_good, term_bad, term_good, term_bad); |
9ec598e0 | 792 | return BISECT_FAILED; |
c0537662 CC |
793 | } |
794 | ||
4ce3621a | 795 | static void handle_skipped_merge_base(const struct object_id *mb) |
c0537662 | 796 | { |
4ce3621a | 797 | char *mb_hex = oid_to_hex(mb); |
c368dde9 | 798 | char *bad_hex = oid_to_hex(current_bad_oid); |
c0537662 CC |
799 | char *good_hex = join_sha1_array_hex(&good_revs, ' '); |
800 | ||
14dc4899 | 801 | warning(_("the merge base between %s and [%s] " |
c0537662 | 802 | "must be skipped.\n" |
43f9d9f3 | 803 | "So we cannot be sure the first %s commit is " |
c0537662 | 804 | "between %s and %s.\n" |
14dc4899 | 805 | "We continue anyway."), |
43f9d9f3 | 806 | bad_hex, good_hex, term_bad, mb_hex, bad_hex); |
c0537662 CC |
807 | free(good_hex); |
808 | } | |
809 | ||
810 | /* | |
21e5cfd8 | 811 | * "check_merge_bases" checks that merge bases are not "bad" (or "new"). |
c0537662 | 812 | * |
21e5cfd8 | 813 | * - If one is "bad" (or "new"), it means the user assumed something wrong |
cdd4dc2d | 814 | * and we must return error with a non 0 error code. |
21e5cfd8 | 815 | * - If one is "good" (or "old"), that's good, we have nothing to do. |
c0537662 CC |
816 | * - If one is "skipped", we can't know but we should warn. |
817 | * - If we don't know, we should check it out and ask the user to test. | |
cdd4dc2d PB |
818 | * - If a merge base must be tested, on success return |
819 | * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition | |
820 | * for early success, this will be converted back to 0 in | |
821 | * check_good_are_ancestors_of_bad(). | |
c0537662 | 822 | */ |
cdd4dc2d | 823 | static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) |
c0537662 | 824 | { |
cdd4dc2d | 825 | enum bisect_error res = BISECT_OK; |
c0537662 | 826 | struct commit_list *result; |
c0537662 | 827 | |
2ce406cc | 828 | result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1); |
c0537662 CC |
829 | |
830 | for (; result; result = result->next) { | |
4ce3621a | 831 | const struct object_id *mb = &result->item->object.oid; |
4a7e27e9 | 832 | if (oideq(mb, current_bad_oid)) { |
9ec598e0 PB |
833 | res = handle_bad_merge_base(); |
834 | break; | |
910650d2 | 835 | } else if (0 <= oid_array_lookup(&good_revs, mb)) { |
c0537662 | 836 | continue; |
910650d2 | 837 | } else if (0 <= oid_array_lookup(&skipped_revs, mb)) { |
c0537662 CC |
838 | handle_skipped_merge_base(mb); |
839 | } else { | |
14dc4899 | 840 | printf(_("Bisecting: a merge base must be tested\n")); |
cdd4dc2d PB |
841 | res = bisect_checkout(mb, no_checkout); |
842 | if (!res) | |
843 | /* indicate early success */ | |
844 | res = BISECT_INTERNAL_SUCCESS_MERGE_BASE; | |
845 | break; | |
c0537662 CC |
846 | } |
847 | } | |
848 | ||
c0537662 | 849 | free_commit_list(result); |
cdd4dc2d | 850 | return res; |
c0537662 CC |
851 | } |
852 | ||
69d2cfe6 NTND |
853 | static int check_ancestors(struct repository *r, int rev_nr, |
854 | struct commit **rev, const char *prefix) | |
d937d4ac | 855 | { |
2d938fc7 | 856 | struct rev_info revs; |
86a0a408 | 857 | int res; |
d937d4ac | 858 | |
69d2cfe6 | 859 | bisect_rev_setup(r, &revs, prefix, "^%s", "%s", 0); |
d937d4ac | 860 | |
2d938fc7 CC |
861 | bisect_common(&revs); |
862 | res = (revs.commits != NULL); | |
863 | ||
864 | /* Clean up objects used, as they will be reused. */ | |
148f14ab | 865 | clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS); |
d937d4ac | 866 | |
2d938fc7 | 867 | return res; |
d937d4ac CC |
868 | } |
869 | ||
870 | /* | |
871 | * "check_good_are_ancestors_of_bad" checks that all "good" revs are | |
872 | * ancestor of the "bad" rev. | |
873 | * | |
874 | * If that's not the case, we need to check the merge bases. | |
875 | * If a merge base must be tested by the user, its source code will be | |
45b63708 | 876 | * checked out to be tested by the user and we will return. |
d937d4ac | 877 | */ |
45b63708 PB |
878 | |
879 | static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r, | |
69d2cfe6 NTND |
880 | const char *prefix, |
881 | int no_checkout) | |
d937d4ac | 882 | { |
45b63708 | 883 | char *filename; |
d937d4ac | 884 | struct stat st; |
148f14ab | 885 | int fd, rev_nr; |
cdd4dc2d | 886 | enum bisect_error res = BISECT_OK; |
148f14ab | 887 | struct commit **rev; |
d937d4ac | 888 | |
3c5ff995 | 889 | if (!current_bad_oid) |
45b63708 PB |
890 | return error(_("a %s revision is needed"), term_bad); |
891 | ||
892 | filename = git_pathdup("BISECT_ANCESTORS_OK"); | |
d937d4ac CC |
893 | |
894 | /* Check if file BISECT_ANCESTORS_OK exists. */ | |
895 | if (!stat(filename, &st) && S_ISREG(st.st_mode)) | |
144e7090 | 896 | goto done; |
d937d4ac CC |
897 | |
898 | /* Bisecting with no good rev is ok. */ | |
b8e3b2f3 | 899 | if (!good_revs.nr) |
144e7090 | 900 | goto done; |
d937d4ac | 901 | |
2d938fc7 | 902 | /* Check if all good revs are ancestor of the bad rev. */ |
cdd4dc2d | 903 | |
69d2cfe6 NTND |
904 | rev = get_bad_and_good_commits(r, &rev_nr); |
905 | if (check_ancestors(r, rev_nr, rev, prefix)) | |
cdd4dc2d | 906 | res = check_merge_bases(rev_nr, rev, no_checkout); |
148f14ab | 907 | free(rev); |
d937d4ac | 908 | |
45b63708 PB |
909 | if (!res) { |
910 | /* Create file BISECT_ANCESTORS_OK. */ | |
911 | fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600); | |
912 | if (fd < 0) | |
913 | /* | |
914 | * BISECT_ANCESTORS_OK file is not absolutely necessary, | |
915 | * the bisection process will continue at the next | |
916 | * bisection step. | |
917 | * So, just signal with a warning that something | |
918 | * might be wrong. | |
919 | */ | |
920 | warning_errno(_("could not create file '%s'"), | |
921 | filename); | |
922 | else | |
923 | close(fd); | |
924 | } | |
144e7090 MH |
925 | done: |
926 | free(filename); | |
45b63708 | 927 | return res; |
d937d4ac CC |
928 | } |
929 | ||
e22278c0 CC |
930 | /* |
931 | * This does "git diff-tree --pretty COMMIT" without one fork+exec. | |
932 | */ | |
69d2cfe6 NTND |
933 | static void show_diff_tree(struct repository *r, |
934 | const char *prefix, | |
935 | struct commit *commit) | |
e22278c0 | 936 | { |
2008f290 | 937 | const char *argv[] = { |
b02be8b9 | 938 | "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL |
2008f290 | 939 | }; |
e22278c0 CC |
940 | struct rev_info opt; |
941 | ||
b02be8b9 | 942 | git_config(git_diff_ui_config, NULL); |
40ae3d3e | 943 | repo_init_revisions(r, &opt, prefix); |
e22278c0 | 944 | |
2008f290 | 945 | setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL); |
e22278c0 CC |
946 | log_tree_commit(&opt, commit); |
947 | } | |
948 | ||
cb46d630 AD |
949 | /* |
950 | * The terms used for this bisect session are stored in BISECT_TERMS. | |
951 | * We read them and store them to adapt the messages accordingly. | |
952 | * Default is bad/good. | |
953 | */ | |
954 | void read_bisect_terms(const char **read_bad, const char **read_good) | |
955 | { | |
956 | struct strbuf str = STRBUF_INIT; | |
f5d284f6 | 957 | const char *filename = git_path_bisect_terms(); |
cb46d630 AD |
958 | FILE *fp = fopen(filename, "r"); |
959 | ||
960 | if (!fp) { | |
961 | if (errno == ENOENT) { | |
962 | *read_bad = "bad"; | |
963 | *read_good = "good"; | |
964 | return; | |
965 | } else { | |
14dc4899 | 966 | die_errno(_("could not read file '%s'"), filename); |
cb46d630 AD |
967 | } |
968 | } else { | |
8f309aeb | 969 | strbuf_getline_lf(&str, fp); |
cb46d630 | 970 | *read_bad = strbuf_detach(&str, NULL); |
8f309aeb | 971 | strbuf_getline_lf(&str, fp); |
cb46d630 AD |
972 | *read_good = strbuf_detach(&str, NULL); |
973 | } | |
974 | strbuf_release(&str); | |
975 | fclose(fp); | |
976 | } | |
977 | ||
ef24c7ca | 978 | /* |
6c69f222 | 979 | * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means |
ef24c7ca | 980 | * the bisection process finished successfully. |
6c69f222 PB |
981 | * In this case the calling function or command should not turn a |
982 | * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code. | |
fee92fc1 JS |
983 | * If no_checkout is non-zero, the bisection process does not |
984 | * checkout the trial commit but instead simply updates BISECT_HEAD. | |
ef24c7ca | 985 | */ |
680e8a01 | 986 | enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int no_checkout) |
ef24c7ca CC |
987 | { |
988 | struct rev_info revs; | |
989 | struct commit_list *tried; | |
6329bade | 990 | int reaches = 0, all = 0, nr, steps; |
ce58b5d8 | 991 | enum bisect_error res = BISECT_OK; |
4be0deec | 992 | struct object_id *bisect_rev; |
2cfa8357 | 993 | char *steps_msg; |
ef24c7ca | 994 | |
cb46d630 | 995 | read_bisect_terms(&term_bad, &term_good); |
2b020695 | 996 | if (read_bisect_refs()) |
14dc4899 | 997 | die(_("reading bisect refs failed")); |
2b020695 | 998 | |
45b63708 PB |
999 | res = check_good_are_ancestors_of_bad(r, prefix, no_checkout); |
1000 | if (res) | |
1001 | return res; | |
0871984d | 1002 | |
69d2cfe6 | 1003 | bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1); |
a22347c6 | 1004 | revs.limited = 1; |
2b020695 | 1005 | |
a22347c6 | 1006 | bisect_common(&revs); |
ef24c7ca | 1007 | |
24d707f6 | 1008 | find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr); |
62d0b0da | 1009 | revs.commits = managed_skipped(revs.commits, &tried); |
ef24c7ca CC |
1010 | |
1011 | if (!revs.commits) { | |
1012 | /* | |
6c69f222 | 1013 | * We should return error here only if the "bad" |
ef24c7ca CC |
1014 | * commit is also a "skip" commit. |
1015 | */ | |
ce58b5d8 PB |
1016 | res = error_if_skipped_commits(tried, NULL); |
1017 | if (res < 0) | |
6c69f222 | 1018 | return res; |
14dc4899 | 1019 | printf(_("%s was both %s and %s\n"), |
43f9d9f3 AD |
1020 | oid_to_hex(current_bad_oid), |
1021 | term_good, | |
1022 | term_bad); | |
6c69f222 PB |
1023 | |
1024 | return BISECT_FAILED; | |
ef24c7ca CC |
1025 | } |
1026 | ||
8f69f72f | 1027 | if (!all) { |
14dc4899 VA |
1028 | fprintf(stderr, _("No testable commit found.\n" |
1029 | "Maybe you started with bad path parameters?\n")); | |
6c69f222 PB |
1030 | |
1031 | return BISECT_NO_TESTABLE_COMMIT; | |
8f69f72f CC |
1032 | } |
1033 | ||
4be0deec | 1034 | bisect_rev = &revs.commits->item->object.oid; |
ef24c7ca | 1035 | |
4a7e27e9 | 1036 | if (oideq(bisect_rev, current_bad_oid)) { |
ce58b5d8 PB |
1037 | res = error_if_skipped_commits(tried, current_bad_oid); |
1038 | if (res) | |
6c69f222 | 1039 | return res; |
4be0deec | 1040 | printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), |
43f9d9f3 | 1041 | term_bad); |
6c69f222 | 1042 | |
69d2cfe6 | 1043 | show_diff_tree(r, prefix, revs.commits->item); |
6c69f222 PB |
1044 | /* |
1045 | * This means the bisection process succeeded. | |
1046 | * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) | |
1047 | * so that the call chain can simply check | |
1048 | * for negative return values for early returns up | |
1049 | * until the cmd_bisect__helper() caller. | |
1050 | */ | |
1051 | return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND; | |
ef24c7ca CC |
1052 | } |
1053 | ||
1054 | nr = all - reaches - 1; | |
6329bade | 1055 | steps = estimate_bisect_steps(all); |
2cfa8357 MM |
1056 | |
1057 | steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)", | |
1058 | steps), steps); | |
66f5f6dc ÆAB |
1059 | /* |
1060 | * TRANSLATORS: the last %s will be replaced with "(roughly %d | |
1061 | * steps)" translation. | |
1062 | */ | |
14dc4899 VA |
1063 | printf(Q_("Bisecting: %d revision left to test after this %s\n", |
1064 | "Bisecting: %d revisions left to test after this %s\n", | |
1065 | nr), nr, steps_msg); | |
2cfa8357 | 1066 | free(steps_msg); |
ef24c7ca | 1067 | |
f3a97718 | 1068 | return bisect_checkout(bisect_rev, no_checkout); |
ef24c7ca CC |
1069 | } |
1070 | ||
c43cb386 NTND |
1071 | static inline int log2i(int n) |
1072 | { | |
1073 | int log2 = 0; | |
1074 | ||
1075 | for (; n > 1; n >>= 1) | |
1076 | log2++; | |
1077 | ||
1078 | return log2; | |
1079 | } | |
1080 | ||
1081 | static inline int exp2i(int n) | |
1082 | { | |
1083 | return 1 << n; | |
1084 | } | |
1085 | ||
1086 | /* | |
1087 | * Estimate the number of bisect steps left (after the current step) | |
1088 | * | |
1089 | * For any x between 0 included and 2^n excluded, the probability for | |
1090 | * n - 1 steps left looks like: | |
1091 | * | |
1092 | * P(2^n + x) == (2^n - x) / (2^n + x) | |
1093 | * | |
1094 | * and P(2^n + x) < 0.5 means 2^n < 3x | |
1095 | */ | |
1096 | int estimate_bisect_steps(int all) | |
1097 | { | |
1098 | int n, x, e; | |
1099 | ||
1100 | if (all < 3) | |
1101 | return 0; | |
1102 | ||
1103 | n = log2i(all); | |
1104 | e = exp2i(n); | |
1105 | x = all - e; | |
1106 | ||
1107 | return (e < 3 * x) ? n : n - 1; | |
1108 | } | |
fb71a329 PB |
1109 | |
1110 | static int mark_for_removal(const char *refname, const struct object_id *oid, | |
1111 | int flag, void *cb_data) | |
1112 | { | |
1113 | struct string_list *refs = cb_data; | |
1114 | char *ref = xstrfmt("refs/bisect%s", refname); | |
1115 | string_list_append(refs, ref); | |
1116 | return 0; | |
1117 | } | |
1118 | ||
1119 | int bisect_clean_state(void) | |
1120 | { | |
1121 | int result = 0; | |
1122 | ||
1123 | /* There may be some refs packed during bisection */ | |
1124 | struct string_list refs_for_removal = STRING_LIST_INIT_NODUP; | |
1125 | for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal); | |
1126 | string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD")); | |
a9722297 | 1127 | result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF); |
fb71a329 PB |
1128 | refs_for_removal.strdup_strings = 1; |
1129 | string_list_clear(&refs_for_removal, 0); | |
1130 | unlink_or_warn(git_path_bisect_expected_rev()); | |
1131 | unlink_or_warn(git_path_bisect_ancestors_ok()); | |
1132 | unlink_or_warn(git_path_bisect_log()); | |
1133 | unlink_or_warn(git_path_bisect_names()); | |
1134 | unlink_or_warn(git_path_bisect_run()); | |
1135 | unlink_or_warn(git_path_bisect_terms()); | |
1136 | /* Cleanup head-name if it got left by an old version of git-bisect */ | |
1137 | unlink_or_warn(git_path_head_name()); | |
1138 | /* | |
1139 | * Cleanup BISECT_START last to support the --no-checkout option | |
1140 | * introduced in the commit 4796e823a. | |
1141 | */ | |
1142 | unlink_or_warn(git_path_bisect_start()); | |
1143 | ||
1144 | return result; | |
1145 | } |