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