Mercurial > hg

comparison tests/test-bisect2.t @ 46798:f51ff655d338

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: use standard one-line commit summary This makes bisect use the standardized support for one-line commit summary I added a while back. That means that it will respect the `command-templates.oneline-summary` config. If also means that the default output now includes the first line of the commit message (see test impact). Differential Revision: https://phab.mercurial-scm.org/D10245
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Mar 2021 23:16:09 -0700
parents 1b5c61d38a52
children 816236523765
comparison
equal deleted inserted replaced
46797:bcdcb4423ae3 46798:f51ff655d338
250 complex bisect test 1 # first bad rev is 9 250 complex bisect test 1 # first bad rev is 9
251 251
252 $ hg bisect -r 252 $ hg bisect -r
253 $ hg bisect -g 0 253 $ hg bisect -g 0
254 $ hg bisect -b 17 # -> update to rev 6 254 $ hg bisect -b 17 # -> update to rev 6
255 Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) 255 Testing changeset 6:a214d5d3811a "merge 4,5" (15 changesets remaining, ~3 tests)
256 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 256 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
257 $ hg log -q -r 'bisect(pruned)' 257 $ hg log -q -r 'bisect(pruned)'
258 0:33b1f9bc8bc5 258 0:33b1f9bc8bc5
259 17:228c06deef46 259 17:228c06deef46
260 $ hg log -q -r 'bisect(untested)' 260 $ hg log -q -r 'bisect(untested)'
272 13:b0a32c86eb31 272 13:b0a32c86eb31
273 15:857b178a7cf3 273 15:857b178a7cf3
274 16:609d82a7ebae 274 16:609d82a7ebae
275 $ hg log -q -r 'bisect(ignored)' 275 $ hg log -q -r 'bisect(ignored)'
276 $ hg bisect -g # -> update to rev 13 276 $ hg bisect -g # -> update to rev 13
277 Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) 277 Testing changeset 13:b0a32c86eb31 "13" (9 changesets remaining, ~3 tests)
278 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 278 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
279 $ hg bisect -s # -> update to rev 10 279 $ hg bisect -s # -> update to rev 10
280 Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) 280 Testing changeset 10:429fcd26f52d "merge 6,9" (9 changesets remaining, ~3 tests)
281 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 281 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
282 $ hg bisect -b # -> update to rev 8 282 $ hg bisect -b # -> update to rev 8
283 Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) 283 Testing changeset 8:dab8161ac8fc "8" (3 changesets remaining, ~1 tests)
284 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 284 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
285 $ hg bisect -g # -> update to rev 9 285 $ hg bisect -g # -> update to rev 9
286 Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) 286 Testing changeset 9:3c77083deb4a "9" (2 changesets remaining, ~1 tests)
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
288 $ hg bisect -b 288 $ hg bisect -b
289 The first bad revision is: 289 The first bad revision is:
290 changeset: 9:3c77083deb4a 290 changeset: 9:3c77083deb4a
291 user: test 291 user: test
348 complex bisect test 2 # first good rev is 13 348 complex bisect test 2 # first good rev is 13
349 349
350 $ hg bisect -r 350 $ hg bisect -r
351 $ hg bisect -g 18 351 $ hg bisect -g 18
352 $ hg bisect -b 1 # -> update to rev 6 352 $ hg bisect -b 1 # -> update to rev 6
353 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) 353 Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests)
354 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 354 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
355 $ hg bisect -s # -> update to rev 10 355 $ hg bisect -s # -> update to rev 10
356 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) 356 Testing changeset 10:429fcd26f52d "merge 6,9" (13 changesets remaining, ~3 tests)
357 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 357 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
358 $ hg log -q -r 'bisect(pruned)' 358 $ hg log -q -r 'bisect(pruned)'
359 0:33b1f9bc8bc5 359 0:33b1f9bc8bc5
360 1:4ca5088da217 360 1:4ca5088da217
361 6:a214d5d3811a 361 6:a214d5d3811a
362 18:d42e18c7bc9b 362 18:d42e18c7bc9b
363 $ hg bisect -b # -> update to rev 12 363 $ hg bisect -b # -> update to rev 12
364 Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) 364 Testing changeset 12:9f259202bbe7 "12" (5 changesets remaining, ~2 tests)
365 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 365 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
366 $ hg log -q -r 'bisect(pruned)' 366 $ hg log -q -r 'bisect(pruned)'
367 0:33b1f9bc8bc5 367 0:33b1f9bc8bc5
368 1:4ca5088da217 368 1:4ca5088da217
369 2:051e12f87bf1 369 2:051e12f87bf1
379 11:82ca6f06eccd 379 11:82ca6f06eccd
380 12:9f259202bbe7 380 12:9f259202bbe7
381 13:b0a32c86eb31 381 13:b0a32c86eb31
382 15:857b178a7cf3 382 15:857b178a7cf3
383 $ hg bisect -b # -> update to rev 13 383 $ hg bisect -b # -> update to rev 13
384 Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) 384 Testing changeset 13:b0a32c86eb31 "13" (3 changesets remaining, ~1 tests)
385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
386 $ hg bisect -g 386 $ hg bisect -g
387 The first good revision is: 387 The first good revision is:
388 changeset: 13:b0a32c86eb31 388 changeset: 13:b0a32c86eb31
389 user: test 389 user: test
412 10,9,13 are skipped an might be the first bad revisions as well 412 10,9,13 are skipped an might be the first bad revisions as well
413 413
414 $ hg bisect -r 414 $ hg bisect -r
415 $ hg bisect -g 1 415 $ hg bisect -g 1
416 $ hg bisect -b 16 # -> update to rev 6 416 $ hg bisect -b 16 # -> update to rev 6
417 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) 417 Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests)
418 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 418 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
419 $ hg log -q -r 'bisect(pruned)' 419 $ hg log -q -r 'bisect(pruned)'
420 0:33b1f9bc8bc5 420 0:33b1f9bc8bc5
421 1:4ca5088da217 421 1:4ca5088da217
422 16:609d82a7ebae 422 16:609d82a7ebae
423 17:228c06deef46 423 17:228c06deef46
424 $ hg bisect -g # -> update to rev 13 424 $ hg bisect -g # -> update to rev 13
425 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) 425 Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests)
426 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 426 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
427 $ hg bisect -s # -> update to rev 10 427 $ hg bisect -s # -> update to rev 10
428 Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) 428 Testing changeset 10:429fcd26f52d "merge 6,9" (8 changesets remaining, ~3 tests)
429 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 429 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
430 $ hg bisect -s # -> update to rev 12 430 $ hg bisect -s # -> update to rev 12
431 Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) 431 Testing changeset 12:9f259202bbe7 "12" (8 changesets remaining, ~3 tests)
432 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 432 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
433 $ hg log -q -r 'bisect(pruned)' 433 $ hg log -q -r 'bisect(pruned)'
434 0:33b1f9bc8bc5 434 0:33b1f9bc8bc5
435 1:4ca5088da217 435 1:4ca5088da217
436 2:051e12f87bf1 436 2:051e12f87bf1
441 10:429fcd26f52d 441 10:429fcd26f52d
442 13:b0a32c86eb31 442 13:b0a32c86eb31
443 16:609d82a7ebae 443 16:609d82a7ebae
444 17:228c06deef46 444 17:228c06deef46
445 $ hg bisect -g # -> update to rev 9 445 $ hg bisect -g # -> update to rev 9
446 Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) 446 Testing changeset 9:3c77083deb4a "9" (5 changesets remaining, ~2 tests)
447 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 447 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
448 $ hg bisect -s # -> update to rev 15 448 $ hg bisect -s # -> update to rev 15
449 Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) 449 Testing changeset 15:857b178a7cf3 "merge 10,13" (5 changesets remaining, ~2 tests)
450 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 450 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
451 $ hg log -q -r 'bisect(ignored)' 451 $ hg log -q -r 'bisect(ignored)'
452 $ hg bisect -b 452 $ hg bisect -b
453 Due to skipped revisions, the first bad revision could be any of: 453 Due to skipped revisions, the first bad revision could be any of:
454 changeset: 9:3c77083deb4a 454 changeset: 9:3c77083deb4a
498 15,16 are skipped an might be the first good revisions as well 498 15,16 are skipped an might be the first good revisions as well
499 499
500 $ hg bisect -r 500 $ hg bisect -r
501 $ hg bisect -g 17 501 $ hg bisect -g 17
502 $ hg bisect -b 8 # -> update to rev 10 502 $ hg bisect -b 8 # -> update to rev 10
503 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) 503 Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests)
504 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 504 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
505 $ hg bisect -b # -> update to rev 13 505 $ hg bisect -b # -> update to rev 13
506 Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests) 506 Testing changeset 10:429fcd26f52d "merge 6,9" (5 changesets remaining, ~2 tests)
507 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 507 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
508 $ hg bisect -b # -> update to rev 15 508 $ hg bisect -b # -> update to rev 15
509 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) 509 Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests)
510 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 510 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
511 $ hg log -q -r 'bisect(pruned)' 511 $ hg log -q -r 'bisect(pruned)'
512 0:33b1f9bc8bc5 512 0:33b1f9bc8bc5
513 1:4ca5088da217 513 1:4ca5088da217
514 2:051e12f87bf1 514 2:051e12f87bf1
522 11:82ca6f06eccd 522 11:82ca6f06eccd
523 12:9f259202bbe7 523 12:9f259202bbe7
524 13:b0a32c86eb31 524 13:b0a32c86eb31
525 17:228c06deef46 525 17:228c06deef46
526 $ hg bisect -s # -> update to rev 16 526 $ hg bisect -s # -> update to rev 16
527 Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) 527 Testing changeset 16:609d82a7ebae "16" (3 changesets remaining, ~1 tests)
528 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 528 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
529 $ hg log -q -r 'bisect(pruned)' 529 $ hg log -q -r 'bisect(pruned)'
530 0:33b1f9bc8bc5 530 0:33b1f9bc8bc5
531 1:4ca5088da217 531 1:4ca5088da217
532 2:051e12f87bf1 532 2:051e12f87bf1
610 end at merge: 17 bad, 11 good (but 9 is first bad) 610 end at merge: 17 bad, 11 good (but 9 is first bad)
611 611
612 $ hg bisect -r 612 $ hg bisect -r
613 $ hg bisect -b 17 613 $ hg bisect -b 17
614 $ hg bisect -g 11 614 $ hg bisect -g 11
615 Testing changeset 13:b0a32c86eb31 (5 changesets remaining, ~2 tests) 615 Testing changeset 13:b0a32c86eb31 "13" (5 changesets remaining, ~2 tests)
616 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 616 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
617 $ hg log -q -r 'bisect(ignored)' 617 $ hg log -q -r 'bisect(ignored)'
618 2:051e12f87bf1 618 2:051e12f87bf1
619 3:0950834f0a9c 619 3:0950834f0a9c
620 4:5c668c22234f 620 4:5c668c22234f
621 5:385a529b6670 621 5:385a529b6670
622 6:a214d5d3811a 622 6:a214d5d3811a
623 9:3c77083deb4a 623 9:3c77083deb4a
624 10:429fcd26f52d 624 10:429fcd26f52d
625 $ hg bisect -g 625 $ hg bisect -g
626 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) 626 Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests)
627 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 627 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
628 $ hg bisect -b 628 $ hg bisect -b
629 The first bad revision is: 629 The first bad revision is:
630 changeset: 15:857b178a7cf3 630 changeset: 15:857b178a7cf3
631 parent: 13:b0a32c86eb31 631 parent: 13:b0a32c86eb31
663 5:385a529b6670 663 5:385a529b6670
664 6:a214d5d3811a 664 6:a214d5d3811a
665 9:3c77083deb4a 665 9:3c77083deb4a
666 10:429fcd26f52d 666 10:429fcd26f52d
667 $ hg bisect --extend 667 $ hg bisect --extend
668 Extending search to changeset 8:dab8161ac8fc 668 Extending search to changeset 8:dab8161ac8fc "8"
669 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 669 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
670 $ hg log -q -r 'bisect(untested)' 670 $ hg log -q -r 'bisect(untested)'
671 $ hg log -q -r 'bisect(ignored)' 671 $ hg log -q -r 'bisect(ignored)'
672 2:051e12f87bf1 672 2:051e12f87bf1
673 3:0950834f0a9c 673 3:0950834f0a9c
675 5:385a529b6670 675 5:385a529b6670
676 6:a214d5d3811a 676 6:a214d5d3811a
677 9:3c77083deb4a 677 9:3c77083deb4a
678 10:429fcd26f52d 678 10:429fcd26f52d
679 $ hg bisect -g # dab8161ac8fc 679 $ hg bisect -g # dab8161ac8fc
680 Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests) 680 Testing changeset 9:3c77083deb4a "9" (3 changesets remaining, ~1 tests)
681 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 681 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
682 $ hg log -q -r 'bisect(untested)' 682 $ hg log -q -r 'bisect(untested)'
683 9:3c77083deb4a 683 9:3c77083deb4a
684 10:429fcd26f52d 684 10:429fcd26f52d
685 $ hg log -q -r 'bisect(ignored)' 685 $ hg log -q -r 'bisect(ignored)'
755 user adds irrelevant but consistent information (here: -g 2) to bisect state 755 user adds irrelevant but consistent information (here: -g 2) to bisect state
756 756
757 $ hg bisect -r 757 $ hg bisect -r
758 $ hg bisect -b 13 758 $ hg bisect -b 13
759 $ hg bisect -g 8 759 $ hg bisect -g 8
760 Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) 760 Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests)
761 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 761 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
762 $ hg log -q -r 'bisect(untested)' 762 $ hg log -q -r 'bisect(untested)'
763 11:82ca6f06eccd 763 11:82ca6f06eccd
764 12:9f259202bbe7 764 12:9f259202bbe7
765 $ hg bisect -g 2 765 $ hg bisect -g 2
766 Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) 766 Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests)
767 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 767 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
768 $ hg log -q -r 'bisect(untested)' 768 $ hg log -q -r 'bisect(untested)'
769 11:82ca6f06eccd 769 11:82ca6f06eccd
770 12:9f259202bbe7 770 12:9f259202bbe7
771 $ hg bisect -b 771 $ hg bisect -b