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