thodg/got/regress/cmdline/blame.sh
Tag
-
Show log
Commit
-
Hash : c27a5e66
Author :
Date : 2020-11-18T13:48:26
new blame algorithm which compares commit N-1 to N; with help from Neels
-
regress/cmdline/blame.sh
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996
#!/bin/sh # # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org> # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. # # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. . ./common.sh blame_cmp() { local testroot="$1" local file="$2" local xfail="$3" (cd $testroot/wt && got blame "$file" | cut -d ' ' -f 2 \ > $testroot/${file}.blame.got) (cd $testroot/repo && git reset --hard master > /dev/null) (cd $testroot/repo && git blame "$file" | cut -d ' ' -f 1 \ > $testroot/${file}.blame.git) cmp -s $testroot/${file}.blame.git $testroot/${file}.blame.got ret="$?" if [ "$ret" != "0" -a "$xfail" == "" ]; then diff -u $testroot/${file}.blame.git $testroot/${file}.blame.got return 1 fi return "$ret" } test_blame_basic() { local testroot=`test_init blame_basic` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo 1 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` echo 2 >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_head $testroot/repo` echo 3 >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_head $testroot/repo` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) local short_commit1=`trim_obj_id 32 $commit1` local short_commit2=`trim_obj_id 32 $commit2` local short_commit3=`trim_obj_id 32 $commit3` d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_blame_tag() { local testroot=`test_init blame_tag` local tag=1.0.0 got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo 1 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` echo 2 >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_head $testroot/repo` (cd $testroot/repo && git tag -a -m "test" $tag) echo 3 >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_head $testroot/repo` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame -c $tag alpha > $testroot/stdout) local short_commit1=`trim_obj_id 32 $commit1` local short_commit2=`trim_obj_id 32 $commit2` d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_blame_file_single_line() { local testroot=`test_init blame_file_single_line` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo 1 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) local short_commit1=`trim_obj_id 32 $commit1` d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_blame_file_single_line_no_newline() { local testroot=`test_init blame_file_single_line_no_newline` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo -n 1 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) local short_commit1=`trim_obj_id 32 $commit1` d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_blame_all_lines_replaced() { local testroot=`test_init blame_all_lines_replaced` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi jot 8 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit1 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected echo "4) $short_commit1 $d $GOT_AUTHOR_8 4" >> $testroot/stdout.expected echo "5) $short_commit1 $d $GOT_AUTHOR_8 5" >> $testroot/stdout.expected echo "6) $short_commit1 $d $GOT_AUTHOR_8 6" >> $testroot/stdout.expected echo "7) $short_commit1 $d $GOT_AUTHOR_8 7" >> $testroot/stdout.expected echo "8) $short_commit1 $d $GOT_AUTHOR_8 8" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_blame_lines_shifted_up() { local testroot=`test_init blame_lines_shifted_up` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi jot 8 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time=`git_show_author_time $testroot/repo` sed -i -e '/^[345]$/d' $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_head $testroot/repo` local short_commit2=`trim_obj_id 32 $commit2` jot 2 > $testroot/wt/alpha echo foo >> $testroot/wt/alpha echo bar >> $testroot/wt/alpha echo baz >> $testroot/wt/alpha jot 8 6 8 1 >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_head $testroot/repo` local short_commit3=`trim_obj_id 32 $commit3` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 foo" >> $testroot/stdout.expected echo "4) $short_commit3 $d $GOT_AUTHOR_8 bar" >> $testroot/stdout.expected echo "5) $short_commit3 $d $GOT_AUTHOR_8 baz" >> $testroot/stdout.expected echo "6) $short_commit1 $d $GOT_AUTHOR_8 6" >> $testroot/stdout.expected echo "7) $short_commit1 $d $GOT_AUTHOR_8 7" >> $testroot/stdout.expected echo "8) $short_commit1 $d $GOT_AUTHOR_8 8" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_blame_lines_shifted_down() { local testroot=`test_init blame_lines_shifted_down` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi jot 8 > $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time=`git_show_author_time $testroot/repo` sed -i -e '/^8$/d' $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_head $testroot/repo` local short_commit2=`trim_obj_id 32 $commit2` jot 2 > $testroot/wt/alpha echo foo >> $testroot/wt/alpha echo bar >> $testroot/wt/alpha echo baz >> $testroot/wt/alpha jot 8 3 8 1 >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_head $testroot/repo` local short_commit3=`trim_obj_id 32 $commit3` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) d=`date -r $author_time +"%G-%m-%d"` echo "01) $short_commit1 $d $GOT_AUTHOR_8 1" \ > $testroot/stdout.expected echo "02) $short_commit1 $d $GOT_AUTHOR_8 2" \ >> $testroot/stdout.expected echo "03) $short_commit3 $d $GOT_AUTHOR_8 foo" \ >> $testroot/stdout.expected echo "04) $short_commit3 $d $GOT_AUTHOR_8 bar" \ >> $testroot/stdout.expected echo "05) $short_commit3 $d $GOT_AUTHOR_8 baz" \ >> $testroot/stdout.expected echo "06) $short_commit1 $d $GOT_AUTHOR_8 3" \ >> $testroot/stdout.expected echo "07) $short_commit1 $d $GOT_AUTHOR_8 4" \ >> $testroot/stdout.expected echo "08) $short_commit1 $d $GOT_AUTHOR_8 5" \ >> $testroot/stdout.expected echo "09) $short_commit1 $d $GOT_AUTHOR_8 6" \ >> $testroot/stdout.expected echo "10) $short_commit1 $d $GOT_AUTHOR_8 7" \ >> $testroot/stdout.expected echo "11) $short_commit3 $d $GOT_AUTHOR_8 8" \ >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_blame_commit_subsumed() { local testroot=`test_init blame_commit_subsumed` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi cat > $testroot/wt/alpha <<EOF SUBDIRS = ext modules codedocs docs if WITH_PDNS_SERVER SUBDIRS += pdns endif EXTRA_DIST = INSTALL NOTICE README .version build-aux/gen-version codedocs/doxygen.conf contrib/powerdns.solaris.init.d pdns/named.conf.parsertest regression-tests/zones/unit.test ACLOCAL_AMFLAGS = -I m4 dvi: # do nothing to build dvi EOF (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time1=`git_show_author_time $testroot/repo` local d1=`date -r $author_time1 +"%G-%m-%d"` cat > $testroot/wt/alpha <<EOF SUBDIRS = ext modules codedocs docs SUBDIRS += pdns EXTRA_DIST = INSTALL NOTICE README .version build-aux/gen-version codedocs/doxygen.conf contrib/powerdns.solaris.init.d pdns/named.conf.parsertest regression-tests/zones/unit.test ACLOCAL_AMFLAGS = -I m4 dvi: # do nothing to build dvi EOF # all changes in this commit will be subsumed by later commits (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_head $testroot/repo` local short_commit2=`trim_obj_id 32 $commit2` local author_time2=`git_show_author_time $testroot/repo` local d2=`date -r $author_time2 +"%G-%m-%d"` cat > $testroot/wt/alpha <<EOF SUBDIRS = ext modules pdns codedocs docs EXTRA_DIST = INSTALL NOTICE README .version build-aux/gen-version codedocs/doxygen.conf contrib/powerdns.solaris.init.d pdns/named.conf.parsertest regression-tests/zones/unit.test ACLOCAL_AMFLAGS = -I m4 dvi: # do nothing to build dvi EOF (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_head $testroot/repo` local short_commit3=`trim_obj_id 32 $commit3` local author_time3=`git_show_author_time $testroot/repo` local d3=`date -r $author_time3 +"%G-%m-%d"` cat > $testroot/wt/alpha <<EOF SUBDIRS = ext modules pdns codedocs docs EXTRA_DIST = INSTALL NOTICE README COPYING codedocs/doxygen.conf contrib/powerdns.solaris.init.d pdns/named.conf.parsertest regression-tests/zones/unit.test builder-support/gen-version ACLOCAL_AMFLAGS = -I m4 dvi: # do nothing to build dvi EOF (cd $testroot/wt && got commit -m "change 4" > /dev/null) local commit4=`git_show_head $testroot/repo` local short_commit4=`trim_obj_id 32 $commit4` local author_time4=`git_show_author_time $testroot/repo` local d4=`date -r $author_time4 +"%G-%m-%d"` (cd $testroot/wt && got blame alpha > $testroot/stdout) echo -n "01) $short_commit3 $d3 $GOT_AUTHOR_8 " \ > $testroot/stdout.expected echo "SUBDIRS = ext modules pdns codedocs docs" \ >> $testroot/stdout.expected echo "02) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected echo -n "03) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected echo 'EXTRA_DIST =' >> $testroot/stdout.expected echo -n "04) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tINSTALL\n" >> $testroot/stdout.expected echo -n "05) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tNOTICE\n" >> $testroot/stdout.expected echo -n "06) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tREADME\n" >> $testroot/stdout.expected echo -n "07) $short_commit4 $d4 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tCOPYING\n" >> $testroot/stdout.expected echo -n "08) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tcodedocs/doxygen.conf\n" >> $testroot/stdout.expected echo -n "09) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tcontrib/powerdns.solaris.init.d\n" \ >> $testroot/stdout.expected echo -n "10) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tpdns/named.conf.parsertest\n" >> $testroot/stdout.expected echo -n "11) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tregression-tests/zones/unit.test\n" \ >> $testroot/stdout.expected echo -n "12) $short_commit4 $d4 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected printf "\tbuilder-support/gen-version\n" >> $testroot/stdout.expected echo "13) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected echo -n "14) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected echo "ACLOCAL_AMFLAGS = -I m4" \ >> $testroot/stdout.expected echo "15) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected echo -n "16) $short_commit1 $d1 $GOT_AUTHOR_8 " \ >> $testroot/stdout.expected echo "dvi: # do nothing to build dvi" \ >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_blame_blame_h() { local testroot=`test_init blame_blame_h` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi cat > $testroot/wt/got_blame.h <<EOF /* * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ const struct got_error *got_blame(const char *, struct got_object_id *, struct got_repository *, FILE *); EOF (cd $testroot/wt && got add got_blame.h > /dev/null) (cd $testroot/wt && got commit -m "change 1" > /dev/null) cat > $testroot/wt/blame-2.patch <<EOF diff 63581804340e880bf611c6a4a59eda26c503799f 84451b3ef755f3226d0d79af367632e5f3a830e7 blob - b53ca469a18871cc2f6af334dab25028599c6488 blob + c787aadf05e2afab61bd34976f7349912252e6da --- got_blame.h +++ got_blame.h @@ -14,5 +14,22 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * Write an annotated version of a file at a given in-repository path, + * as found in the commit specified by ID, to the specified output file. + */ const struct got_error *got_blame(const char *, struct got_object_id *, struct got_repository *, FILE *); + +/* + * Like got_blame() but instead of generating an output file invoke + * a callback whenever an annotation has been computed for a line. + * + * The callback receives the provided void * argument, the total number + * of lines of the annotated file, a line number, and the ID of the commit + * which last changed this line. + */ +const struct got_error *got_blame_incremental(const char *, + struct got_object_id *, struct got_repository *, + const struct got_error *(*cb)(void *, int, int, struct got_object_id *), + void *); EOF (cd $testroot/wt && patch < blame-2.patch > /dev/null) (cd $testroot/wt && got commit -m "change 2" > /dev/null) cat > $testroot/wt/blame-3.patch <<EOF diff 75b7a700d9d14ef8eb902961255212acbedef164 d68a0a7de13af722c55099582019c03240e13320 blob - c787aadf05e2afab61bd34976f7349912252e6da blob + 5255d076c915accf159940978b821d06803ff2f8 --- got_blame.h +++ got_blame.h @@ -28,6 +28,15 @@ const struct got_error *got_blame(const char *, struct * The callback receives the provided void * argument, the total number * of lines of the annotated file, a line number, and the ID of the commit * which last changed this line. + * + * The callback is invoked for each commit as history is traversed. + * If no changes to the file were made in a commit, line number -1 and + * commit ID NULL will be reported. + * + * If the callback returns GOT_ERR_ITER_COMPLETED, the blame operation + * will be aborted and this function returns NULL. + * If the callback returns any other error, the blame operation will be + * aborted and the callback's error is returned from this function. */ const struct got_error *got_blame_incremental(const char *, struct got_object_id *, struct got_repository *, EOF (cd $testroot/wt && patch < blame-3.patch > /dev/null) (cd $testroot/wt && got commit -m "change 3" > /dev/null) cat > $testroot/wt/blame-4.patch <<EOF diff 3f60a8ef49086101685260fcb829f578cdf6d320 3bf198ba335fa30c8d16efb5c8e496200ac99c05 blob - 5255d076c915accf159940978b821d06803ff2f8 blob + 39623c468e733ee08abb50eafe29202b2b0a04ef --- got_blame.h +++ got_blame.h @@ -30,8 +30,8 @@ const struct got_error *got_blame(const char *, struct * which last changed this line. * * The callback is invoked for each commit as history is traversed. - * If no changes to the file were made in a commit, line number -1 and - * commit ID NULL will be reported. + * If no changes to the file were made in a commit, line number -1 will + * be reported. * * If the callback returns GOT_ERR_ITER_COMPLETED, the blame operation * will be aborted and this function returns NULL. EOF (cd $testroot/wt && patch < blame-4.patch > /dev/null) (cd $testroot/wt && got commit -m "change 4" > /dev/null) cat > $testroot/wt/blame-5.patch <<EOF diff 28315671b93d195163b0468fcb3879e29b25759c e27a7222faaa171dcb086ea0b566dc7bebb74a0b blob - 39623c468e733ee08abb50eafe29202b2b0a04ef blob + 6075cadbd177e1802679c7353515bf4ceebb51d0 --- got_blame.h +++ got_blame.h @@ -15,14 +15,7 @@ */ /* - * Write an annotated version of a file at a given in-repository path, - * as found in the commit specified by ID, to the specified output file. - */ -const struct got_error *got_blame(const char *, struct got_object_id *, - struct got_repository *, FILE *); - -/* - * Like got_blame() but instead of generating an output file invoke + * Blame the blob at the specified path in the specified commit and invoke * a callback whenever an annotation has been computed for a line. * * The callback receives the provided void * argument, the total number EOF (cd $testroot/wt && patch < blame-5.patch > /dev/null) (cd $testroot/wt && got commit -m "change 5" > /dev/null) blame_cmp "$testroot" "got_blame.h" ret="$?" test_done "$testroot" "$ret" } test_blame_added_on_branch() { local testroot=`test_init blame_added_on_branch` got branch -r $testroot/repo -c master newbranch ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo 1 > $testroot/wt/new (cd $testroot/wt && got add new > /dev/null) (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_branch_head $testroot/repo newbranch` echo 2 >> $testroot/wt/new (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_branch_head $testroot/repo newbranch` echo 3 >> $testroot/wt/new (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_branch_head $testroot/repo newbranch` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame new > $testroot/stdout) local short_commit1=`trim_obj_id 32 $commit1` local short_commit2=`trim_obj_id 32 $commit2` local short_commit3=`trim_obj_id 32 $commit3` d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } test_blame_submodule() { local testroot=`test_init blame_submodule` local commit_id0=`git_show_head $testroot/repo` local author_time=`git_show_author_time $testroot/repo` make_single_file_repo $testroot/repo2 foo (cd $testroot/repo && git submodule -q add ../repo2) (cd $testroot/repo && git commit -q -m 'adding submodule') # Attempt a (nonsensical) blame of a submodule. got blame -r $testroot/repo repo2 \ > $testroot/stdout 2> $testroot/stderr ret="$?" if [ "$ret" == "0" ]; then echo "blame command succeeded unexpectedly" >&2 test_done "$testroot" "1" return 1 fi local submodule_id=$(got tree -r $testroot/repo -i | \ grep 'repo2\$$' | cut -d ' ' -f1) echo "got: object $submodule_id not found" > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr fi test_done "$testroot" "$ret" } test_blame_symlink() { local testroot=`test_init blame_symlink` local commit_id0=`git_show_head $testroot/repo` local short_commit0=`trim_obj_id 32 $commit_id0` (cd $testroot/repo && ln -s alpha alpha.link) (cd $testroot/repo && ln -s epsilon epsilon.link) (cd $testroot/repo && ln -s /etc/passwd passwd.link) (cd $testroot/repo && ln -s ../beta epsilon/beta.link) (cd $testroot/repo && ln -s nonexistent nonexistent.link) (cd $testroot/repo && git add .) git_commit $testroot/repo -m "add symlinks" local commit_id1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit_id1` local author_time=`git_show_author_time $testroot/repo` # got blame dereferences symlink to a regular file got blame -r $testroot/repo alpha.link > $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then echo "blame command failed unexpectedly" >&2 test_done "$testroot" "$ret" return 1 fi d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit0 $d $GOT_AUTHOR_8 alpha" \ > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" -a "$xfail" == "" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "1" return 1 fi # got blame dereferences symlink with relative path got blame -r $testroot/repo epsilon/beta.link > $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then echo "blame command failed unexpectedly" >&2 test_done "$testroot" "$ret" return 1 fi d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit0 $d $GOT_AUTHOR_8 beta" \ > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" -a "$xfail" == "" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "1" return 1 fi got blame -r $testroot/repo epsilon.link > $testroot/stdout \ 2> $testroot/stderr ret="$?" if [ "$ret" == "0" ]; then echo "blame command succeeded unexpectedly" >&2 test_done "$testroot" "1" return 1 fi # blame dereferences symlink to a directory echo "got: /epsilon: wrong type of object" > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "1" return 1 fi # got blame fails if symlink target does not exist in repo got blame -r $testroot/repo passwd.link > $testroot/stdout \ 2> $testroot/stderr ret="$?" if [ "$ret" == "0" ]; then echo "blame command succeeded unexpectedly" >&2 test_done "$testroot" "$ret" return 1 fi echo "got: /etc/passwd: no such entry found in tree" \ > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "1" return 1 fi got blame -r $testroot/repo nonexistent.link > $testroot/stdout \ 2> $testroot/stderr ret="$?" if [ "$ret" == "0" ]; then echo "blame command succeeded unexpectedly" >&2 test_done "$testroot" "$ret" return 1 fi echo "got: /nonexistent: no such entry found in tree" \ > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "1" return 1 fi test_done "$testroot" "$ret" } test_blame_lines_shifted_skip() { local testroot=`test_init blame_lines_shifted_skip` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi cat > $testroot/wt/alpha <<EOF A B C D EOF (cd $testroot/wt && got commit -m "change 1" > /dev/null) local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time=`git_show_author_time $testroot/repo` cat > $testroot/wt/alpha <<EOF A B Y C P Q EOF (cd $testroot/wt && got commit -m "change 2" > /dev/null) local commit2=`git_show_head $testroot/repo` local short_commit2=`trim_obj_id 32 $commit2` cat > $testroot/wt/alpha <<EOF A B Y C D P Q EOF (cd $testroot/wt && got commit -m "change 3" > /dev/null) local commit3=`git_show_head $testroot/repo` local short_commit3=`trim_obj_id 32 $commit3` local author_time=`git_show_author_time $testroot/repo` cat > $testroot/wt/alpha <<EOF A B C P Y Q EOF (cd $testroot/wt && got commit -m "change 4" > /dev/null) local commit4=`git_show_head $testroot/repo` local short_commit4=`trim_obj_id 32 $commit4` local author_time=`git_show_author_time $testroot/repo` cat > $testroot/wt/alpha <<EOF X A B C P Y Q EOF (cd $testroot/wt && got commit -m "change 5" > /dev/null) local commit5=`git_show_head $testroot/repo` local short_commit5=`trim_obj_id 32 $commit5` local author_time=`git_show_author_time $testroot/repo` (cd $testroot/wt && got blame alpha > $testroot/stdout) d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit5 $d $GOT_AUTHOR_8 X" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 A" >> $testroot/stdout.expected echo "3) $short_commit1 $d $GOT_AUTHOR_8 B" >> $testroot/stdout.expected echo "4) $short_commit1 $d $GOT_AUTHOR_8 C" >> $testroot/stdout.expected echo "5) $short_commit2 $d $GOT_AUTHOR_8 P" >> $testroot/stdout.expected echo "6) $short_commit4 $d $GOT_AUTHOR_8 Y" >> $testroot/stdout.expected echo "7) $short_commit2 $d $GOT_AUTHOR_8 Q" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi blame_cmp "$testroot" "alpha" ret="$?" test_done "$testroot" "$ret" } test_parseargs "$@" run_test test_blame_basic run_test test_blame_tag run_test test_blame_file_single_line run_test test_blame_file_single_line_no_newline run_test test_blame_all_lines_replaced run_test test_blame_lines_shifted_up run_test test_blame_lines_shifted_down run_test test_blame_commit_subsumed run_test test_blame_blame_h run_test test_blame_added_on_branch run_test test_blame_submodule run_test test_blame_symlink run_test test_blame_lines_shifted_skip