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 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547
|
// Copyright 2022 The Jujutsu Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use std::path::PathBuf;
use test_case::test_case;
use crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[must_use]
fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"separate(" ", change_id.short(), empty, local_bookmarks, description)"#;
work_dir.run_jj(["log", "-T", template])
}
#[must_use]
fn get_log_with_summary(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"separate(" ", change_id.short(), local_bookmarks, description)"#;
work_dir.run_jj(["log", "-T", template, "--summary"])
}
#[must_use]
fn get_workspace_log_output(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"separate(" ", change_id.short(), working_copies, description)"#;
work_dir.run_jj(["log", "-T", template, "-r", "all()"])
}
#[must_use]
fn get_recorded_dates(work_dir: &TestWorkDir, revset: &str) -> CommandOutput {
let template = r#"separate("\n", "Author date: " ++ author.timestamp(), "Committer date: " ++ committer.timestamp())"#;
work_dir.run_jj(["log", "--no-graph", "-T", template, "-r", revset])
}
#[test]
fn test_split_by_paths() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo");
work_dir.write_file("file2", "foo");
work_dir.write_file("file3", "foo");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ qpvuntsmwlqt false
◆ zzzzzzzzzzzz true
[EOF]
");
insta::assert_snapshot!(get_recorded_dates(&work_dir, "@"), @r"
Author date: 2001-02-03 04:05:08.000 +07:00
Committer date: 2001-02-03 04:05:08.000 +07:00[EOF]
");
std::fs::write(
&edit_script,
["dump editor0", "next invocation\n", "dump editor1"].join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Selected changes : qpvuntsm 6dbc7747 (no description set)
Remaining changes: zsuskuln 42cbbc02 (no description set)
Working copy (@) now at: zsuskuln 42cbbc02 (no description set)
Parent commit (@-) : qpvuntsm 6dbc7747 (no description set)
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
JJ: This commit contains the following changes:
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
assert!(!test_env.env_root().join("editor1").exists());
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr false
○ qpvuntsmwlqt false
◆ zzzzzzzzzzzz true
[EOF]
");
// The author dates of the new commits should be inherited from the commit being
// split. The committer dates should be newer.
insta::assert_snapshot!(get_recorded_dates(&work_dir, "@"), @r"
Author date: 2001-02-03 04:05:08.000 +07:00
Committer date: 2001-02-03 04:05:10.000 +07:00[EOF]
");
insta::assert_snapshot!(get_recorded_dates(&work_dir, "@-"), @r"
Author date: 2001-02-03 04:05:08.000 +07:00
Committer date: 2001-02-03 04:05:10.000 +07:00[EOF]
");
let output = work_dir.run_jj(["diff", "-s", "-r", "@-"]);
insta::assert_snapshot!(output, @r"
A file2
[EOF]
");
let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @r"
A file1
A file3
[EOF]
");
// Insert an empty commit after @- with "split ."
std::fs::write(&edit_script, "").unwrap();
let output = work_dir.run_jj(["split", "-r", "@-", "."]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: All changes have been selected, so the original revision will become empty
Rebased 1 descendant commits
Selected changes : qpvuntsm 9fd1c9e1 (no description set)
Remaining changes: znkkpsqq 41e0da21 (empty) (no description set)
Working copy (@) now at: zsuskuln a06e40b8 (no description set)
Parent commit (@-) : znkkpsqq 41e0da21 (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr false
○ znkkpsqqskkl true
○ qpvuntsmwlqt false
◆ zzzzzzzzzzzz true
[EOF]
");
let output = work_dir.run_jj(["diff", "-s", "-r", "@--"]);
insta::assert_snapshot!(output, @r"
A file2
[EOF]
");
// Remove newly created empty commit
work_dir.run_jj(["abandon", "@-"]).success();
// Insert an empty commit before @- with "split nonexistent"
std::fs::write(&edit_script, "").unwrap();
let output = work_dir.run_jj(["split", "-r", "@-", "nonexistent"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: No changes have been selected, so the new revision will be empty
Rebased 1 descendant commits
Selected changes : qpvuntsm 49416632 (empty) (no description set)
Remaining changes: lylxulpl 718afbf5 (no description set)
Working copy (@) now at: zsuskuln 0ed53ee6 (no description set)
Parent commit (@-) : lylxulpl 718afbf5 (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr false
○ lylxulplsnyw false
○ qpvuntsmwlqt true
◆ zzzzzzzzzzzz true
[EOF]
");
let output = work_dir.run_jj(["diff", "-s", "-r", "@-"]);
insta::assert_snapshot!(output, @r"
A file2
[EOF]
");
}
#[test]
fn test_split_with_non_empty_description() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.run_jj(["describe", "-m", "test"]).success();
std::fs::write(
edit_script,
[
"dump editor1",
"write\npart 1",
"next invocation\n",
"dump editor2",
"write\npart 2",
]
.join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "file1"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
Selected changes : qpvuntsm c7f7b14b part 1
Remaining changes: kkmpptxz ac33a5a9 part 2
Working copy (@) now at: kkmpptxz ac33a5a9 part 2
Parent commit (@-) : qpvuntsm c7f7b14b part 1
[EOF]
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
test
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#"
JJ: Enter a description for the remaining changes.
test
JJ: This commit contains the following changes:
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ kkmpptxzrspx false part 2
○ qpvuntsmwlqt false part 1
◆ zzzzzzzzzzzz true
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
}
#[test]
fn test_split_with_default_description() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
std::fs::write(
edit_script,
["dump editor1", "next invocation\n", "dump editor2"].join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "file1"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
Selected changes : qpvuntsm ff633dcc TESTED=TODO
Remaining changes: rlvkpnrz b1d20b7e (no description set)
Working copy (@) now at: rlvkpnrz b1d20b7e (no description set)
Parent commit (@-) : qpvuntsm ff633dcc TESTED=TODO
[EOF]
"#);
// Since the commit being split has no description, the user will only be
// prompted to add a description to the first commit, which will use the
// default value we set. The second commit will inherit the empty
// description from the commit being split.
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
TESTED=TODO
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
assert!(!test_env.env_root().join("editor2").exists());
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ rlvkpnrzqnoo false
○ qpvuntsmwlqt false TESTED=TODO
◆ zzzzzzzzzzzz true
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
}
#[test]
fn test_split_with_descendants() {
// Configure the environment and make the initial commits.
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// First commit. This is the one we will split later.
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir
.run_jj(["commit", "-m", "Add file1 & file2"])
.success();
// Second commit.
work_dir.write_file("file3", "baz\n");
work_dir.run_jj(["commit", "-m", "Add file3"]).success();
// Third commit.
work_dir.write_file("file4", "foobarbaz\n");
work_dir.run_jj(["describe", "-m", "Add file4"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r###"
@ kkmpptxzrspx false Add file4
○ rlvkpnrzqnoo false Add file3
○ qpvuntsmwlqt false Add file1 & file2
◆ zzzzzzzzzzzz true
[EOF]
"###);
// Set up the editor and do the split.
std::fs::write(
edit_script,
[
"dump editor1",
"write\nAdd file1",
"next invocation\n",
"dump editor2",
"write\nAdd file2",
]
.join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "file1", "-r", "qpvu"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Selected changes : qpvuntsm 74306e35 Add file1
Remaining changes: royxmykx 0a37745e Add file2
Working copy (@) now at: kkmpptxz 7ee84812 Add file4
Parent commit (@-) : rlvkpnrz d335bd94 Add file3
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r###"
@ kkmpptxzrspx false Add file4
○ rlvkpnrzqnoo false Add file3
○ royxmykxtrkr false Add file2
○ qpvuntsmwlqt false Add file1
◆ zzzzzzzzzzzz true
[EOF]
"###);
// The commit we're splitting has a description, so the user will be
// prompted to enter a description for each of the commits.
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
Add file1 & file2
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#"
JJ: Enter a description for the remaining changes.
Add file1 & file2
JJ: This commit contains the following changes:
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
// Check the evolog for the first commit. It shows four entries:
// - The initial empty commit.
// - The rewritten commit from the snapshot after the files were added.
// - The rewritten commit once the description is added during `jj commit`.
// - The rewritten commit after the split.
let evolog_1 = work_dir.run_jj(["evolog", "-r", "qpvun"]);
insta::assert_snapshot!(evolog_1, @r"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 74306e35
│ Add file1
│ -- operation 994b490f285d (2001-02-03 08:05:12) split commit 1d2499e72cefc8a2b87ebb47569140857b96189f
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 1d2499e7
│ Add file1 & file2
│ -- operation adf4f33386c9 (2001-02-03 08:05:08) commit f5700f8ef89e290e4e90ae6adc0908707e0d8c85
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
│ -- operation 78ead2155fcc (2001-02-03 08:05:08) snapshot working copy
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
// The evolog for the second commit is the same, except that the change id
// changes after the split.
let evolog_2 = work_dir.run_jj(["evolog", "-r", "royxm"]);
insta::assert_snapshot!(evolog_2, @r"
○ royxmykx test.user@example.com 2001-02-03 08:05:12 0a37745e
│ Add file2
│ -- operation 994b490f285d (2001-02-03 08:05:12) split commit 1d2499e72cefc8a2b87ebb47569140857b96189f
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 1d2499e7
│ Add file1 & file2
│ -- operation adf4f33386c9 (2001-02-03 08:05:08) commit f5700f8ef89e290e4e90ae6adc0908707e0d8c85
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
│ -- operation 78ead2155fcc (2001-02-03 08:05:08) snapshot working copy
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
}
// This test makes sure that the children of the commit being split retain any
// other parents which weren't involved in the split.
#[test]
fn test_split_with_merge_child() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.run_jj(["describe", "-m=1"]).success();
work_dir.run_jj(["new", "root()", "-m=a"]).success();
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir
.run_jj(["new", "description(1)", "description(a)", "-m=2"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr true 2
├─╮
│ ○ kkmpptxzrspx false a
○ │ qpvuntsmwlqt true 1
├─╯
◆ zzzzzzzzzzzz true
[EOF]
");
// Set up the editor and do the split.
std::fs::write(
edit_script,
["write\nAdd file1", "next invocation\n", "write\nAdd file2"].join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "-r", "description(a)", "file1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Selected changes : kkmpptxz cc199567 Add file1
Remaining changes: royxmykx e488409f Add file2
Working copy (@) now at: zsuskuln ace61421 (empty) 2
Parent commit (@-) : qpvuntsm 884fe9b9 (empty) 1
Parent commit (@-) : royxmykx e488409f Add file2
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr true 2
├─╮
│ ○ royxmykxtrkr false Add file2
│ ○ kkmpptxzrspx false Add file1
○ │ qpvuntsmwlqt true 1
├─╯
◆ zzzzzzzzzzzz true
[EOF]
");
}
#[test]
// Split a commit with no descendants into siblings. Also tests that the default
// description is set correctly on the first commit.
fn test_split_parallel_no_descendants() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ qpvuntsmwlqt false
◆ zzzzzzzzzzzz true
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
std::fs::write(
edit_script,
["dump editor1", "next invocation\n", "dump editor2"].join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "--parallel", "file1"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
Selected changes : qpvuntsm 7bcd474c TESTED=TODO
Remaining changes: kkmpptxz 431886f6 (no description set)
Working copy (@) now at: kkmpptxz 431886f6 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ kkmpptxzrspx false
│ ○ qpvuntsmwlqt false TESTED=TODO
├─╯
◆ zzzzzzzzzzzz true
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
// Since the commit being split has no description, the user will only be
// prompted to add a description to the first commit, which will use the
// default value we set. The second commit will inherit the empty
// description from the commit being split.
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
TESTED=TODO
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
assert!(!test_env.env_root().join("editor2").exists());
// Check the evolog for the first commit. It shows three entries:
// - The initial empty commit.
// - The rewritten commit from the snapshot after the files were added.
// - The rewritten commit after the split.
let evolog_1 = work_dir.run_jj(["evolog", "-r", "qpvun"]);
insta::assert_snapshot!(evolog_1, @r#"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:09 7bcd474c
│ TESTED=TODO
│ -- operation 2b21c33e1596 (2001-02-03 08:05:09) split commit f5700f8ef89e290e4e90ae6adc0908707e0d8c85
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
│ -- operation 1663cd1cc445 (2001-02-03 08:05:08) snapshot working copy
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
// The evolog for the second commit is the same, except that the change id
// changes after the split.
let evolog_2 = work_dir.run_jj(["evolog", "-r", "kkmpp"]);
insta::assert_snapshot!(evolog_2, @r#"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 431886f6
│ (no description set)
│ -- operation 2b21c33e1596 (2001-02-03 08:05:09) split commit f5700f8ef89e290e4e90ae6adc0908707e0d8c85
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
│ -- operation 1663cd1cc445 (2001-02-03 08:05:08) snapshot working copy
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
}
#[test]
fn test_split_parallel_with_descendants() {
// Configure the environment and make the initial commits.
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// First commit. This is the one we will split later.
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir
.run_jj(["commit", "-m", "Add file1 & file2"])
.success();
// Second commit. This will be the child of the sibling commits after the split.
work_dir.write_file("file3", "baz\n");
work_dir.run_jj(["commit", "-m", "Add file3"]).success();
// Third commit.
work_dir.write_file("file4", "foobarbaz\n");
work_dir.run_jj(["describe", "-m", "Add file4"]).success();
// Move back to the previous commit so that we don't have to pass a revision
// to the split command.
work_dir.run_jj(["prev", "--edit"]).success();
work_dir.run_jj(["prev", "--edit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
○ kkmpptxzrspx false Add file4
○ rlvkpnrzqnoo false Add file3
@ qpvuntsmwlqt false Add file1 & file2
◆ zzzzzzzzzzzz true
[EOF]
");
// Set up the editor and do the split.
std::fs::write(
edit_script,
[
"dump editor1",
"write\nAdd file1",
"next invocation\n",
"dump editor2",
"write\nAdd file2",
]
.join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "--parallel", "file1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Selected changes : qpvuntsm 18c85f56 Add file1
Remaining changes: vruxwmqv cbdfd9cf Add file2
Working copy (@) now at: vruxwmqv cbdfd9cf Add file2
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
○ kkmpptxzrspx false Add file4
○ rlvkpnrzqnoo false Add file3
├─╮
│ @ vruxwmqvtpmx false Add file2
○ │ qpvuntsmwlqt false Add file1
├─╯
◆ zzzzzzzzzzzz true
[EOF]
");
// The commit we're splitting has a description, so the user will be
// prompted to enter a description for each of the sibling commits.
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
Add file1 & file2
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#"
JJ: Enter a description for the remaining changes.
Add file1 & file2
JJ: This commit contains the following changes:
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
}
// This test makes sure that the children of the commit being split retain any
// other parents which weren't involved in the split.
#[test]
fn test_split_parallel_with_merge_child() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.run_jj(["describe", "-m=1"]).success();
work_dir.run_jj(["new", "root()", "-m=a"]).success();
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir
.run_jj(["new", "description(1)", "description(a)", "-m=2"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr true 2
├─╮
│ ○ kkmpptxzrspx false a
○ │ qpvuntsmwlqt true 1
├─╯
◆ zzzzzzzzzzzz true
[EOF]
");
// Set up the editor and do the split.
std::fs::write(
edit_script,
["write\nAdd file1", "next invocation\n", "write\nAdd file2"].join("\0"),
)
.unwrap();
let output = work_dir.run_jj(["split", "-r", "description(a)", "--parallel", "file1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Selected changes : kkmpptxz cc199567 Add file1
Remaining changes: royxmykx 82a5c527 Add file2
Working copy (@) now at: zsuskuln b7cdcdec (empty) 2
Parent commit (@-) : qpvuntsm 884fe9b9 (empty) 1
Parent commit (@-) : kkmpptxz cc199567 Add file1
Parent commit (@-) : royxmykx 82a5c527 Add file2
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ zsuskulnrvyr true 2
├─┬─╮
│ │ ○ royxmykxtrkr false Add file2
│ ○ │ kkmpptxzrspx false Add file1
│ ├─╯
○ │ qpvuntsmwlqt true 1
├─╯
◆ zzzzzzzzzzzz true
[EOF]
");
}
// Make sure `jj split` would refuse to split an empty commit.
#[test]
fn test_split_empty() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.run_jj(["describe", "--message", "abc"]).success();
let output = work_dir.run_jj(["split"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to split empty commit 64eaeeb3e846248efc8b599a2b583b708104fc01.
Hint: Use `jj new` if you want to create another empty commit.
[EOF]
[exit status: 1]
");
}
#[test]
fn test_split_message_editor_avoids_unc() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo");
work_dir.write_file("file2", "foo");
std::fs::write(edit_script, "dump-path path").unwrap();
work_dir.run_jj(["split", "file2"]).success();
let edited_path =
PathBuf::from(std::fs::read_to_string(test_env.env_root().join("path")).unwrap());
// While `assert!(!edited_path.starts_with("//?/"))` could work here in most
// cases, it fails when it is not safe to strip the prefix, such as paths
// over 260 chars.
assert_eq!(edited_path, dunce::simplified(&edited_path));
}
#[test]
fn test_split_interactive() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
let diff_script = ["rm file2", "dump JJ-INSTRUCTIONS instrs"].join("\0");
std::fs::write(diff_editor, diff_script).unwrap();
// Split the working commit interactively and select only file1
let output = work_dir.run_jj(["split"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Selected changes : qpvuntsm c664a51b (no description set)
Remaining changes: rlvkpnrz 7e5d65b1 (no description set)
Working copy (@) now at: rlvkpnrz 7e5d65b1 (no description set)
Parent commit (@-) : qpvuntsm c664a51b (no description set)
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are splitting a commit into two: qpvuntsm f5700f8e (no description set)
The diff initially shows the changes in the commit you're splitting.
Adjust the right side until it shows the contents you want to split into the
new commit.
The changes that are not selected will replace the original commit.
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:08 7e5d65b1
│ (no description set)
│ A file2
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 c664a51b
│ (no description set)
│ A file1
◆ zzzzzzzz root() 00000000
[EOF]
");
}
#[test]
fn test_split_interactive_with_paths() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file2", "");
work_dir.write_file("file3", "");
work_dir.run_jj(["new"]).success();
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.write_file("file3", "baz\n");
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
// On the before side, file2 is empty. On the after side, it contains "bar".
// The "reset file2" copies the empty version from the before side to the
// after side, effectively "unselecting" the changes and leaving only the
// changes made to file1. file3 doesn't appear on either side since it isn't
// in the filesets passed to `jj split`.
let diff_script = [
"files-before file2",
"files-after JJ-INSTRUCTIONS file1 file2",
"reset file2",
]
.join("\0");
std::fs::write(diff_editor, diff_script).unwrap();
// Select file1 and file2 by args, then select file1 interactively via the diff
// script.
let output = work_dir.run_jj(["split", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Selected changes : rlvkpnrz cdc9960a (no description set)
Remaining changes: kkmpptxz 7255f070 (no description set)
Working copy (@) now at: kkmpptxz 7255f070 (no description set)
Parent commit (@-) : rlvkpnrz cdc9960a (no description set)
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 7255f070
│ (no description set)
│ M file2
│ M file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 cdc9960a
│ (no description set)
│ A file1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff687a2f
│ (no description set)
│ A file2
│ A file3
◆ zzzzzzzz root() 00000000
[EOF]
");
}
// When a commit is split, the second commit produced by the split becomes the
// working copy commit for all workspaces whose working copy commit was the
// target of the split. This test does a split where the target commit is the
// working copy commit for two different workspaces.
#[test]
fn test_split_with_multiple_workspaces_same_working_copy() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
let secondary_dir = test_env.work_dir("secondary");
main_dir.run_jj(["desc", "-m", "first-commit"]).success();
main_dir.write_file("file1", "foo");
main_dir.write_file("file2", "foo");
// Create the second workspace and change its working copy commit to match
// the default workspace.
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
// Change the working copy in the second workspace.
secondary_dir
.run_jj(["edit", "-r", "description(first-commit)"])
.success();
// Check the working-copy commit in each workspace in the log output. The "@"
// node in the graph indicates the current workspace's working-copy commit.
insta::assert_snapshot!(get_workspace_log_output(&main_dir), @r"
@ qpvuntsmwlqt default@ second@ first-commit
◆ zzzzzzzzzzzz
[EOF]
");
// Do the split in the default workspace.
std::fs::write(
&edit_script,
["", "next invocation\n", "write\nsecond-commit"].join("\0"),
)
.unwrap();
main_dir.run_jj(["split", "file2"]).success();
// The working copy for both workspaces will be the second split commit.
insta::assert_snapshot!(get_workspace_log_output(&main_dir), @r"
@ royxmykxtrkr default@ second@ second-commit
○ qpvuntsmwlqt first-commit
◆ zzzzzzzzzzzz
[EOF]
");
// Test again with a --parallel split.
main_dir.run_jj(["undo"]).success();
std::fs::write(
&edit_script,
["", "next invocation\n", "write\nsecond-commit"].join("\0"),
)
.unwrap();
main_dir.run_jj(["split", "file2", "--parallel"]).success();
insta::assert_snapshot!(get_workspace_log_output(&main_dir), @r"
@ yostqsxwqrlt default@ second@ second-commit
│ ○ qpvuntsmwlqt first-commit
├─╯
◆ zzzzzzzzzzzz
[EOF]
");
}
// A workspace should only have its working copy commit updated if the target
// commit is the working copy commit.
#[test]
fn test_split_with_multiple_workspaces_different_working_copy() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.run_jj(["desc", "-m", "first-commit"]).success();
main_dir.write_file("file1", "foo");
main_dir.write_file("file2", "foo");
// Create the second workspace with a different working copy commit.
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
// Check the working-copy commit in each workspace in the log output. The "@"
// node in the graph indicates the current workspace's working-copy commit.
insta::assert_snapshot!(get_workspace_log_output(&main_dir), @r"
@ qpvuntsmwlqt default@ first-commit
│ ○ pmmvwywvzvvn second@
├─╯
◆ zzzzzzzzzzzz
[EOF]
");
// Do the split in the default workspace.
std::fs::write(
&edit_script,
["", "next invocation\n", "write\nsecond-commit"].join("\0"),
)
.unwrap();
main_dir.run_jj(["split", "file2"]).success();
// Only the working copy commit for the default workspace changes.
insta::assert_snapshot!(get_workspace_log_output(&main_dir), @r"
@ mzvwutvlkqwt default@ second-commit
○ qpvuntsmwlqt first-commit
│ ○ pmmvwywvzvvn second@
├─╯
◆ zzzzzzzzzzzz
[EOF]
");
// Test again with a --parallel split.
main_dir.run_jj(["undo"]).success();
std::fs::write(
&edit_script,
["", "next invocation\n", "write\nsecond-commit"].join("\0"),
)
.unwrap();
main_dir.run_jj(["split", "file2", "--parallel"]).success();
insta::assert_snapshot!(get_workspace_log_output(&main_dir), @r"
@ vruxwmqvtpmx default@ second-commit
│ ○ qpvuntsmwlqt first-commit
├─╯
│ ○ pmmvwywvzvvn second@
├─╯
◆ zzzzzzzzzzzz
[EOF]
");
}
#[test]
fn test_split_with_non_empty_description_and_trailers() {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.run_jj(["describe", "-m", "test"]).success();
std::fs::write(
edit_script,
[
"dump editor1",
"write\npart 1",
"next invocation\n",
"dump editor2",
"write\npart 2",
]
.join("\0"),
)
.unwrap();
test_env.add_config(
r#"[templates]
commit_trailers = '''"Signed-off-by: " ++ committer.email()'''"#,
);
let output = work_dir.run_jj(["split", "file1"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
Selected changes : qpvuntsm c7f7b14b part 1
Remaining changes: kkmpptxz ac33a5a9 part 2
Working copy (@) now at: kkmpptxz ac33a5a9 part 2
Parent commit (@-) : qpvuntsm c7f7b14b part 1
[EOF]
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#"
JJ: Enter a description for the selected changes.
test
Signed-off-by: test.user@example.com
JJ: This commit contains the following changes:
JJ: A file1
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#"
JJ: Enter a description for the remaining changes.
test
Signed-off-by: test.user@example.com
JJ: This commit contains the following changes:
JJ: A file2
JJ:
JJ: Lines starting with "JJ:" (like this one) will be removed.
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ kkmpptxzrspx false part 2
○ qpvuntsmwlqt false part 1
◆ zzzzzzzzzzzz true
[EOF]
------- stderr -------
Warning: Deprecated user-level config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
[EOF]
"#);
}
#[test]
fn test_split_with_message() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.run_jj(["describe", "-m", "my feature"]).success();
let output = work_dir.run_jj(["split", "-m", "fix in file1", "file1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Selected changes : qpvuntsm f2a70519 fix in file1
Remaining changes: kkmpptxz cac11766 my feature
Working copy (@) now at: kkmpptxz cac11766 my feature
Parent commit (@-) : qpvuntsm f2a70519 fix in file1
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ kkmpptxzrspx false my feature
○ qpvuntsmwlqt false fix in file1
◆ zzzzzzzzzzzz true
[EOF]
");
// trailers should be added to the message
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj([
"split",
"--config",
r#"templates.commit_trailers='"CC: " ++ committer.email()'"#,
"-m",
"fix in file1",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Selected changes : qpvuntsm d01cf12d fix in file1
Remaining changes: royxmykx b1556ed9 my feature
Working copy (@) now at: royxmykx b1556ed9 my feature
Parent commit (@-) : qpvuntsm d01cf12d fix in file1
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ royxmykxtrkr false my feature
○ qpvuntsmwlqt false fix in file1
│
│ CC: test.user@example.com
◆ zzzzzzzzzzzz true
[EOF]
");
}
#[test]
fn test_split_move_first_commit() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "foo\n");
work_dir.write_file("file2", "bar\n");
work_dir.run_jj(["commit", "-m", "file2"]).success();
work_dir.write_file("file3", "bar\n");
work_dir.run_jj(["commit", "-m", "file3"]).success();
work_dir.write_file("file4", "bar\n");
work_dir.run_jj(["commit", "-m", "file4"]).success();
work_dir.run_jj(["new", "root()"]).success();
work_dir.write_file("file5", "bar\n");
work_dir.run_jj(["commit", "-m", "file5"]).success();
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ mzvwutvlkqwt file5
│ A file5
│ ○ kkmpptxzrspx file4
│ │ A file4
│ ○ rlvkpnrzqnoo file3
│ │ A file3
│ ○ qpvuntsmwlqt file2
├─╯ A file1
│ A file2
◆ zzzzzzzzzzzz
[EOF]
");
// insert the commit before the source commit
let output = work_dir.run_jj([
"split",
"-m",
"file1",
"-r",
"qpvuntsmwlqt",
"--insert-before",
"qpvuntsmwlqt",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Selected changes : vruxwmqv bf94c29a file1
Remaining changes: qpvuntsm 66b1d4f1 file2
[EOF]
");
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ mzvwutvlkqwt file5
│ A file5
│ ○ kkmpptxzrspx file4
│ │ A file4
│ ○ rlvkpnrzqnoo file3
│ │ A file3
│ ○ qpvuntsmwlqt file2
│ │ A file2
│ ○ vruxwmqvtpmx file1
├─╯ A file1
◆ zzzzzzzzzzzz
[EOF]
");
// insert the commit after the source commit
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj([
"split",
"-m",
"file1",
"-r",
"qpvuntsmwlqt",
"--insert-after",
"qpvuntsmwlqt",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Selected changes : kpqxywon 08294e90 file1
Remaining changes: qpvuntsm 76ebcbb8 file2
[EOF]
");
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ mzvwutvlkqwt file5
│ A file5
│ ○ kkmpptxzrspx file4
│ │ A file4
│ ○ rlvkpnrzqnoo file3
│ │ A file3
│ ○ kpqxywonksrl file1
│ │ A file1
│ ○ qpvuntsmwlqt file2
├─╯ A file2
◆ zzzzzzzzzzzz
[EOF]
");
// create a new branch anywhere in the tree
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj([
"split",
"-m",
"file1",
"-r",
"qpvuntsmwlqt",
"--destination",
"rlvkpnrzqnoo",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Selected changes : lylxulpl b42b2604 file1
Remaining changes: qpvuntsm 0f76cbf0 file2
[EOF]
");
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ mzvwutvlkqwt file5
│ A file5
│ ○ kkmpptxzrspx file4
│ │ A file4
│ │ ○ lylxulplsnyw file1
│ ├─╯ A file1
│ ○ rlvkpnrzqnoo file3
│ │ A file3
│ ○ qpvuntsmwlqt file2
├─╯ A file2
◆ zzzzzzzzzzzz
[EOF]
");
// create a bubble in the tree
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj([
"split",
"-m",
"file1",
"-r",
"qpvuntsmwlqt",
"--insert-after",
"qpvuntsmwlqt",
"--insert-before",
"kkmpptxzrspx",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Selected changes : uyznsvlq d0338445 file1
Remaining changes: qpvuntsm 16d41320 file2
[EOF]
");
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ mzvwutvlkqwt file5
│ A file5
│ ○ kkmpptxzrspx file4
│ ├─╮ A file4
│ │ ○ uyznsvlquzzm file1
│ │ │ A file1
│ ○ │ rlvkpnrzqnoo file3
│ ├─╯ A file3
│ ○ qpvuntsmwlqt file2
├─╯ A file2
◆ zzzzzzzzzzzz
[EOF]
");
// create a commit in another branch
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj([
"split",
"-m",
"file1",
"-r",
"qpvuntsmwlqt",
"--before",
"@",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 descendant commits
Selected changes : nmzmmopx 72225233 file1
Remaining changes: qpvuntsm 98b70782 file2
Working copy (@) now at: royxmykx c3dd10b0 (empty) (no description set)
Parent commit (@-) : nmzmmopx 72225233 file1
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ nmzmmopxokps file1
│ A file1
○ mzvwutvlkqwt file5
│ A file5
│ ○ kkmpptxzrspx file4
│ │ A file4
│ ○ rlvkpnrzqnoo file3
│ │ A file3
│ ○ qpvuntsmwlqt file2
├─╯ A file2
◆ zzzzzzzzzzzz
[EOF]
");
// merge two branches with the new commit
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj([
"split",
"-m",
"file1",
"-r",
"qpvuntsmwlqt",
"--after",
"mzvwutvlkqwt",
"--after",
"kkmpptxzrspx",
"file1",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 descendant commits
Selected changes : nlrtlrxv 1b6975b0 file1
Remaining changes: qpvuntsm 905586dd file2
Working copy (@) now at: royxmykx 85be9860 (empty) (no description set)
Parent commit (@-) : nlrtlrxv 1b6975b0 file1
Added 4 files, modified 0 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_with_summary(&work_dir), @r"
@ royxmykxtrkr
○ nlrtlrxvuusk file1
├─╮ A file1
│ ○ kkmpptxzrspx file4
│ │ A file4
│ ○ rlvkpnrzqnoo file3
│ │ A file3
│ ○ qpvuntsmwlqt file2
│ │ A file2
○ │ mzvwutvlkqwt file5
├─╯ A file5
◆ zzzzzzzzzzzz
[EOF]
");
}
enum BookmarkBehavior {
Default,
MoveBookmarkToChild,
LeaveBookmarkWithTarget,
}
// TODO: https://github.com/jj-vcs/jj/issues/3419 - Delete params when the config is removed.
#[test_case(BookmarkBehavior::Default; "default_behavior")]
#[test_case(BookmarkBehavior::MoveBookmarkToChild; "move_bookmark_to_child")]
#[test_case(BookmarkBehavior::LeaveBookmarkWithTarget; "leave_bookmark_with_target")]
fn test_split_with_bookmarks(bookmark_behavior: BookmarkBehavior) {
let mut test_env = TestEnvironment::default();
let edit_script = test_env.set_up_fake_editor();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
match bookmark_behavior {
BookmarkBehavior::LeaveBookmarkWithTarget => {
test_env.add_config("split.legacy-bookmark-behavior=false");
}
BookmarkBehavior::MoveBookmarkToChild => {
test_env.add_config("split.legacy-bookmark-behavior=true");
}
BookmarkBehavior::Default => (),
}
// Setup.
main_dir.run_jj(["desc", "-m", "first-commit"]).success();
main_dir.write_file("file1", "foo");
main_dir.write_file("file2", "foo");
main_dir
.run_jj(["bookmark", "set", "'*le-signet*'", "-r", "@"])
.success();
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r#"
@ qpvuntsmwlqt false "*le-signet*" first-commit
◆ zzzzzzzzzzzz true
[EOF]
"#);
}
// Do the split.
std::fs::write(
&edit_script,
["", "next invocation\n", "write\nsecond-commit"].join("\0"),
)
.unwrap();
let output = main_dir.run_jj(["split", "file2"]);
match bookmark_behavior {
BookmarkBehavior::LeaveBookmarkWithTarget => {
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Selected changes : qpvuntsm a481fe8a "*le-signet*" | first-commit
Remaining changes: mzvwutvl 5f597a6e second-commit
Working copy (@) now at: mzvwutvl 5f597a6e second-commit
Parent commit (@-) : qpvuntsm a481fe8a "*le-signet*" | first-commit
[EOF]
"#);
}
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r#"
@ mzvwutvlkqwt false second-commit
○ qpvuntsmwlqt false "*le-signet*" first-commit
◆ zzzzzzzzzzzz true
[EOF]
"#);
}
}
BookmarkBehavior::Default | BookmarkBehavior::MoveBookmarkToChild => {
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Selected changes : qpvuntsm a481fe8a first-commit
Remaining changes: mzvwutvl 5f597a6e "*le-signet*" | second-commit
Working copy (@) now at: mzvwutvl 5f597a6e "*le-signet*" | second-commit
Parent commit (@-) : qpvuntsm a481fe8a first-commit
[EOF]
"#);
}
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r#"
@ mzvwutvlkqwt false "*le-signet*" second-commit
○ qpvuntsmwlqt false first-commit
◆ zzzzzzzzzzzz true
[EOF]
"#);
}
}
}
// Test again with a --parallel split.
main_dir.run_jj(["undo"]).success();
std::fs::write(
&edit_script,
["", "next invocation\n", "write\nsecond-commit"].join("\0"),
)
.unwrap();
main_dir.run_jj(["split", "file2", "--parallel"]).success();
match bookmark_behavior {
BookmarkBehavior::LeaveBookmarkWithTarget => {
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r#"
@ vruxwmqvtpmx false second-commit
│ ○ qpvuntsmwlqt false "*le-signet*" first-commit
├─╯
◆ zzzzzzzzzzzz true
[EOF]
"#);
}
}
BookmarkBehavior::Default | BookmarkBehavior::MoveBookmarkToChild => {
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r#"
@ vruxwmqvtpmx false "*le-signet*" second-commit
│ ○ qpvuntsmwlqt false first-commit
├─╯
◆ zzzzzzzzzzzz true
[EOF]
"#);
}
}
}
}
|