ilyagr.bsky.social / jj
just playing with tangled
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

rebase: modify tests to include commit's parent branch in log output

Benjamin Tan e5493e0f 749a2843

+451 -449
+451 -449
cli/tests/test_rebase_command.rs
··· 181 181 create_commit(&test_env, &repo_path, "e", &["a"]); 182 182 // Test the setup 183 183 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 184 - @ e 185 - │ ○ d 186 - │ │ ○ c 184 + @ e: a 185 + │ ○ d: b 186 + │ │ ○ c: b 187 187 │ ├─╯ 188 - │ ○ b 188 + │ ○ b: a 189 189 ├─╯ 190 190 ○ a 191 191 ◆ ··· 197 197 Rebased 3 commits 198 198 "###); 199 199 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 200 - ○ d 201 - │ ○ c 200 + ○ d: b 201 + │ ○ c: b 202 202 ├─╯ 203 - ○ b 204 - @ e 203 + ○ b: e 204 + @ e: a 205 205 ○ a 206 206 ◆ 207 207 "###); ··· 218 218 Added 1 files, modified 0 files, removed 0 files 219 219 "###); 220 220 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 221 - @ e 222 - │ ○ d 221 + @ e: b 222 + │ ○ d: b 223 223 ├─╯ 224 - │ ○ c 224 + │ ○ c: b 225 225 ├─╯ 226 - ○ b 226 + ○ b: a 227 227 ○ a 228 228 ◆ 229 229 "###); ··· 248 248 Added 1 files, modified 0 files, removed 0 files 249 249 "###); 250 250 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 251 - @ e 252 - │ ○ d 251 + @ e: b 252 + │ ○ d: b 253 253 ├─╯ 254 - │ ○ c 254 + │ ○ c: b 255 255 ├─╯ 256 - ○ b 256 + ○ b: a 257 257 ○ a 258 258 ◆ 259 259 "###); ··· 272 272 create_commit(&test_env, &repo_path, "e", &["a", "d"]); 273 273 // Test the setup 274 274 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 275 - @ e 275 + @ e: a d 276 276 ├─╮ 277 - │ ○ d 277 + │ ○ d: c 278 278 │ ○ c 279 - │ │ ○ b 279 + │ │ ○ b: a 280 280 ├───╯ 281 281 ○ │ a 282 282 ├─╯ ··· 293 293 Added 1 files, modified 0 files, removed 0 files 294 294 "###); 295 295 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 296 - @ e 296 + @ e: a d 297 297 ├─╮ 298 - │ ○ d 299 - │ ○ c 300 - │ ○ b 298 + │ ○ d: c 299 + │ ○ c: b 300 + │ ○ b: a 301 301 ├─╯ 302 302 ○ a 303 303 ◆ ··· 314 314 Added 1 files, modified 0 files, removed 0 files 315 315 "###); 316 316 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 317 - @ e 317 + @ e: a d 318 318 ├─╮ 319 - │ ○ d 320 - │ ○ c 321 - │ ○ b 319 + │ ○ d: c 320 + │ ○ c: b 321 + │ ○ b: a 322 322 ├─╯ 323 323 ○ a 324 324 ◆ ··· 338 338 create_commit(&test_env, &repo_path, "e", &["d"]); 339 339 // Test the setup 340 340 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 341 - @ e 342 - ○ d 341 + @ e: d 342 + ○ d: b c 343 343 ├─╮ 344 - │ ○ c 345 - ○ │ b 344 + │ ○ c: a 345 + ○ │ b: a 346 346 ├─╯ 347 347 ○ a 348 348 ◆ ··· 360 360 Added 0 files, modified 0 files, removed 1 files 361 361 "###); 362 362 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 363 - @ e 364 - ○ d 363 + @ e: d 364 + ○ d: b a 365 365 ├─╮ 366 - │ │ ○ c 366 + │ │ ○ c: b 367 367 ├───╯ 368 - ○ │ b 368 + ○ │ b: a 369 369 ├─╯ 370 370 ○ a 371 371 ◆ ··· 385 385 Added 0 files, modified 0 files, removed 1 files 386 386 "###); 387 387 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 388 - @ e 388 + @ e: b c 389 389 ├─╮ 390 - │ ○ c 391 - ○ │ b 390 + │ ○ c: a 391 + ○ │ b: a 392 392 ├─╯ 393 - │ ○ d 393 + │ ○ d: a 394 394 ├─╯ 395 395 ○ a 396 396 ◆ ··· 409 409 create_commit(&test_env, &repo_path, "d", &["a", "c"]); 410 410 // Test the setup 411 411 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 412 - @ d 412 + @ d: a c 413 413 ├─╮ 414 - │ ○ c 414 + │ ○ c: b 415 415 │ ○ b 416 416 ○ │ a 417 417 ├─╯ ··· 431 431 Added 0 files, modified 0 files, removed 1 files 432 432 "###); 433 433 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 434 - @ d 434 + @ d: a b 435 435 ├─╮ 436 436 │ ○ b 437 - │ │ ○ c 437 + │ │ ○ c: a 438 438 ├───╯ 439 439 ○ │ a 440 440 ├─╯ ··· 459 459 create_commit(&test_env, &repo_path, "i", &["f"]); 460 460 // Test the setup 461 461 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 462 - @ i 463 - │ ○ h 464 - │ ○ g 462 + @ i: f 463 + │ ○ h: g 464 + │ ○ g: f 465 465 ├─╯ 466 - ○ f 466 + ○ f: c e 467 467 ├─╮ 468 - │ ○ e 469 - │ ○ d 470 - ○ │ c 471 - ○ │ b 468 + │ ○ e: d 469 + │ ○ d: a 470 + ○ │ c: b 471 + ○ │ b: a 472 472 ├─╯ 473 473 ○ a 474 474 ◆ ··· 486 486 Added 0 files, modified 0 files, removed 2 files 487 487 "###); 488 488 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 489 - @ i 490 - │ ○ h 491 - │ ○ g 489 + @ i: f 490 + │ ○ h: g 491 + │ ○ g: f 492 492 ├─╯ 493 - ○ f 493 + ○ f: b d 494 494 ├─╮ 495 - │ ○ d 496 - ○ │ b 495 + │ ○ d: a 496 + ○ │ b: a 497 497 ├─╯ 498 - │ ○ e 498 + │ ○ e: a 499 499 ├─╯ 500 - │ ○ c 500 + │ ○ c: a 501 501 ├─╯ 502 502 ○ a 503 503 ◆ ··· 518 518 Added 0 files, modified 0 files, removed 2 files 519 519 "###); 520 520 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 521 - @ i 522 - │ ○ h 523 - │ ○ g 521 + @ i: f 522 + │ ○ h: g 523 + │ ○ g: f 524 524 ├─╯ 525 - ○ f 525 + ○ f: a e 526 526 ├─╮ 527 - │ │ ○ c 528 - │ │ ○ b 527 + │ │ ○ c: b 528 + │ │ ○ b: e 529 529 │ ├─╯ 530 - │ ○ e 531 - │ ○ d 530 + │ ○ e: d 531 + │ ○ d: a 532 532 ├─╯ 533 533 ○ a 534 534 ◆ ··· 549 549 Added 0 files, modified 0 files, removed 2 files 550 550 "###); 551 551 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 552 - @ i 552 + @ i: c d 553 553 ├─╮ 554 - │ │ ○ h 554 + │ │ ○ h: c d 555 555 ╭─┬─╯ 556 - │ ○ d 557 - ○ │ c 558 - ○ │ b 556 + │ ○ d: a 557 + ○ │ c: b 558 + ○ │ b: a 559 559 ├─╯ 560 - │ ○ g 561 - │ ○ f 562 - │ ○ e 560 + │ ○ g: f 561 + │ ○ f: e 562 + │ ○ e: a 563 563 ├─╯ 564 564 ○ a 565 565 ◆ ··· 584 584 Added 0 files, modified 0 files, removed 2 files 585 585 "###); 586 586 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 587 - @ i 587 + @ i: c e 588 588 ├─╮ 589 - │ │ ○ g 589 + │ │ ○ g: c e 590 590 ╭─┬─╯ 591 - │ ○ e 592 - ○ │ c 593 - │ │ ○ h 594 - │ │ ○ f 595 - │ │ ○ d 591 + │ ○ e: a 592 + ○ │ c: b 593 + │ │ ○ h: f 594 + │ │ ○ f: d 595 + │ │ ○ d: b 596 596 ├───╯ 597 - ○ │ b 597 + ○ │ b: a 598 598 ├─╯ 599 599 ○ a 600 600 ◆ ··· 612 612 Added 0 files, modified 0 files, removed 2 files 613 613 "###); 614 614 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 615 - ○ h 616 - ○ g 617 - │ ○ e 618 - │ ○ d 619 - │ @ i 615 + ○ h: g 616 + ○ g: f 617 + │ ○ e: d 618 + │ ○ d: i 619 + │ @ i: f 620 620 ├─╯ 621 - ○ f 621 + ○ f: c a 622 622 ├─╮ 623 - ○ │ c 624 - ○ │ b 623 + ○ │ c: b 624 + ○ │ b: a 625 625 ├─╯ 626 626 ○ a 627 627 ◆ ··· 640 640 create_commit(&test_env, &repo_path, "merge", &["b", "a"]); 641 641 // Test the setup 642 642 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 643 - @ merge 643 + @ merge: b a 644 644 ├─╮ 645 - │ ○ a 646 - ○ │ b 645 + │ ○ a: base 646 + ○ │ b: base 647 647 ├─╯ 648 648 ○ base 649 649 ◆ ··· 662 662 Added 0 files, modified 0 files, removed 1 files 663 663 "###); 664 664 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 665 - @ merge 665 + @ merge: b a 666 666 ├─╮ 667 667 ○ │ b 668 - │ │ ○ base 668 + │ │ ○ base: a 669 669 │ ├─╯ 670 670 │ ○ a 671 671 ├─╯ ··· 692 692 Added 0 files, modified 0 files, removed 1 files 693 693 "###); 694 694 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 695 - ○ base 696 - @ merge 695 + ○ base: merge 696 + @ merge: b a 697 697 ├─╮ 698 698 │ ○ a 699 699 ○ │ b ··· 731 731 Rebased 1 commits onto destination 732 732 "###); 733 733 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 734 - ○ a 734 + ○ a: b c 735 735 ├─╮ 736 736 │ @ c 737 737 ○ │ b ··· 755 755 Rebased 1 commits onto destination 756 756 "###); 757 757 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 758 - ○ a 758 + ○ a: c b 759 759 ├─╮ 760 760 │ ○ b 761 761 @ │ c ··· 775 775 ], 776 776 ); 777 777 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 778 - ○ a 778 + ○ a: c b 779 779 ├─╮ 780 780 │ ○ b 781 781 @ │ c ··· 818 818 create_commit(&test_env, &repo_path, "d", &["c"]); 819 819 // Test the setup 820 820 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 821 - @ d 822 - ○ c 821 + @ d: c 822 + ○ c: a b 823 823 ├─╮ 824 824 │ ○ b 825 825 ○ │ a ··· 835 835 Parent commit : royxmykx 57c7246a c | c 836 836 "###); 837 837 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 838 - @ d 839 - ○ c 838 + @ d: c 839 + ○ c: a b 840 840 ├─╮ 841 - │ ○ b 841 + │ ○ b: a 842 842 ├─╯ 843 843 ○ a 844 844 ◆ ··· 855 855 Added 0 files, modified 0 files, removed 2 files 856 856 "###); 857 857 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 858 - @ d 859 - │ ○ c 858 + @ d: a 859 + │ ○ c: a 860 860 ├─╯ 861 861 ○ a 862 862 │ ○ b ··· 867 867 test_env.jj_cmd_ok(&repo_path, &["undo"]); 868 868 // Reminder of the setup 869 869 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 870 - @ d 871 - ○ c 870 + @ d: c 871 + ○ c: a b 872 872 ├─╮ 873 873 │ ○ b 874 874 ○ │ a ··· 887 887 Added 0 files, modified 0 files, removed 2 files 888 888 "###); 889 889 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 890 - ○ c 890 + ○ c: a b 891 891 ├─╮ 892 - │ ○ b 892 + │ ○ b: a 893 893 ├─╯ 894 - │ @ d 894 + │ @ d: a 895 895 ├─╯ 896 896 ○ a 897 897 ◆ ··· 916 916 Added 0 files, modified 0 files, removed 2 files 917 917 "###); 918 918 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 919 - ○ c 919 + ○ c: a b 920 920 ├─╮ 921 - │ ○ b 921 + │ ○ b: a 922 922 ├─╯ 923 - │ @ d 923 + │ @ d: a 924 924 ├─╯ 925 925 ○ a 926 926 ◆ ··· 964 964 965 965 // Test the setup 966 966 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 967 - @ c 968 - ○ b 967 + @ c: b 968 + ○ b: base a 969 969 ├─╮ 970 - │ ○ a 970 + │ ○ a: base 971 971 ├─╯ 972 - ○ base 972 + ○ base: notroot 973 973 ○ notroot 974 974 ◆ 975 975 "###); ··· 983 983 Skipped rebase of 1 commits that were already in place 984 984 "###); 985 985 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 986 - @ c 987 - ○ b 986 + @ c: b 987 + ○ b: base a 988 988 ├─╮ 989 - │ ○ a 989 + │ ○ a: base 990 990 ├─╯ 991 - ○ base 991 + ○ base: notroot 992 992 ○ notroot 993 993 ◆ 994 994 "###); ··· 1001 1001 Skipped rebase of 1 commits that were already in place 1002 1002 "###); 1003 1003 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1004 - @ c 1005 - ○ b 1004 + @ c: b 1005 + ○ b: base a 1006 1006 ├─╮ 1007 - │ ○ a 1007 + │ ○ a: base 1008 1008 ├─╯ 1009 - ○ base 1009 + ○ base: notroot 1010 1010 ○ notroot 1011 1011 ◆ 1012 1012 "###); ··· 1022 1022 // Commit "a" should be rebased onto the root commit. Commit "b" should have 1023 1023 // "base" and "a" as parents as before. 1024 1024 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1025 - @ c 1026 - ○ b 1025 + @ c: b 1026 + ○ b: base a 1027 1027 ├─╮ 1028 1028 │ ○ a 1029 - ○ │ base 1029 + ○ │ base: notroot 1030 1030 ○ │ notroot 1031 1031 ├─╯ 1032 1032 ◆ ··· 1036 1036 // ====== Reminder of the setup ========= 1037 1037 test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]); 1038 1038 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1039 - @ c 1040 - ○ b 1039 + @ c: b 1040 + ○ b: base a 1041 1041 ├─╮ 1042 - │ ○ a 1042 + │ ○ a: base 1043 1043 ├─╯ 1044 - ○ base 1044 + ○ base: notroot 1045 1045 ○ notroot 1046 1046 ◆ 1047 1047 "###); ··· 1054 1054 Skipped rebase of 1 commits that were already in place 1055 1055 "###); 1056 1056 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1057 - @ c 1058 - ○ b 1057 + @ c: b 1058 + ○ b: base a 1059 1059 ├─╮ 1060 - │ ○ a 1060 + │ ○ a: base 1061 1061 ├─╯ 1062 - ○ base 1062 + ○ base: notroot 1063 1063 ○ notroot 1064 1064 ◆ 1065 1065 "###); ··· 1075 1075 // The commits in roots(a..c), i.e. commit "b" should be rebased onto "a", 1076 1076 // which means "b" loses its "base" parent 1077 1077 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1078 - @ c 1079 - ○ b 1080 - ○ a 1081 - ○ base 1078 + @ c: b 1079 + ○ b: a 1080 + ○ a: base 1081 + ○ base: notroot 1082 1082 ○ notroot 1083 1083 ◆ 1084 1084 "###); ··· 1091 1091 Skipped rebase of 1 commits that were already in place 1092 1092 "###); 1093 1093 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1094 - @ c 1095 - ○ b 1094 + @ c: b 1095 + ○ b: base a 1096 1096 ├─╮ 1097 - │ ○ a 1097 + │ ○ a: base 1098 1098 ├─╯ 1099 - ○ base 1099 + ○ base: notroot 1100 1100 ○ notroot 1101 1101 ◆ 1102 1102 "###); ··· 1105 1105 // ====== Reminder of the setup ========= 1106 1106 test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]); 1107 1107 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1108 - @ c 1109 - ○ b 1108 + @ c: b 1109 + ○ b: base a 1110 1110 ├─╮ 1111 - │ ○ a 1111 + │ ○ a: base 1112 1112 ├─╯ 1113 - ○ base 1113 + ○ base: notroot 1114 1114 ○ notroot 1115 1115 ◆ 1116 1116 "###); ··· 1127 1127 "###); 1128 1128 // The user would expect unsimplified ancestry here. 1129 1129 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1130 - @ c 1131 - ○ b 1130 + @ c: b 1131 + ○ b: notroot a 1132 1132 ├─╮ 1133 - │ ○ a 1133 + │ ○ a: notroot 1134 1134 ├─╯ 1135 1135 ○ notroot 1136 1136 │ ○ base ··· 1151 1151 Added 0 files, modified 0 files, removed 1 files 1152 1152 "###); 1153 1153 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1154 - @ c 1155 - │ ○ base 1154 + @ c: b 1155 + │ ○ base: b 1156 1156 ├─╯ 1157 - ○ b 1157 + ○ b: notroot a 1158 1158 ├─╮ 1159 - │ ○ a 1159 + │ ○ a: notroot 1160 1160 ├─╯ 1161 1161 ○ notroot 1162 1162 ◆ ··· 1175 1175 Added 0 files, modified 0 files, removed 1 files 1176 1176 "###); 1177 1177 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1178 - @ c 1179 - ○ b 1178 + @ c: b 1179 + ○ b: notroot a 1180 1180 ├─╮ 1181 - │ │ ○ base 1181 + │ │ ○ base: a 1182 1182 │ ├─╯ 1183 - │ ○ a 1183 + │ ○ a: notroot 1184 1184 ├─╯ 1185 1185 ○ notroot 1186 1186 ◆ ··· 1189 1189 test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]); 1190 1190 // ====== Reminder of the setup ========= 1191 1191 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1192 - @ c 1193 - ○ b 1192 + @ c: b 1193 + ○ b: base a 1194 1194 ├─╮ 1195 - │ ○ a 1195 + │ ○ a: base 1196 1196 ├─╯ 1197 - ○ base 1197 + ○ base: notroot 1198 1198 ○ notroot 1199 1199 ◆ 1200 1200 "###); ··· 1211 1211 // In this case, it is unclear whether the user would always prefer unsimplified 1212 1212 // ancestry (whether `b` should also be a direct child of the root commit). 1213 1213 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1214 - @ c 1215 - ○ b 1216 - ○ base 1214 + @ c: b 1215 + ○ b: base 1216 + ○ base: notroot 1217 1217 ○ notroot 1218 1218 │ ○ a 1219 1219 ├─╯ ··· 1233 1233 "###); 1234 1234 // The user would expect unsimplified ancestry here. 1235 1235 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1236 - @ c 1236 + @ c: base a 1237 1237 ├─╮ 1238 - │ ○ a 1238 + │ ○ a: base 1239 1239 ├─╯ 1240 - ○ base 1240 + ○ base: notroot 1241 1241 ○ notroot 1242 1242 │ ○ b 1243 1243 ├─╯ ··· 1258 1258 Added 0 files, modified 0 files, removed 1 files 1259 1259 "###); 1260 1260 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1261 - ○ b 1262 - @ c 1261 + ○ b: c 1262 + @ c: base a 1263 1263 ├─╮ 1264 - │ ○ a 1264 + │ ○ a: base 1265 1265 ├─╯ 1266 - ○ base 1266 + ○ base: notroot 1267 1267 ○ notroot 1268 1268 ◆ 1269 1269 "###); ··· 1280 1280 Added 0 files, modified 0 files, removed 1 files 1281 1281 "###); 1282 1282 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1283 - @ c 1284 - │ ○ b 1283 + @ c: a 1284 + │ ○ b: base a 1285 1285 ╭─┤ 1286 - ○ │ a 1286 + ○ │ a: base 1287 1287 ├─╯ 1288 - ○ base 1288 + ○ base: notroot 1289 1289 ○ notroot 1290 1290 ◆ 1291 1291 "###); ··· 1308 1308 create_commit(&test_env, &repo_path, "f", &["e"]); 1309 1309 // Test the setup 1310 1310 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1311 - @ f 1312 - ○ e 1313 - │ ○ d 1311 + @ f: e 1312 + ○ e: c 1313 + │ ○ d: c 1314 1314 ├─╯ 1315 - ○ c 1315 + ○ c: b2 b4 1316 1316 ├─╮ 1317 - │ ○ b4 1318 - │ ○ b3 1319 - ○ │ b2 1320 - ○ │ b1 1317 + │ ○ b4: b3 1318 + │ ○ b3: a 1319 + ○ │ b2: b1 1320 + ○ │ b1: a 1321 1321 ├─╯ 1322 1322 ○ a 1323 1323 ◆ ··· 1335 1335 Nothing changed. 1336 1336 "###); 1337 1337 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1338 - @ f 1339 - ○ e 1340 - │ ○ d 1338 + @ f: e 1339 + ○ e: c 1340 + │ ○ d: c 1341 1341 ├─╯ 1342 - ○ c 1342 + ○ c: b2 b4 1343 1343 ├─╮ 1344 - │ ○ b4 1345 - │ ○ b3 1346 - ○ │ b2 1347 - ○ │ b1 1344 + │ ○ b4: b3 1345 + │ ○ b3: a 1346 + ○ │ b2: b1 1347 + ○ │ b1: a 1348 1348 ├─╯ 1349 1349 ○ a 1350 1350 ◆ ··· 1358 1358 Nothing changed. 1359 1359 "###); 1360 1360 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1361 - @ f 1362 - ○ e 1363 - │ ○ d 1361 + @ f: e 1362 + ○ e: c 1363 + │ ○ d: c 1364 1364 ├─╯ 1365 - ○ c 1365 + ○ c: b2 b4 1366 1366 ├─╮ 1367 - │ ○ b4 1368 - │ ○ b3 1369 - ○ │ b2 1370 - ○ │ b1 1367 + │ ○ b4: b3 1368 + │ ○ b3: a 1369 + ○ │ b2: b1 1370 + ○ │ b1: a 1371 1371 ├─╯ 1372 1372 ○ a 1373 1373 ◆ ··· 1384 1384 Parent commit : kmkuslsw 754793f3 c | c 1385 1385 "###); 1386 1386 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1387 - @ f 1388 - ○ c 1389 - ○ e 1387 + @ f: c 1388 + ○ c: e 1389 + ○ e: b2 b4 1390 1390 ├─╮ 1391 - │ │ ○ d 1391 + │ │ ○ d: b2 b4 1392 1392 ╭─┬─╯ 1393 - │ ○ b4 1394 - │ ○ b3 1395 - ○ │ b2 1396 - ○ │ b1 1393 + │ ○ b4: b3 1394 + │ ○ b3: a 1395 + ○ │ b2: b1 1396 + ○ │ b1: a 1397 1397 ├─╯ 1398 1398 ○ a 1399 1399 ◆ ··· 1411 1411 Added 0 files, modified 0 files, removed 1 files 1412 1412 "###); 1413 1413 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1414 - ○ e 1415 - @ f 1416 - │ ○ d 1414 + ○ e: f 1415 + @ f: c 1416 + │ ○ d: c 1417 1417 ├─╯ 1418 - ○ c 1418 + ○ c: b2 b4 1419 1419 ├─╮ 1420 - │ ○ b4 1421 - │ ○ b3 1422 - ○ │ b2 1423 - ○ │ b1 1420 + │ ○ b4: b3 1421 + │ ○ b3: a 1422 + ○ │ b2: b1 1423 + ○ │ b1: a 1424 1424 ├─╯ 1425 1425 ○ a 1426 1426 ◆ ··· 1438 1438 Added 0 files, modified 0 files, removed 5 files 1439 1439 "###); 1440 1440 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1441 - ○ e 1442 - │ ○ d 1441 + ○ e: c 1442 + │ ○ d: c 1443 1443 ├─╯ 1444 - ○ c 1444 + ○ c: b2 b4 1445 1445 ├─╮ 1446 - │ ○ b4 1447 - │ ○ b3 1448 - ○ │ b2 1449 - @ │ f 1450 - ○ │ b1 1446 + │ ○ b4: b3 1447 + │ ○ b3: a 1448 + ○ │ b2: f 1449 + @ │ f: b1 1450 + ○ │ b1: a 1451 1451 ├─╯ 1452 1452 ○ a 1453 1453 ◆ ··· 1465 1465 Added 0 files, modified 0 files, removed 4 files 1466 1466 "###); 1467 1467 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1468 - ○ e 1469 - │ ○ d 1468 + ○ e: c 1469 + │ ○ d: c 1470 1470 ├─╯ 1471 - ○ c 1471 + ○ c: f b4 1472 1472 ├─╮ 1473 - │ ○ b4 1474 - │ ○ b3 1475 - @ │ f 1476 - ○ │ b2 1477 - ○ │ b1 1473 + │ ○ b4: b3 1474 + │ ○ b3: a 1475 + @ │ f: b2 1476 + ○ │ b2: b1 1477 + ○ │ b1: a 1478 1478 ├─╯ 1479 1479 ○ a 1480 1480 ◆ ··· 1494 1494 Added 0 files, modified 0 files, removed 1 files 1495 1495 "###); 1496 1496 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1497 - ○ e 1498 - │ ○ d 1497 + ○ e: f 1498 + │ ○ d: f 1499 1499 ├─╯ 1500 - @ f 1501 - ○ c 1500 + @ f: c 1501 + ○ c: b2 b4 1502 1502 ├─╮ 1503 - │ ○ b4 1504 - │ ○ b3 1505 - ○ │ b2 1506 - ○ │ b1 1503 + │ ○ b4: b3 1504 + │ ○ b3: a 1505 + ○ │ b2: b1 1506 + ○ │ b1: a 1507 1507 ├─╯ 1508 1508 ○ a 1509 1509 ◆ ··· 1524 1524 Added 1 files, modified 0 files, removed 0 files 1525 1525 "###); 1526 1526 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1527 - @ f 1527 + @ f: e d 1528 1528 ├─╮ 1529 - │ ○ d 1530 - ○ │ e 1529 + │ ○ d: c 1530 + ○ │ e: c 1531 1531 ├─╯ 1532 - ○ c 1532 + ○ c: b2 b4 1533 1533 ├─╮ 1534 - │ ○ b4 1535 - │ ○ b3 1536 - ○ │ b2 1537 - ○ │ b1 1534 + │ ○ b4: b3 1535 + │ ○ b3: a 1536 + ○ │ b2: b1 1537 + ○ │ b1: a 1538 1538 ├─╯ 1539 1539 ○ a 1540 1540 ◆ ··· 1555 1555 Added 1 files, modified 0 files, removed 0 files 1556 1556 "###); 1557 1557 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1558 - @ f 1559 - ○ c 1558 + @ f: c 1559 + ○ c: b2 b4 1560 1560 ├─╮ 1561 - │ ○ b4 1562 - │ ○ b3 1561 + │ ○ b4: b3 1562 + │ ○ b3: d e 1563 1563 │ ├─╮ 1564 - ○ │ │ b2 1565 - ○ │ │ b1 1564 + ○ │ │ b2: b1 1565 + ○ │ │ b1: d e 1566 1566 ╰─┬─╮ 1567 - │ ○ e 1568 - ○ │ d 1567 + │ ○ e: a 1568 + ○ │ d: a 1569 1569 ├─╯ 1570 1570 ○ a 1571 1571 ◆ ··· 1587 1587 Added 0 files, modified 0 files, removed 3 files 1588 1588 "###); 1589 1589 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1590 - ○ d 1590 + ○ d: b1 b3 1591 1591 ├─╮ 1592 - │ │ ○ c 1592 + │ │ ○ c: b2 b4 1593 1593 │ │ ├─╮ 1594 - │ │ │ ○ b4 1595 - │ │ ○ │ b2 1594 + │ │ │ ○ b4: f 1595 + │ │ ○ │ b2: f 1596 1596 │ │ ├─╯ 1597 - │ │ @ f 1598 - │ │ ○ e 1597 + │ │ @ f: e 1598 + │ │ ○ e: b1 b3 1599 1599 ╭─┬─╯ 1600 - │ ○ b3 1601 - ○ │ b1 1600 + │ ○ b3: a 1601 + ○ │ b1: a 1602 1602 ├─╯ 1603 1603 ○ a 1604 1604 ◆ ··· 1617 1617 Added 1 files, modified 0 files, removed 0 files 1618 1618 "###); 1619 1619 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1620 - @ f 1621 - ○ e 1622 - ○ d 1623 - ○ c 1624 - ○ b2 1625 - ○ b1 1620 + @ f: e 1621 + ○ e: d 1622 + ○ d: c 1623 + ○ c: b2 1624 + ○ b2: b1 1625 + ○ b1: a b4 1626 1626 ├─╮ 1627 - │ ○ b4 1628 - │ ○ b3 1627 + │ ○ b4: b3 1628 + │ ○ b3: a 1629 1629 ├─╯ 1630 1630 ○ a 1631 1631 ◆ ··· 1647 1647 Added 0 files, modified 0 files, removed 2 files 1648 1648 "###); 1649 1649 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1650 - @ f 1651 - │ ○ e 1652 - │ ○ b2 1653 - │ ○ d 1650 + @ f: c 1651 + │ ○ e: b2 1652 + │ ○ b2: d 1653 + │ ○ d: c 1654 1654 ├─╯ 1655 - ○ c 1655 + ○ c: b1 b4 1656 1656 ├─╮ 1657 - │ ○ b4 1658 - │ ○ b3 1659 - ○ │ b1 1657 + │ ○ b4: b3 1658 + │ ○ b3: a 1659 + ○ │ b1: a 1660 1660 ├─╯ 1661 1661 ○ a 1662 1662 ◆ ··· 1690 1690 create_commit(&test_env, &repo_path, "f", &["e"]); 1691 1691 // Test the setup 1692 1692 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1693 - @ f 1694 - ○ e 1695 - │ ○ d 1693 + @ f: e 1694 + ○ e: c 1695 + │ ○ d: c 1696 1696 ├─╯ 1697 - ○ c 1697 + ○ c: b2 b4 1698 1698 ├─╮ 1699 - │ ○ b4 1700 - │ ○ b3 1701 - ○ │ b2 1702 - ○ │ b1 1699 + │ ○ b4: b3 1700 + │ ○ b3: a 1701 + ○ │ b2: b1 1702 + ○ │ b1: a 1703 1703 ├─╯ 1704 1704 ○ a 1705 1705 ◆ ··· 1717 1717 Nothing changed. 1718 1718 "###); 1719 1719 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1720 - @ f 1721 - ○ e 1722 - │ ○ d 1720 + @ f: e 1721 + ○ e: c 1722 + │ ○ d: c 1723 1723 ├─╯ 1724 - ○ c 1724 + ○ c: b2 b4 1725 1725 ├─╮ 1726 - │ ○ b4 1727 - │ ○ b3 1728 - ○ │ b2 1729 - ○ │ b1 1726 + │ ○ b4: b3 1727 + │ ○ b3: a 1728 + ○ │ b2: b1 1729 + ○ │ b1: a 1730 1730 ├─╯ 1731 1731 ○ a 1732 1732 ◆ ··· 1740 1740 Nothing changed. 1741 1741 "###); 1742 1742 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1743 - @ f 1744 - ○ e 1745 - │ ○ d 1743 + @ f: e 1744 + ○ e: c 1745 + │ ○ d: c 1746 1746 ├─╯ 1747 - ○ c 1747 + ○ c: b2 b4 1748 1748 ├─╮ 1749 - │ ○ b4 1750 - │ ○ b3 1751 - ○ │ b2 1752 - ○ │ b1 1749 + │ ○ b4: b3 1750 + │ ○ b3: a 1751 + ○ │ b2: b1 1752 + ○ │ b1: a 1753 1753 ├─╯ 1754 1754 ○ a 1755 1755 ◆ ··· 1772 1772 Parent commit : nkmrtpmo e9a28d4b e | e 1773 1773 "###); 1774 1774 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1775 - @ f 1776 - ○ e 1775 + @ f: e 1776 + ○ e: b2 b4 1777 1777 ├─╮ 1778 - │ │ ○ d 1778 + │ │ ○ d: b2 b4 1779 1779 ╭─┬─╯ 1780 - │ ○ b4 1781 - │ ○ b3 1782 - ○ │ b2 1783 - ○ │ b1 1780 + │ ○ b4: b3 1781 + │ ○ b3: a 1782 + ○ │ b2: b1 1783 + ○ │ b1: a 1784 1784 ├─╯ 1785 - ○ a 1785 + ○ a: c 1786 1786 ○ c 1787 1787 ◆ 1788 1788 "###); ··· 1799 1799 Added 0 files, modified 0 files, removed 1 files 1800 1800 "###); 1801 1801 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1802 - ○ e 1803 - @ f 1804 - │ ○ d 1802 + ○ e: f 1803 + @ f: c 1804 + │ ○ d: c 1805 1805 ├─╯ 1806 - ○ c 1806 + ○ c: b2 b4 1807 1807 ├─╮ 1808 - │ ○ b4 1809 - │ ○ b3 1810 - ○ │ b2 1811 - ○ │ b1 1808 + │ ○ b4: b3 1809 + │ ○ b3: a 1810 + ○ │ b2: b1 1811 + ○ │ b1: a 1812 1812 ├─╯ 1813 1813 ○ a 1814 1814 ◆ ··· 1826 1826 Added 0 files, modified 0 files, removed 5 files 1827 1827 "###); 1828 1828 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1829 - ○ e 1830 - │ ○ d 1829 + ○ e: c 1830 + │ ○ d: c 1831 1831 ├─╯ 1832 - ○ c 1832 + ○ c: b2 b4 1833 1833 ├─╮ 1834 - │ ○ b4 1835 - │ ○ b3 1836 - ○ │ b2 1837 - @ │ f 1838 - ○ │ b1 1834 + │ ○ b4: b3 1835 + │ ○ b3: a 1836 + ○ │ b2: f 1837 + @ │ f: b1 1838 + ○ │ b1: a 1839 1839 ├─╯ 1840 1840 ○ a 1841 1841 ◆ ··· 1853 1853 Added 0 files, modified 0 files, removed 6 files 1854 1854 "###); 1855 1855 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1856 - ○ e 1857 - │ ○ d 1856 + ○ e: c 1857 + │ ○ d: c 1858 1858 ├─╯ 1859 - ○ c 1859 + ○ c: b2 b4 1860 1860 ├─╮ 1861 - │ ○ b4 1862 - │ ○ b3 1863 - ○ │ b2 1864 - ○ │ b1 1865 - @ │ f 1861 + │ ○ b4: b3 1862 + │ ○ b3: a 1863 + ○ │ b2: b1 1864 + ○ │ b1: f 1865 + @ │ f: a 1866 1866 ├─╯ 1867 1867 ○ a 1868 1868 ◆ ··· 1883 1883 Added 0 files, modified 0 files, removed 2 files 1884 1884 "###); 1885 1885 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1886 - ○ e 1887 - │ ○ d 1886 + ○ e: c 1887 + │ ○ d: c 1888 1888 ├─╯ 1889 - ○ c 1890 - @ f 1889 + ○ c: f 1890 + @ f: b2 b4 1891 1891 ├─╮ 1892 - │ ○ b4 1893 - │ ○ b3 1894 - ○ │ b2 1895 - ○ │ b1 1892 + │ ○ b4: b3 1893 + │ ○ b3: a 1894 + ○ │ b2: b1 1895 + ○ │ b1: a 1896 1896 ├─╯ 1897 1897 ○ a 1898 1898 ◆ ··· 1912 1912 Parent commit : nkmrtpmo fd26fbd4 e | e 1913 1913 "###); 1914 1914 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1915 - @ f 1916 - ○ e 1917 - │ ○ d 1915 + @ f: e 1916 + ○ e: b1 1917 + │ ○ d: b1 1918 1918 ├─╯ 1919 - ○ b1 1920 - ○ c 1919 + ○ b1: c 1920 + ○ c: b2 b4 1921 1921 ├─╮ 1922 - │ ○ b4 1923 - │ ○ b3 1924 - ○ │ b2 1922 + │ ○ b4: b3 1923 + │ ○ b3: a 1924 + ○ │ b2: a 1925 1925 ├─╯ 1926 1926 ○ a 1927 1927 ◆ ··· 1944 1944 Added 0 files, modified 0 files, removed 4 files 1945 1945 "###); 1946 1946 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1947 - ○ e 1948 - │ ○ d 1947 + ○ e: c 1948 + │ ○ d: c 1949 1949 ├─╯ 1950 - ○ c 1950 + ○ c: b2 b4 1951 1951 ├─╮ 1952 - │ ○ b4 1953 - ○ │ b2 1952 + │ ○ b4: f 1953 + ○ │ b2: f 1954 1954 ├─╯ 1955 - @ f 1955 + @ f: b1 b3 1956 1956 ├─╮ 1957 - │ ○ b3 1958 - ○ │ b1 1957 + │ ○ b3: a 1958 + ○ │ b1: a 1959 1959 ├─╯ 1960 1960 ○ a 1961 1961 ◆ ··· 1976 1976 Parent commit : nkmrtpmo b5933877 e | e 1977 1977 "###); 1978 1978 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 1979 - @ f 1980 - ○ e 1981 - │ ○ d 1979 + @ f: e 1980 + ○ e: c 1981 + │ ○ d: c 1982 1982 ├─╯ 1983 - ○ c 1983 + ○ c: b1 b3 1984 1984 ├─╮ 1985 - │ ○ b3 1986 - ○ │ b1 1985 + │ ○ b3: a 1986 + ○ │ b1: a 1987 1987 ├─╯ 1988 - ○ a 1988 + ○ a: b2 b4 1989 1989 ├─╮ 1990 1990 │ ○ b4 1991 1991 ○ │ b2 ··· 2007 2007 Parent commit : nkmrtpmo e31053d1 e | e 2008 2008 "###); 2009 2009 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2010 - @ f 2011 - ○ e 2012 - ○ c 2010 + @ f: e 2011 + ○ e: c 2012 + ○ c: b2 b4 2013 2013 ├─╮ 2014 - │ ○ b4 2014 + │ ○ b4: b1 b3 2015 2015 │ ├─╮ 2016 - ○ │ │ b2 2016 + ○ │ │ b2: b1 b3 2017 2017 ╰─┬─╮ 2018 - ○ │ │ d 2018 + ○ │ │ d: b1 b3 2019 2019 ╰─┬─╮ 2020 - │ ○ b3 2021 - ○ │ b1 2020 + │ ○ b3: a 2021 + ○ │ b1: a 2022 2022 ├─╯ 2023 2023 ○ a 2024 2024 ◆ ··· 2039 2039 Parent commit : kmkuslsw c0fd979a c | c 2040 2040 "###); 2041 2041 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2042 - @ f 2043 - │ ○ d 2042 + @ f: c 2043 + │ ○ d: c 2044 2044 ├─╯ 2045 - ○ c 2045 + ○ c: b2 b4 2046 2046 ├─╮ 2047 - │ ○ b4 2048 - │ ○ b3 2049 - ○ │ b2 2047 + │ ○ b4: b3 2048 + │ ○ b3: a 2049 + ○ │ b2: a 2050 2050 ├─╯ 2051 - ○ a 2052 - ○ e 2051 + ○ a: e 2052 + ○ e: b1 2053 2053 ○ b1 2054 2054 ◆ 2055 2055 "###); ··· 2080 2080 create_commit(&test_env, &repo_path, "f", &["e"]); 2081 2081 // Test the setup 2082 2082 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2083 - @ f 2084 - ○ e 2085 - │ ○ d 2083 + @ f: e 2084 + ○ e: c 2085 + │ ○ d: c 2086 2086 ├─╯ 2087 - ○ c 2087 + ○ c: b1 b2 2088 2088 ├─╮ 2089 - │ ○ b2 2090 - ○ │ b1 2089 + │ ○ b2: a 2090 + ○ │ b1: a 2091 2091 ├─╯ 2092 2092 ○ a 2093 2093 ◆ ··· 2109 2109 Added 1 files, modified 0 files, removed 0 files 2110 2110 "###); 2111 2111 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2112 - @ f 2113 - ○ d 2114 - ○ e 2115 - ○ c 2112 + @ f: d 2113 + ○ d: e 2114 + ○ e: c 2115 + ○ c: b1 b2 2116 2116 ├─╮ 2117 - │ ○ b2 2118 - ○ │ b1 2117 + │ ○ b2: a 2118 + ○ │ b1: a 2119 2119 ├─╯ 2120 2120 ○ a 2121 2121 ◆ ··· 2138 2138 Added 1 files, modified 0 files, removed 0 files 2139 2139 "###); 2140 2140 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2141 - @ f 2141 + @ f: e d 2142 2142 ├─╮ 2143 - │ ○ d 2144 - ○ │ e 2145 - ○ │ c 2143 + │ ○ d: a 2144 + ○ │ e: c 2145 + ○ │ c: b1 b2 2146 2146 ├───╮ 2147 - │ │ ○ b2 2147 + │ │ ○ b2: a 2148 2148 │ ├─╯ 2149 - ○ │ b1 2149 + ○ │ b1: a 2150 2150 ├─╯ 2151 2151 ○ a 2152 2152 ◆ ··· 2170 2170 Added 1 files, modified 0 files, removed 0 files 2171 2171 "###); 2172 2172 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2173 - @ f 2174 - ○ e 2173 + @ f: e 2174 + ○ e: b1 b2 c 2175 2175 ├─┬─╮ 2176 - │ │ ○ c 2177 - │ │ ○ d 2176 + │ │ ○ c: d 2177 + │ │ ○ d: b1 b2 2178 2178 ╭─┬─╯ 2179 - │ ○ b2 2180 - ○ │ b1 2179 + │ ○ b2: a 2180 + ○ │ b1: a 2181 2181 ├─╯ 2182 2182 ○ a 2183 2183 ◆ ··· 2206 2206 Added 1 files, modified 0 files, removed 0 files 2207 2207 "###); 2208 2208 insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" 2209 - @ f 2209 + @ f: b1 b2 d e 2210 2210 ├─┬─┬─╮ 2211 - │ │ │ ○ e 2212 - │ │ ○ │ d 2211 + │ │ │ ○ e: c 2212 + │ │ ○ │ d: c 2213 2213 │ │ ├─╯ 2214 - │ │ ○ c 2215 - │ ○ │ b2 2214 + │ │ ○ c: a 2215 + │ ○ │ b2: a 2216 2216 │ ├─╯ 2217 - ○ │ b1 2217 + ○ │ b1: a 2218 2218 ├─╯ 2219 2219 ○ a 2220 2220 ◆ ··· 2289 2289 create_commit(&test_env, &repo_path, "f", &["e"]); 2290 2290 // Test the setup 2291 2291 insta::assert_snapshot!(get_long_log_output(&test_env, &repo_path), @r###" 2292 - @ f lylxulpl 88f778c5 2293 - ○ e kmkuslsw 48dd9e3f 2294 - │ ○ d znkkpsqq 92438fc9 2292 + @ f lylxulpl 88f778c5: e 2293 + ○ e kmkuslsw 48dd9e3f: c 2294 + │ ○ d znkkpsqq 92438fc9: c 2295 2295 ├─╯ 2296 - ○ c vruxwmqv c41e416e 2296 + ○ c vruxwmqv c41e416e: b1 b2 2297 2297 ├─╮ 2298 - │ ○ b2 royxmykx 903ab0d6 2299 - ○ │ b1 zsuskuln 072d5ae1 2298 + │ ○ b2 royxmykx 903ab0d6: a 2299 + ○ │ b1 zsuskuln 072d5ae1: a 2300 2300 ├─╯ 2301 2301 ○ a rlvkpnrz 2443ea76 2302 2302 ◆ zzzzzzzz 00000000 ··· 2309 2309 Skipped rebase of 2 commits that were already in place 2310 2310 "###); 2311 2311 insta::assert_snapshot!(get_long_log_output(&test_env, &repo_path), @r###" 2312 - @ f lylxulpl 88f778c5 2313 - ○ e kmkuslsw 48dd9e3f 2314 - │ ○ d znkkpsqq 92438fc9 2312 + @ f lylxulpl 88f778c5: e 2313 + ○ e kmkuslsw 48dd9e3f: c 2314 + │ ○ d znkkpsqq 92438fc9: c 2315 2315 ├─╯ 2316 - ○ c vruxwmqv c41e416e 2316 + ○ c vruxwmqv c41e416e: b1 b2 2317 2317 ├─╮ 2318 - │ ○ b2 royxmykx 903ab0d6 2319 - ○ │ b1 zsuskuln 072d5ae1 2318 + │ ○ b2 royxmykx 903ab0d6: a 2319 + ○ │ b1 zsuskuln 072d5ae1: a 2320 2320 ├─╯ 2321 2321 ○ a rlvkpnrz 2443ea76 2322 2322 ◆ zzzzzzzz 00000000 ··· 2330 2330 Skipped rebase of 1 commits that were already in place 2331 2331 "###); 2332 2332 insta::assert_snapshot!(get_long_log_output(&test_env, &repo_path), @r###" 2333 - @ f lylxulpl 88f778c5 2334 - ○ e kmkuslsw 48dd9e3f 2335 - │ ○ d znkkpsqq 92438fc9 2333 + @ f lylxulpl 88f778c5: e 2334 + ○ e kmkuslsw 48dd9e3f: c 2335 + │ ○ d znkkpsqq 92438fc9: c 2336 2336 ├─╯ 2337 - ○ c vruxwmqv c41e416e 2337 + ○ c vruxwmqv c41e416e: b1 b2 2338 2338 ├─╮ 2339 - │ ○ b2 royxmykx 903ab0d6 2340 - ○ │ b1 zsuskuln 072d5ae1 2339 + │ ○ b2 royxmykx 903ab0d6: a 2340 + ○ │ b1 zsuskuln 072d5ae1: a 2341 2341 ├─╯ 2342 2342 ○ a rlvkpnrz 2443ea76 2343 2343 ◆ zzzzzzzz 00000000 ··· 2351 2351 Nothing changed. 2352 2352 "###); 2353 2353 insta::assert_snapshot!(get_long_log_output(&test_env, &repo_path), @r###" 2354 - @ f lylxulpl 88f778c5 2355 - ○ e kmkuslsw 48dd9e3f 2356 - │ ○ d znkkpsqq 92438fc9 2354 + @ f lylxulpl 88f778c5: e 2355 + ○ e kmkuslsw 48dd9e3f: c 2356 + │ ○ d znkkpsqq 92438fc9: c 2357 2357 ├─╯ 2358 - ○ c vruxwmqv c41e416e 2358 + ○ c vruxwmqv c41e416e: b1 b2 2359 2359 ├─╮ 2360 - │ ○ b2 royxmykx 903ab0d6 2361 - ○ │ b1 zsuskuln 072d5ae1 2360 + │ ○ b2 royxmykx 903ab0d6: a 2361 + ○ │ b1 zsuskuln 072d5ae1: a 2362 2362 ├─╯ 2363 2363 ○ a rlvkpnrz 2443ea76 2364 2364 ◆ zzzzzzzz 00000000 ··· 2375 2375 Added 0 files, modified 0 files, removed 1 files 2376 2376 "###); 2377 2377 insta::assert_snapshot!(get_long_log_output(&test_env, &repo_path), @r###" 2378 - @ f lylxulpl 77cb229f 2379 - │ ○ e kmkuslsw 48dd9e3f 2378 + @ f lylxulpl 77cb229f: c 2379 + │ ○ e kmkuslsw 48dd9e3f: c 2380 2380 ├─╯ 2381 - │ ○ d znkkpsqq 92438fc9 2381 + │ ○ d znkkpsqq 92438fc9: c 2382 2382 ├─╯ 2383 - ○ c vruxwmqv c41e416e 2383 + ○ c vruxwmqv c41e416e: b1 b2 2384 2384 ├─╮ 2385 - │ ○ b2 royxmykx 903ab0d6 2386 - ○ │ b1 zsuskuln 072d5ae1 2385 + │ ○ b2 royxmykx 903ab0d6: a 2386 + ○ │ b1 zsuskuln 072d5ae1: a 2387 2387 ├─╯ 2388 2388 ○ a rlvkpnrz 2443ea76 2389 2389 ◆ zzzzzzzz 00000000 ··· 2391 2391 } 2392 2392 2393 2393 fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String { 2394 - test_env.jj_cmd_success(repo_path, &["log", "-T", "branches"]) 2394 + let template = "branches ++ surround(': ', '', parents.map(|c| c.branches()))"; 2395 + test_env.jj_cmd_success(repo_path, &["log", "-T", template]) 2395 2396 } 2396 2397 2397 2398 fn get_long_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String { 2398 - let template = r#"description.first_line() ++ " " ++ change_id.shortest(8) ++ " " ++ commit_id.shortest(8)"#; 2399 + let template = "branches ++ ' ' ++ change_id.shortest(8) ++ ' ' ++ commit_id.shortest(8) ++ \ 2400 + surround(': ', '', parents.map(|c| c.branches()))"; 2399 2401 test_env.jj_cmd_success(repo_path, &["log", "-T", template]) 2400 2402 }