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
|
// 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 test_case::test_case;
use crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
/// Test adding a second workspace
#[test]
fn test_workspaces_add_second_workspace() {
let test_env = TestEnvironment::default();
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.write_file("file", "contents");
main_dir.run_jj(["commit", "-m", "initial"]).success();
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 504e3d8c (empty) (no description set)
[EOF]
");
let output = main_dir.run_jj(["workspace", "add", "--name", "second", "../secondary"]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Working copy (@) now at: rzvqmyuk bcc858e1 (empty) (no description set)
Parent commit (@-) : qpvuntsm 7b22a8cb initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
// Can see 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_log_output(&main_dir), @r"
@ 504e3d8c1bcd default@
│ ○ bcc858e1d93f second@
├─╯
○ 7b22a8cbe888
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ bcc858e1d93f second@
│ ○ 504e3d8c1bcd default@
├─╯
○ 7b22a8cbe888
◆ 000000000000
[EOF]
");
// Both workspaces show up when we list them
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 504e3d8c (empty) (no description set)
second: rzvqmyuk bcc858e1 (empty) (no description set)
[EOF]
");
}
/// Test how sparse patterns are inherited
#[test]
fn test_workspaces_sparse_patterns() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "ws1"]).success();
let ws1_dir = test_env.work_dir("ws1");
let ws2_dir = test_env.work_dir("ws2");
let ws3_dir = test_env.work_dir("ws3");
let ws4_dir = test_env.work_dir("ws4");
let ws5_dir = test_env.work_dir("ws5");
let ws6_dir = test_env.work_dir("ws6");
ws1_dir
.run_jj(["sparse", "set", "--clear", "--add=foo"])
.success();
ws1_dir.run_jj(["workspace", "add", "../ws2"]).success();
let output = ws2_dir.run_jj(["sparse", "list"]);
insta::assert_snapshot!(output, @r"
foo
[EOF]
");
ws2_dir.run_jj(["sparse", "set", "--add=bar"]).success();
ws2_dir.run_jj(["workspace", "add", "../ws3"]).success();
let output = ws3_dir.run_jj(["sparse", "list"]);
insta::assert_snapshot!(output, @r"
bar
foo
[EOF]
");
// --sparse-patterns behavior
ws3_dir
.run_jj(["workspace", "add", "--sparse-patterns=copy", "../ws4"])
.success();
let output = ws4_dir.run_jj(["sparse", "list"]);
insta::assert_snapshot!(output, @r"
bar
foo
[EOF]
");
ws3_dir
.run_jj(["workspace", "add", "--sparse-patterns=full", "../ws5"])
.success();
let output = ws5_dir.run_jj(["sparse", "list"]);
insta::assert_snapshot!(output, @r"
.
[EOF]
");
ws3_dir
.run_jj(["workspace", "add", "--sparse-patterns=empty", "../ws6"])
.success();
let output = ws6_dir.run_jj(["sparse", "list"]);
insta::assert_snapshot!(output, @"");
}
/// Test adding a second workspace while the current workspace is editing a
/// merge
#[test]
fn test_workspaces_add_second_workspace_on_merge() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.run_jj(["describe", "-m=left"]).success();
main_dir.run_jj(["new", "@-", "-m=right"]).success();
main_dir.run_jj(["new", "all:@-+", "-m=merge"]).success();
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: zsuskuln 46ed31b6 (empty) merge
[EOF]
");
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
// The new workspace's working-copy commit shares all parents with the old one.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 46ed31b61ce9 default@
├─╮
│ │ ○ d23b2d4ff55c second@
╭─┬─╯
│ ○ 3c52528f5893
○ │ a3155ab1bf5a
├─╯
◆ 000000000000
[EOF]
");
}
/// Test that --ignore-working-copy is respected
#[test]
fn test_workspaces_add_ignore_working_copy() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
// TODO: maybe better to error out early?
let output = main_dir.run_jj(["workspace", "add", "--ignore-working-copy", "../secondary"]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Error: This command must be able to update the working copy.
Hint: Don't use --ignore-working-copy.
[EOF]
[exit status: 1]
"#);
}
/// Test that --at-op is respected
#[test]
fn test_workspaces_add_at_operation() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.write_file("file1", "");
let output = main_dir.run_jj(["commit", "-m1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 59e07459 (empty) (no description set)
Parent commit (@-) : qpvuntsm 9e4b0b91 1
[EOF]
");
main_dir.write_file("file2", "");
let output = main_dir.run_jj(["commit", "-m2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 6e9610ac (empty) (no description set)
Parent commit (@-) : rlvkpnrz 8b7259b9 2
[EOF]
");
// --at-op should disable snapshot in the main workspace, but the newly
// created workspace should still be writable.
main_dir.write_file("file3", "");
let output = main_dir.run_jj(["workspace", "add", "--at-op=@-", "../secondary"]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Working copy (@) now at: rzvqmyuk b8772476 (empty) (no description set)
Parent commit (@-) : qpvuntsm 9e4b0b91 1
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
let secondary_dir = test_env.work_dir("secondary");
// New snapshot can be taken in the secondary workspace.
secondary_dir.write_file("file4", "");
let output = secondary_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
A file4
Working copy (@) : rzvqmyuk f2ff8257 (no description set)
Parent commit (@-): qpvuntsm 9e4b0b91 1
[EOF]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
let output = secondary_dir.run_jj(["op", "log", "-Tdescription"]);
insta::assert_snapshot!(output, @r"
@ snapshot working copy
○ reconcile divergent operations
├─╮
○ │ commit 9152e822279787a168ddf4cede6440a21faa00d7
│ ○ create initial working-copy commit in workspace secondary
│ ○ add workspace 'secondary'
├─╯
○ snapshot working copy
○ commit 093c3c9624b6cfe22b310586f5638792aa80e6d7
○ snapshot working copy
○ add workspace 'default'
○
[EOF]
");
}
/// Test adding a workspace, but at a specific revision using '-r'
#[test]
fn test_workspaces_add_workspace_at_revision() {
let test_env = TestEnvironment::default();
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.write_file("file-1", "contents");
main_dir.run_jj(["commit", "-m", "first"]).success();
main_dir.write_file("file-2", "contents");
main_dir.run_jj(["commit", "-m", "second"]).success();
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: kkmpptxz 5ac9178d (empty) (no description set)
[EOF]
");
let output = main_dir.run_jj([
"workspace",
"add",
"--name",
"second",
"../secondary",
"-r",
"@--",
]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Working copy (@) now at: zxsnswpr ea5860fb (empty) (no description set)
Parent commit (@-) : qpvuntsm 27473635 first
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
// Can see 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_log_output(&main_dir), @r"
@ 5ac9178da8b2 default@
○ a47d8a593529
│ ○ ea5860fbd622 second@
├─╯
○ 27473635a942
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ ea5860fbd622 second@
│ ○ 5ac9178da8b2 default@
│ ○ a47d8a593529
├─╯
○ 27473635a942
◆ 000000000000
[EOF]
");
}
/// Test multiple `-r` flags to `workspace add` to create a workspace
/// working-copy commit with multiple parents.
#[test]
fn test_workspaces_add_workspace_multiple_revisions() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.write_file("file-1", "contents");
main_dir.run_jj(["commit", "-m", "first"]).success();
main_dir.run_jj(["new", "-r", "root()"]).success();
main_dir.write_file("file-2", "contents");
main_dir.run_jj(["commit", "-m", "second"]).success();
main_dir.run_jj(["new", "-r", "root()"]).success();
main_dir.write_file("file-3", "contents");
main_dir.run_jj(["commit", "-m", "third"]).success();
main_dir.run_jj(["new", "-r", "root()"]).success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 8d23abddc924
│ ○ eba7f49e2358
├─╯
│ ○ 62444a45efcf
├─╯
│ ○ 27473635a942
├─╯
◆ 000000000000
[EOF]
");
let output = main_dir.run_jj([
"workspace",
"add",
"--name=merge",
"../merged",
"-r=description(third)",
"-r=description(second)",
"-r=description(first)",
]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../merged"
Working copy (@) now at: wmwvqwsz 2d7c9a2d (empty) (no description set)
Parent commit (@-) : mzvwutvl eba7f49e third
Parent commit (@-) : kkmpptxz 62444a45 second
Parent commit (@-) : qpvuntsm 27473635 first
Added 3 files, modified 0 files, removed 0 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 8d23abddc924 default@
│ ○ 2d7c9a2d41dc merge@
│ ├─┬─╮
│ │ │ ○ 27473635a942
├─────╯
│ │ ○ 62444a45efcf
├───╯
│ ○ eba7f49e2358
├─╯
◆ 000000000000
[EOF]
");
}
#[test]
fn test_workspaces_add_workspace_from_subdir() {
let test_env = TestEnvironment::default();
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");
let subdir_dir = main_dir.create_dir("subdir");
subdir_dir.write_file("file", "contents");
main_dir.run_jj(["commit", "-m", "initial"]).success();
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 0ba0ff35 (empty) (no description set)
[EOF]
");
// Create workspace while in sub-directory of current workspace
let output = subdir_dir.run_jj(["workspace", "add", "../../secondary"]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../../secondary"
Working copy (@) now at: rzvqmyuk dea1be10 (empty) (no description set)
Parent commit (@-) : qpvuntsm 80b67806 initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
// Both workspaces show up when we list them
let output = secondary_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 0ba0ff35 (empty) (no description set)
secondary: rzvqmyuk dea1be10 (empty) (no description set)
[EOF]
");
}
#[test]
fn test_workspaces_add_workspace_in_current_workspace() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.write_file("file", "contents");
main_dir.run_jj(["commit", "-m", "initial"]).success();
// Try to create workspace using name instead of path
let output = main_dir.run_jj(["workspace", "add", "secondary"]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "secondary"
Warning: Workspace created inside current directory. If this was unintentional, delete the "secondary" directory and run `jj workspace forget secondary` to remove it.
Working copy (@) now at: pmmvwywv 058f604d (empty) (no description set)
Parent commit (@-) : qpvuntsm 7b22a8cb initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
// Workspace created despite warning
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz af2d0cd5 (no description set)
secondary: pmmvwywv 058f604d (empty) (no description set)
[EOF]
");
// Use explicit path instead (no warning)
let output = main_dir.run_jj(["workspace", "add", "./third"]);
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "third"
Working copy (@) now at: zxsnswpr 1c1effec (empty) (no description set)
Parent commit (@-) : qpvuntsm 7b22a8cb initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
// Both workspaces created
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz b2288847 (no description set)
secondary: pmmvwywv 058f604d (empty) (no description set)
third: zxsnswpr 1c1effec (empty) (no description set)
[EOF]
");
// Can see files from the other workspaces in main workspace, since they are
// child directories and will therefore be snapshotted
let output = main_dir.run_jj(["file", "list"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
file
secondary/file
third/file
[EOF]
");
}
/// Test making changes to the working copy in a workspace as it gets rewritten
/// from another workspace
#[test]
fn test_workspaces_conflicting_edits() {
let test_env = TestEnvironment::default();
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.write_file("file", "contents\n");
main_dir.run_jj(["new"]).success();
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 393250c59e39 default@
│ ○ 547036666102 secondary@
├─╯
○ 9a462e35578a
◆ 000000000000
[EOF]
");
// Make changes in both working copies
main_dir.write_file("file", "changed in main\n");
secondary_dir.write_file("file", "changed in second\n");
// Squash the changes from the main workspace into the initial commit (before
// running any command in the secondary workspace
let output = main_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl 3a9b690d (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
[EOF]
");
// The secondary workspace's working-copy commit was updated
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 3a9b690d6e67 default@
│ ○ 90f3d42e0bff secondary@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation bd4f780d0422).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
[exit status: 1]
");
// Same error on second run, and from another command
let output = secondary_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation bd4f780d0422).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
[exit status: 1]
");
// It was detected that the working copy is now stale.
// Since there was an uncommitted change in the working copy, it should
// have been committed first (causing divergence)
let output = secondary_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Concurrent modification detected, resolving automatically.
Rebased 1 descendant commits onto commits rewritten by other operation
Working copy (@) now at: pmmvwywv?? 90f3d42e (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit 90f3d42e0bff
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir),
@r"
@ 90f3d42e0bff secondary@ (divergent)
│ × de7155dbea42 (divergent)
├─╯
│ ○ 3a9b690d6e67 default@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
// The stale working copy should have been resolved by the previous command
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ 90f3d42e0bff secondary@ (divergent)
│ × de7155dbea42 (divergent)
├─╯
│ ○ 3a9b690d6e67 default@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
}
/// Test a clean working copy that gets rewritten from another workspace
#[test]
fn test_workspaces_updated_by_other() {
let test_env = TestEnvironment::default();
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.write_file("file", "contents\n");
main_dir.run_jj(["new"]).success();
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 393250c59e39 default@
│ ○ 547036666102 secondary@
├─╯
○ 9a462e35578a
◆ 000000000000
[EOF]
");
// Rewrite the check-out commit in one workspace.
main_dir.write_file("file", "changed in main\n");
let output = main_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl 3a9b690d (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
[EOF]
");
// The secondary workspace's working-copy commit was updated.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 3a9b690d6e67 default@
│ ○ 90f3d42e0bff secondary@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation bd4f780d0422).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
[exit status: 1]
");
// It was detected that the working copy is now stale, but clean. So no
// divergent commit should be created.
let output = secondary_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: pmmvwywv 90f3d42e (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit 90f3d42e0bff
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir),
@r"
@ 90f3d42e0bff secondary@
│ ○ 3a9b690d6e67 default@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
}
/// Test a clean working copy that gets rewritten from another workspace
#[test]
fn test_workspaces_updated_by_other_automatic() {
let test_env = TestEnvironment::default();
test_env.add_config("snapshot.auto-update-stale = true\n");
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.write_file("file", "contents\n");
main_dir.run_jj(["new"]).success();
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 393250c59e39 default@
│ ○ 547036666102 secondary@
├─╯
○ 9a462e35578a
◆ 000000000000
[EOF]
");
// Rewrite the check-out commit in one workspace.
main_dir.write_file("file", "changed in main\n");
let output = main_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl 3a9b690d (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
[EOF]
");
// The secondary workspace's working-copy commit was updated.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 3a9b690d6e67 default@
│ ○ 90f3d42e0bff secondary@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
// The first working copy gets automatically updated.
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : pmmvwywv 90f3d42e (empty) (no description set)
Parent commit (@-): qpvuntsm b853f7c8 (no description set)
[EOF]
------- stderr -------
Working copy (@) now at: pmmvwywv 90f3d42e (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit 90f3d42e0bff
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir),
@r"
@ 90f3d42e0bff secondary@
│ ○ 3a9b690d6e67 default@
├─╯
○ b853f7c8b006
◆ 000000000000
[EOF]
");
}
#[test_case(false; "manual")]
#[test_case(true; "automatic")]
fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
let test_env = TestEnvironment::default();
if automatic {
test_env.add_config("snapshot.auto-update-stale = true\n");
}
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.write_file("modified", "base\n");
main_dir.write_file("deleted", "base\n");
main_dir.write_file("sparse", "base\n");
main_dir.run_jj(["new"]).success();
main_dir.write_file("modified", "main\n");
main_dir.run_jj(["new"]).success();
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
// Make unsnapshotted writes in the secondary working copy
secondary_dir
.run_jj([
"sparse",
"set",
"--clear",
"--add=modified",
"--add=deleted",
"--add=added",
])
.success();
secondary_dir.write_file("modified", "secondary\n");
secondary_dir.remove_file("deleted");
secondary_dir.write_file("added", "secondary\n");
// Create an op by abandoning the parent commit. Importantly, that commit also
// changes the target tree in the secondary workspace.
main_dir.run_jj(["abandon", "@-"]).success();
let output = main_dir.run_jj([
"operation",
"log",
"--template",
r#"id.short(10) ++ " " ++ description"#,
]);
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
@ b0789def13 abandon commit de90575a14d8b9198dc0930f9de4a69f846ded36
○ 778c9aae54 create initial working-copy commit in workspace secondary
○ 219d4aca5c add workspace 'secondary'
○ 31ad55e98c new empty commit
○ 4ba7680cbe snapshot working copy
○ 9739176f19 new empty commit
○ 4b5baa44b7 snapshot working copy
○ 8f47435a39 add workspace 'default'
○ 0000000000
[EOF]
");
}
// Abandon ops, including the one the secondary workspace is currently on.
main_dir.run_jj(["operation", "abandon", "..@-"]).success();
main_dir.run_jj(["util", "gc", "--expire=now"]).success();
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 320bc89effc9 default@
│ ○ 891f00062e10 secondary@
├─╯
○ 367415be5b44
◆ 000000000000
[EOF]
");
}
if automatic {
// Run a no-op command to set the randomness seed for commit hashes.
secondary_dir.run_jj(["help"]).success();
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
Working copy changes:
C {modified => added}
D deleted
M modified
Working copy (@) : kmkuslsw 18851b39 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit (@-): rzvqmyuk 891f0006 (empty) (no description set)
[EOF]
------- stderr -------
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object 778c9aae54957e842bede2223fda227be33e08061732276a4cfb7b431a3e146e5c62187d640aa883095d3b2c6cf43d31ad5fde72076bb9a88b8594fb8b5e6606 of type operation not found
Created and checked out recovery commit 866928d1e0fd
[EOF]
");
} else {
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Could not read working copy's operation.
Hint: Run `jj workspace update-stale` to recover.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
[exit status: 1]
");
let output = secondary_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object 778c9aae54957e842bede2223fda227be33e08061732276a4cfb7b431a3e146e5c62187d640aa883095d3b2c6cf43d31ad5fde72076bb9a88b8594fb8b5e6606 of type operation not found
Created and checked out recovery commit 866928d1e0fd
[EOF]
");
}
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 320bc89effc9 default@
│ ○ 18851b397d09 secondary@
│ ○ 891f00062e10
├─╯
○ 367415be5b44
◆ 000000000000
[EOF]
");
}
// The sparse patterns should remain
let output = secondary_dir.run_jj(["sparse", "list"]);
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
added
deleted
modified
[EOF]
");
}
let output = secondary_dir.run_jj(["st"]);
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
Working copy changes:
C {modified => added}
D deleted
M modified
Working copy (@) : kmkuslsw 18851b39 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit (@-): rzvqmyuk 891f0006 (empty) (no description set)
[EOF]
");
}
insta::allow_duplicates! {
// The modified file should have the same contents it had before (not reset to
// the base contents)
insta::assert_snapshot!(secondary_dir.read_file("modified"), @"secondary");
}
let output = secondary_dir.run_jj(["evolog"]);
if automatic {
insta::assert_snapshot!(output, @r"
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 secondary@ 18851b39
│ RECOVERY COMMIT FROM `jj workspace update-stale`
│ -- operation 90fc02cc90ab (2001-02-03 08:05:18) snapshot working copy
○ kmkuslsw hidden test.user@example.com 2001-02-03 08:05:18 866928d1
(empty) RECOVERY COMMIT FROM `jj workspace update-stale`
-- operation 83f707034db1 (2001-02-03 08:05:18) recovery commit
[EOF]
");
} else {
insta::assert_snapshot!(output, @r"
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 secondary@ 18851b39
│ RECOVERY COMMIT FROM `jj workspace update-stale`
│ -- operation 0f876590219e (2001-02-03 08:05:18) snapshot working copy
○ kmkuslsw hidden test.user@example.com 2001-02-03 08:05:18 866928d1
(empty) RECOVERY COMMIT FROM `jj workspace update-stale`
-- operation 83f707034db1 (2001-02-03 08:05:18) recovery commit
[EOF]
");
}
}
#[test]
fn test_workspaces_update_stale_noop() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
let output = main_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Attempted recovery, but the working copy is not stale
[EOF]
");
let output = main_dir.run_jj(["workspace", "update-stale", "--ignore-working-copy"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: This command must be able to update the working copy.
Hint: Don't use --ignore-working-copy.
[EOF]
[exit status: 1]
");
let output = main_dir.run_jj(["op", "log", "-Tdescription"]);
insta::assert_snapshot!(output, @r"
@ add workspace 'default'
○
[EOF]
");
}
/// Test "update-stale" in a dirty, but not stale working copy.
#[test]
fn test_workspaces_update_stale_snapshot() {
let test_env = TestEnvironment::default();
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.write_file("file", "changed in main\n");
main_dir.run_jj(["new"]).success();
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
// Record new operation in one workspace.
main_dir.run_jj(["new"]).success();
// Snapshot the other working copy, which unfortunately results in concurrent
// operations, but should be resolved cleanly.
secondary_dir.write_file("file", "changed in second\n");
let output = secondary_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Concurrent modification detected, resolving automatically.
Attempted recovery, but the working copy is not stale
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ 35d779b3baea secondary@
│ ○ c9516583d53b default@
│ ○ f6ae7810ef56
├─╯
○ 7d5738ba9943
◆ 000000000000
[EOF]
");
}
/// Test forgetting workspaces
#[test]
fn test_workspaces_forget() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.write_file("file", "contents");
main_dir.run_jj(["new"]).success();
main_dir
.run_jj(["workspace", "add", "../secondary"])
.success();
let output = main_dir.run_jj(["workspace", "forget"]);
insta::assert_snapshot!(output, @"");
// When listing workspaces, only the secondary workspace shows up
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
secondary: pmmvwywv 31da1455 (empty) (no description set)
[EOF]
");
// `jj status` tells us that there's no working copy here
let output = main_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
No working copy
[EOF]
");
// The old working copy doesn't get an "@" in the log output
// TODO: It seems useful to still have the "secondary@" marker here even though
// there's only one workspace. We should show it when the command is not run
// from that workspace.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 31da14559558
○ 006bd1130b84
◆ 000000000000
[EOF]
");
// Revision "@" cannot be used
let output = main_dir.run_jj(["log", "-r", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Workspace `default` doesn't have a working-copy commit
[EOF]
[exit status: 1]
");
// Try to add back the workspace
// TODO: We should make this just add it back instead of failing
let output = main_dir.run_jj(["workspace", "add", "."]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Workspace already exists
[EOF]
[exit status: 1]
");
// Add a third workspace...
main_dir.run_jj(["workspace", "add", "../third"]).success();
// ... and then forget it, and the secondary workspace too
let output = main_dir.run_jj(["workspace", "forget", "secondary", "third"]);
insta::assert_snapshot!(output, @"");
// No workspaces left
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @"");
}
#[test]
fn test_workspaces_forget_multi_transaction() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.write_file("file", "contents");
main_dir.run_jj(["new"]).success();
main_dir.run_jj(["workspace", "add", "../second"]).success();
main_dir.run_jj(["workspace", "add", "../third"]).success();
// there should be three workspaces
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz f6bf8819 (empty) (no description set)
second: pmmvwywv 31da1455 (empty) (no description set)
third: rzvqmyuk bf5b5b4d (empty) (no description set)
[EOF]
");
// delete two at once, in a single tx
main_dir
.run_jj(["workspace", "forget", "second", "third"])
.success();
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz f6bf8819 (empty) (no description set)
[EOF]
");
// the op log should have multiple workspaces forgotten in a single tx
let output = main_dir.run_jj(["op", "log", "--limit", "1"]);
insta::assert_snapshot!(output, @r"
@ d3aded9a10b6 test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
│ forget workspaces second, third
│ args: jj workspace forget second third
[EOF]
");
// now, undo, and that should restore both workspaces
main_dir.run_jj(["op", "undo"]).success();
// finally, there should be three workspaces at the end
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz f6bf8819 (empty) (no description set)
second: pmmvwywv 31da1455 (empty) (no description set)
third: rzvqmyuk bf5b5b4d (empty) (no description set)
[EOF]
");
}
#[test]
fn test_workspaces_forget_abandon_commits() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir.write_file("file", "contents");
main_dir.run_jj(["workspace", "add", "../second"]).success();
main_dir.run_jj(["workspace", "add", "../third"]).success();
main_dir.run_jj(["workspace", "add", "../fourth"]).success();
let third_dir = test_env.work_dir("third");
third_dir.run_jj(["edit", "second@"]).success();
let fourth_dir = test_env.work_dir("fourth");
fourth_dir.run_jj(["edit", "second@"]).success();
// there should be four workspaces, three of which are at the same empty commit
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: qpvuntsm 006bd113 (no description set)
fourth: uuqppmxq 94f41578 (empty) (no description set)
second: uuqppmxq 94f41578 (empty) (no description set)
third: uuqppmxq 94f41578 (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 006bd1130b84 default@
│ ○ 94f41578a9e1 fourth@ second@ third@
├─╯
◆ 000000000000
[EOF]
");
// delete the default workspace (should not abandon commit since not empty)
main_dir
.run_jj(["workspace", "forget", "default"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 94f41578a9e1 fourth@ second@ third@
│ ○ 006bd1130b84
├─╯
◆ 000000000000
[EOF]
");
// delete the second workspace (should not abandon commit since other workspaces
// still have commit checked out)
main_dir.run_jj(["workspace", "forget", "second"]).success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 94f41578a9e1 fourth@ third@
│ ○ 006bd1130b84
├─╯
◆ 000000000000
[EOF]
");
// delete the last 2 workspaces (commit should be abandoned now even though
// forgotten in same tx)
main_dir
.run_jj(["workspace", "forget", "third", "fourth"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 006bd1130b84
◆ 000000000000
[EOF]
");
}
/// Test context of commit summary template
#[test]
fn test_list_workspaces_template() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
test_env.add_config(
r#"
templates.commit_summary = """commit_id.short() ++ " " ++ description.first_line() ++
if(current_working_copy, " (current)")"""
"#,
);
let main_dir = test_env.work_dir("main");
let secondary_dir = test_env.work_dir("secondary");
main_dir.write_file("file", "contents");
main_dir.run_jj(["commit", "-m", "initial"]).success();
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
// "current_working_copy" should point to the workspace we operate on
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: 504e3d8c1bcd (current)
second: 058f604dffcd
[EOF]
");
let output = secondary_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: 504e3d8c1bcd
second: 058f604dffcd (current)
[EOF]
");
}
/// Test getting the workspace root from primary and secondary workspaces
#[test]
fn test_workspaces_root() {
let test_env = TestEnvironment::default();
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");
let output = main_dir.run_jj(["workspace", "root"]);
insta::assert_snapshot!(output, @r"
$TEST_ENV/main
[EOF]
");
let main_subdir_dir = main_dir.create_dir("subdir");
let output = main_subdir_dir.run_jj(["workspace", "root"]);
insta::assert_snapshot!(output, @r"
$TEST_ENV/main
[EOF]
");
main_dir
.run_jj(["workspace", "add", "--name", "secondary", "../secondary"])
.success();
let output = secondary_dir.run_jj(["workspace", "root"]);
insta::assert_snapshot!(output, @r"
$TEST_ENV/secondary
[EOF]
");
let secondary_subdir_dir = secondary_dir.create_dir("subdir");
let output = secondary_subdir_dir.run_jj(["workspace", "root"]);
insta::assert_snapshot!(output, @r"
$TEST_ENV/secondary
[EOF]
");
}
#[test]
fn test_debug_snapshot() {
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("file", "contents");
work_dir.run_jj(["debug", "snapshot"]).success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 594dfebf2565 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ snapshot working copy
│ args: jj debug snapshot
○ 8f47435a3990 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
│ add workspace 'default'
○ 000000000000 root()
[EOF]
");
work_dir.run_jj(["describe", "-m", "initial"]).success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 81e4a0f2e793 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ describe commit 006bd1130b84e90ab082adeabd7409270d5a86da
│ args: jj describe -m initial
○ 594dfebf2565 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ snapshot working copy
│ args: jj debug snapshot
○ 8f47435a3990 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
│ add workspace 'default'
○ 000000000000 root()
[EOF]
");
}
#[test]
fn test_workspaces_rename_nothing_changed() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
let output = main_dir.run_jj(["workspace", "rename", "default"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Nothing changed.
[EOF]
");
}
#[test]
fn test_workspaces_rename_new_workspace_name_already_used() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
let output = main_dir.run_jj(["workspace", "rename", "second"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Failed to rename a workspace
Caused by: Workspace second already exists
[EOF]
[exit status: 1]
");
}
#[test]
fn test_workspaces_rename_forgotten_workspace() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
main_dir.run_jj(["workspace", "forget", "second"]).success();
let secondary_dir = test_env.work_dir("secondary");
let output = secondary_dir.run_jj(["workspace", "rename", "third"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The current workspace 'second' is not tracked in the repo.
[EOF]
[exit status: 1]
");
}
#[test]
fn test_workspaces_rename_workspace() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "main"]).success();
let main_dir = test_env.work_dir("main");
main_dir
.run_jj(["workspace", "add", "--name", "second", "../secondary"])
.success();
let secondary_dir = test_env.work_dir("secondary");
// Both workspaces show up when we list them
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: qpvuntsm e8849ae1 (empty) (no description set)
second: uuqppmxq 94f41578 (empty) (no description set)
[EOF]
");
let output = secondary_dir.run_jj(["workspace", "rename", "third"]);
insta::assert_snapshot!(output, @"");
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: qpvuntsm e8849ae1 (empty) (no description set)
third: uuqppmxq 94f41578 (empty) (no description set)
[EOF]
");
// Can see the working-copy commit in each workspace in the log output.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ e8849ae12c70 default@
│ ○ 94f41578a9e1 third@
├─╯
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ 94f41578a9e1 third@
│ ○ e8849ae12c70 default@
├─╯
◆ 000000000000
[EOF]
");
}
#[must_use]
fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"
separate(" ",
commit_id.short(),
working_copies,
if(divergent, "(divergent)"),
)
"#;
work_dir.run_jj(["log", "-T", template, "-r", "all()"])
}
|