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 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531
|
// 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::Path;
use std::path::PathBuf;
use itertools::Itertools as _;
use regex::Regex;
use testutils::git;
use crate::common::to_toml_value;
use crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[test]
fn test_op_log() {
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", "-m", "description 0"])
.success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'description 0'
○ 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]
");
let op_log_lines = output.stdout.raw().lines().collect_vec();
let add_workspace_id = op_log_lines[3].split(' ').nth(2).unwrap();
// Can load the repo at a specific operation ID
insta::assert_snapshot!(get_log_output(&work_dir, add_workspace_id), @r"
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
// "@" resolves to the head operation
insta::assert_snapshot!(get_log_output(&work_dir, "@"), @r"
@ 3ae22e7f50a15d393e412cca72d09a61165d0c84
◆ 0000000000000000000000000000000000000000
[EOF]
");
// "@-" resolves to the parent of the head operation
insta::assert_snapshot!(get_log_output(&work_dir, "@-"), @r"
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["log", "--at-op", "@---"]), @r#"
------- stderr -------
Error: The "@---" expression resolved to no operations
[EOF]
[exit status: 1]
"#);
// We get a reasonable message if an invalid operation ID is specified
insta::assert_snapshot!(work_dir.run_jj(["log", "--at-op", "foo"]), @r#"
------- stderr -------
Error: Operation ID "foo" is not a valid hexadecimal prefix
[EOF]
[exit status: 1]
"#);
let output = work_dir.run_jj(["op", "log", "--op-diff"]);
insta::assert_snapshot!(output, @r"
@ 12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'description 0'
│
│ Changed commits:
│ ○ + qpvuntsm 3ae22e7f (empty) description 0
│ - qpvuntsm hidden e8849ae1 (empty) (no description set)
│
│ Changed working copy default@:
│ + qpvuntsm 3ae22e7f (empty) description 0
│ - qpvuntsm hidden e8849ae1 (empty) (no description set)
○ 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'
│
│ Changed commits:
│ ○ + qpvuntsm e8849ae1 (empty) (no description set)
│
│ Changed working copy default@:
│ + qpvuntsm e8849ae1 (empty) (no description set)
│ - (absent)
○ 000000000000 root()
[EOF]
");
let output = work_dir.run_jj(["op", "log", "--op-diff", "--color=always"]);
insta::assert_snapshot!(output, @r"
[1m[38;5;2m@[0m [1m[38;5;12m12f7cbba4278[39m [38;5;3mtest-username@host.example.com[39m [38;5;14m2001-02-03 04:05:08.000 +07:00[39m - [38;5;14m2001-02-03 04:05:08.000 +07:00[39m[0m
│ [1mdescribe commit e8849ae12c709f2321908879bc724fdb2ab8a781[0m
│ [1m[38;5;13margs: jj describe -m 'description 0'[39m[0m
│
│ Changed commits:
│ ○ [38;5;2m+[39m [1m[38;5;13mq[38;5;8mpvuntsm[39m [38;5;12m3[38;5;8mae22e7f[39m [38;5;10m(empty)[39m description 0[0m
│ [38;5;1m-[39m [1m[39mq[0m[38;5;8mpvuntsm[39m hidden [1m[38;5;4me[0m[38;5;8m8849ae1[39m [38;5;2m(empty)[39m [38;5;2m(no description set)[39m
│
│ Changed working copy [38;5;2mdefault@[39m:
│ [38;5;2m+[39m [1m[38;5;13mq[38;5;8mpvuntsm[39m [38;5;12m3[38;5;8mae22e7f[39m [38;5;10m(empty)[39m description 0[0m
│ [38;5;1m-[39m [1m[39mq[0m[38;5;8mpvuntsm[39m hidden [1m[38;5;4me[0m[38;5;8m8849ae1[39m [38;5;2m(empty)[39m [38;5;2m(no description set)[39m
○ [38;5;4m8f47435a3990[39m [38;5;3mtest-username@host.example.com[39m [38;5;6m2001-02-03 04:05:07.000 +07:00[39m - [38;5;6m2001-02-03 04:05:07.000 +07:00[39m
│ add workspace 'default'
│
│ Changed commits:
│ ○ [38;5;2m+[39m [1m[38;5;13mq[38;5;8mpvuntsm[39m [38;5;12me[38;5;8m8849ae1[39m [38;5;10m(empty)[39m [38;5;10m(no description set)[0m
│
│ Changed working copy [38;5;2mdefault@[39m:
│ [38;5;2m+[39m [1m[38;5;13mq[38;5;8mpvuntsm[39m [38;5;12me[38;5;8m8849ae1[39m [38;5;10m(empty)[39m [38;5;10m(no description set)[0m
│ [38;5;1m-[39m (absent)
○ [38;5;4m000000000000[39m [38;5;2mroot()[39m
[EOF]
");
work_dir
.run_jj(["describe", "-m", "description 1"])
.success();
work_dir
.run_jj([
"describe",
"-m",
"description 2",
"--at-op",
add_workspace_id,
])
.success();
insta::assert_snapshot!(work_dir.run_jj(["log", "--at-op", "@-"]), @r#"
------- stderr -------
Error: The "@" expression resolved to more than one operation
Hint: Try specifying one of the operations by ID: a57c1debcef0, 6a23c2d6dc15
[EOF]
[exit status: 1]
"#);
}
#[test]
fn test_op_log_with_custom_symbols() {
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", "-m", "description 0"])
.success();
let output = work_dir.run_jj([
"op",
"log",
"--config=templates.op_log_node='if(current_operation, \"$\", if(root, \"┴\", \"┝\"))'",
]);
insta::assert_snapshot!(output, @r"
$ 12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'description 0'
┝ 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_op_log_with_no_template() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["op", "log", "-T"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
error: a value is required for '--template <TEMPLATE>' but none was supplied
For more information, try '--help'.
Hint: The following template aliases are defined:
- builtin_config_list
- builtin_config_list_detailed
- builtin_draft_commit_description
- builtin_log_comfortable
- builtin_log_compact
- builtin_log_compact_full_description
- builtin_log_detailed
- builtin_log_node
- builtin_log_node_ascii
- builtin_log_oneline
- builtin_op_log_comfortable
- builtin_op_log_compact
- builtin_op_log_node
- builtin_op_log_node_ascii
- builtin_op_log_oneline
- commit_summary_separator
- default_commit_description
- description_placeholder
- email_placeholder
- git_format_patch_email_headers
- name_placeholder
[EOF]
[exit status: 2]
");
}
#[test]
fn test_op_log_limit() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["op", "log", "-Tdescription", "--limit=1"]);
insta::assert_snapshot!(output, @r"
@ add workspace 'default'
[EOF]
");
}
#[test]
fn test_op_log_no_graph() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["op", "log", "--no-graph", "--color=always"]);
insta::assert_snapshot!(output, @r"
[1m[38;5;12m8f47435a3990[39m [38;5;3mtest-username@host.example.com[39m [38;5;14m2001-02-03 04:05:07.000 +07:00[39m - [38;5;14m2001-02-03 04:05:07.000 +07:00[39m[0m
[1madd workspace 'default'[0m
[38;5;4m000000000000[39m [38;5;2mroot()[39m
[EOF]
");
let output = work_dir.run_jj(["op", "log", "--op-diff", "--no-graph"]);
insta::assert_snapshot!(output, @r"
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'
Changed commits:
+ qpvuntsm e8849ae1 (empty) (no description set)
Changed working copy default@:
+ qpvuntsm e8849ae1 (empty) (no description set)
- (absent)
000000000000 root()
[EOF]
");
}
#[test]
fn test_op_log_reversed() {
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", "-m", "description 0"])
.success();
let output = work_dir.run_jj(["op", "log", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ 000000000000 root()
○ 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'
@ 12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
args: jj describe -m 'description 0'
[EOF]
");
work_dir
.run_jj(["describe", "-m", "description 1", "--at-op", "@-"])
.success();
// Should be able to display log with fork and branch points
let output = work_dir.run_jj(["op", "log", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ 000000000000 root()
○ 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'
│ ○ 39f59ea3ec6e 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 e8849ae12c709f2321908879bc724fdb2ab8a781
│ │ args: jj describe -m 'description 1' --at-op @-
○ │ 12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
├─╯ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'description 0'
@ fa6e12f12705 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
reconcile divergent operations
args: jj op log --reversed
[EOF]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
// Should work correctly with `--no-graph`
let output = work_dir.run_jj(["op", "log", "--reversed", "--no-graph"]);
insta::assert_snapshot!(output, @r"
000000000000 root()
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'
39f59ea3ec6e 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 e8849ae12c709f2321908879bc724fdb2ab8a781
args: jj describe -m 'description 1' --at-op @-
12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
args: jj describe -m 'description 0'
fa6e12f12705 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
reconcile divergent operations
args: jj op log --reversed
[EOF]
");
// Should work correctly with `--limit`
let output = work_dir.run_jj(["op", "log", "--reversed", "--limit=3"]);
insta::assert_snapshot!(output, @r"
○ 39f59ea3ec6e 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 e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'description 1' --at-op @-
│ ○ 12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
├─╯ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'description 0'
@ fa6e12f12705 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
reconcile divergent operations
args: jj op log --reversed
[EOF]
");
// Should work correctly with `--limit` and `--no-graph`
let output = work_dir.run_jj(["op", "log", "--reversed", "--limit=2", "--no-graph"]);
insta::assert_snapshot!(output, @r"
12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
args: jj describe -m 'description 0'
fa6e12f12705 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
reconcile divergent operations
args: jj op log --reversed
[EOF]
");
}
#[test]
fn test_op_log_no_graph_null_terminated() {
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(["commit", "-m", "message1"]).success();
work_dir.run_jj(["commit", "-m", "message2"]).success();
let output = work_dir
.run_jj([
"op",
"log",
"--no-graph",
"--template",
r#"id.short(4) ++ "\0""#,
])
.success();
insta::assert_debug_snapshot!(output.stdout.normalized(), @r#""a9e5\00265\08f47\00000\0""#);
}
#[test]
fn test_op_log_template() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let render = |template| work_dir.run_jj(["op", "log", "-T", template]);
insta::assert_snapshot!(render(r#"id ++ "\n""#), @r"
@ 8f47435a3990362feaf967ca6de2eb0a31c8b883dfcb66fba5c22200d12bbe61e3dc8bc855f1f6879285fcafaf85ac792f9a43bcc36e57d28737d18347d5e752
○ 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
[EOF]
");
insta::assert_snapshot!(
render(r#"separate(" ", id.short(5), current_operation, user,
time.start(), time.end(), time.duration()) ++ "\n""#), @r"
@ 8f474 true test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 2001-02-03 04:05:07.000 +07:00 less than a microsecond
○ 00000 false @ 1970-01-01 00:00:00.000 +00:00 1970-01-01 00:00:00.000 +00:00 less than a microsecond
[EOF]
");
// Negative length shouldn't cause panic.
insta::assert_snapshot!(render(r#"id.short(-1) ++ "|""#), @r"
@ <Error: out of range integral type conversion attempted>|
○ <Error: out of range integral type conversion attempted>|
[EOF]
");
// Test the default template, i.e. with relative start time and duration. We
// don't generally use that template because it depends on the current time,
// so we need to reset the time range format here.
test_env.add_config(
r#"
[template-aliases]
'format_time_range(time_range)' = 'time_range.end().ago() ++ ", lasted " ++ time_range.duration()'
"#,
);
let regex = Regex::new(r"\d\d years").unwrap();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(
output.normalize_stdout_with(|s| regex.replace_all(&s, "NN years").into_owned()), @r"
@ 8f47435a3990 test-username@host.example.com NN years ago, lasted less than a microsecond
│ add workspace 'default'
○ 000000000000 root()
[EOF]
");
}
#[test]
fn test_op_log_builtin_templates() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Render without graph to test line ending
let render = |template| work_dir.run_jj(["op", "log", "-T", template, "--no-graph"]);
work_dir
.run_jj(["describe", "-m", "description 0"])
.success();
insta::assert_snapshot!(render(r#"builtin_op_log_compact"#), @r"
12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
args: jj describe -m 'description 0'
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]
");
insta::assert_snapshot!(render(r#"builtin_op_log_comfortable"#), @r"
12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
args: jj describe -m 'description 0'
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]
");
insta::assert_snapshot!(render(r#"builtin_op_log_oneline"#), @r"
12f7cbba4278 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781 args: jj describe -m 'description 0'
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_op_log_word_wrap() {
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".repeat(100));
work_dir.run_jj(["debug", "snapshot"]).success();
let render = |args: &[&str], columns: u32, word_wrap: bool| {
let word_wrap = to_toml_value(word_wrap);
work_dir.run_jj_with(|cmd| {
cmd.args(args)
.arg(format!("--config=ui.log-word-wrap={word_wrap}"))
.env("COLUMNS", columns.to_string())
})
};
// ui.log-word-wrap option works
insta::assert_snapshot!(render(&["op", "log"], 40, false), @r"
@ 2144f9621985 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]
");
insta::assert_snapshot!(render(&["op", "log"], 40, true), @r"
@ 2144f9621985
│ 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]
");
// Nested graph should be wrapped
insta::assert_snapshot!(render(&["op", "log", "--op-diff"], 40, true), @r"
@ 2144f9621985
│ 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
│
│ Changed commits:
│ ○ + qpvuntsm 79f0968d (no
│ description set)
│ - qpvuntsm hidden e8849ae1 (empty)
│ (no description set)
│
│ Changed working copy default@:
│ + qpvuntsm 79f0968d (no description
│ set)
│ - qpvuntsm hidden e8849ae1 (empty)
│ (no description set)
○ 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'
│
│ Changed commits:
│ ○ + qpvuntsm e8849ae1 (empty) (no
│ description set)
│
│ Changed working copy default@:
│ + qpvuntsm e8849ae1 (empty) (no
│ description set)
│ - (absent)
○ 000000000000 root()
[EOF]
");
// Nested diff stat shouldn't exceed the terminal width
insta::assert_snapshot!(render(&["op", "log", "-n1", "--stat"], 40, true), @r"
@ 2144f9621985
│ 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
│
│ Changed commits:
│ ○ + qpvuntsm 79f0968d (no
│ description set)
│ - qpvuntsm hidden e8849ae1 (empty)
│ (no description set)
│ file1 | 100 +++++++++++++++++++
│ 1 file changed, 100 insertions(+), 0 deletions(-)
│
│ Changed working copy default@:
│ + qpvuntsm 79f0968d (no description
│ set)
│ - qpvuntsm hidden e8849ae1 (empty)
│ (no description set)
[EOF]
");
insta::assert_snapshot!(render(&["op", "log", "-n1", "--no-graph", "--stat"], 40, true), @r"
2144f9621985
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
Changed commits:
+ qpvuntsm 79f0968d (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no
description set)
file1 | 100 +++++++++++++++++++++++++
1 file changed, 100 insertions(+), 0 deletions(-)
Changed working copy default@:
+ qpvuntsm 79f0968d (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no
description set)
[EOF]
");
// Nested graph widths should be subtracted from the term width
let config = r#"templates.commit_summary='"0 1 2 3 4 5 6 7 8 9"'"#;
insta::assert_snapshot!(
render(&["op", "log", "-T''", "--op-diff", "-n1", "--config", config], 15, true), @r"
@
│
│ Changed
│ commits:
│ ○ + 0 1 2 3
│ 4 5 6 7 8
│ 9
│ - 0 1 2 3
│ 4 5 6 7 8
│ 9
│
│ Changed
│ working copy
│ default@:
│ + 0 1 2 3 4
│ 5 6 7 8 9
│ - 0 1 2 3 4
│ 5 6 7 8 9
[EOF]
");
}
#[test]
fn test_op_log_configurable() {
let test_env = TestEnvironment::default();
test_env.add_config(
r#"operation.hostname = "my-hostname"
operation.username = "my-username"
"#,
);
test_env
.run_jj_with(|cmd| {
cmd.args(["git", "init", "repo"])
.env_remove("JJ_OP_HOSTNAME")
.env_remove("JJ_OP_USERNAME")
})
.success();
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 906f45b6b2a8 my-username@my-hostname 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_op_abandon_ancestors() {
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(["commit", "-m", "commit 1"]).success();
work_dir.run_jj(["commit", "-m", "commit 2"]).success();
insta::assert_snapshot!(work_dir.run_jj(["op", "log"]), @r"
@ 3fc56f6bb4db test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ commit 4e0592f3dd52e7a4998a97d9a1f354e2727a856b
│ args: jj commit -m 'commit 2'
○ c815486340d5 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj commit -m 'commit 1'
○ 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]
");
// Abandon old operations. The working-copy operation id should be updated.
let output = work_dir.run_jj(["op", "abandon", "..@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 operations and reparented 1 descendant operations.
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["debug", "local-working-copy", "--ignore-working-copy"]), @r#"
Current operation: OperationId("1675333b7de89b5da012c696d797345bad2a6ce55a4b605e85c3897f818f05e11e8c53de19d34c2fee38a36528dc95bd2a378f72ac0877f8bec2513a68043253")
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
[EOF]
"#);
insta::assert_snapshot!(work_dir.run_jj(["op", "log"]), @r"
@ 1675333b7de8 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ commit 4e0592f3dd52e7a4998a97d9a1f354e2727a856b
│ args: jj commit -m 'commit 2'
○ 000000000000 root()
[EOF]
");
// Abandon operation range.
work_dir.run_jj(["commit", "-m", "commit 3"]).success();
work_dir.run_jj(["commit", "-m", "commit 4"]).success();
work_dir.run_jj(["commit", "-m", "commit 5"]).success();
let output = work_dir.run_jj(["op", "abandon", "@---..@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 operations and reparented 1 descendant operations.
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["op", "log"]), @r"
@ 9df33337d494 test-username@host.example.com 2001-02-03 04:05:16.000 +07:00 - 2001-02-03 04:05:16.000 +07:00
│ commit 2f3e935ade915272ccdce9e43e5a5c82fc336aee
│ args: jj commit -m 'commit 5'
○ 1675333b7de8 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ commit 4e0592f3dd52e7a4998a97d9a1f354e2727a856b
│ args: jj commit -m 'commit 2'
○ 000000000000 root()
[EOF]
");
// Can't abandon the current operation.
let output = work_dir.run_jj(["op", "abandon", "..@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Cannot abandon the current operation 9df33337d494
Hint: Run `jj undo` to revert the current operation, then use `jj op abandon`
[EOF]
[exit status: 1]
");
// Can't create concurrent abandoned operations explicitly.
let output = work_dir.run_jj(["op", "abandon", "--at-op=@-", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: --at-op is not respected
[EOF]
[exit status: 2]
");
// Abandon the current operation by undoing it first.
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj(["op", "abandon", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 operations and reparented 1 descendant operations.
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["debug", "local-working-copy", "--ignore-working-copy"]), @r#"
Current operation: OperationId("4666f57b051cb0d73145999d689331e34224bf6bad69c367498d7fc25f0d89d230146e7234526004426d515b396b13b9de8daadf54003eaf678f4264c0a7d992")
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
[EOF]
"#);
insta::assert_snapshot!(work_dir.run_jj(["op", "log"]), @r"
@ 4666f57b051c test-username@host.example.com 2001-02-03 04:05:21.000 +07:00 - 2001-02-03 04:05:21.000 +07:00
│ undo operation 9df33337d49450b21bf694025557ede1ac4c63c7b17f593add0d7adc81b394d363f1edffa025b323f88ec947dcd9214f46e82e742e7a74adbfff4c2d96321133
│ args: jj undo
○ 1675333b7de8 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ commit 4e0592f3dd52e7a4998a97d9a1f354e2727a856b
│ args: jj commit -m 'commit 2'
○ 000000000000 root()
[EOF]
");
// Abandon empty range.
let output = work_dir.run_jj(["op", "abandon", "@-..@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Nothing changed.
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["op", "log", "-n1"]), @r"
@ 4666f57b051c test-username@host.example.com 2001-02-03 04:05:21.000 +07:00 - 2001-02-03 04:05:21.000 +07:00
│ undo operation 9df33337d49450b21bf694025557ede1ac4c63c7b17f593add0d7adc81b394d363f1edffa025b323f88ec947dcd9214f46e82e742e7a74adbfff4c2d96321133
│ args: jj undo
[EOF]
");
}
#[test]
fn test_op_abandon_without_updating_working_copy() {
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(["commit", "-m", "commit 1"]).success();
work_dir.run_jj(["commit", "-m", "commit 2"]).success();
work_dir.run_jj(["commit", "-m", "commit 3"]).success();
// Abandon without updating the working copy.
let output = work_dir.run_jj(["op", "abandon", "@-", "--ignore-working-copy"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 operations and reparented 1 descendant operations.
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["debug", "local-working-copy", "--ignore-working-copy"]), @r#"
Current operation: OperationId("0d4bb8e4a2babc4c216be0f9bde32aeef888abebde0062aeb1c204dde5e1f476fa951fcbeceb2263cf505008ba87a834849469dede30dfc589f37d5073aedfbe")
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
[EOF]
"#);
insta::assert_snapshot!(work_dir.run_jj(["op", "log", "-n1", "--ignore-working-copy"]), @r"
@ f5e2d13c1aac test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ commit 4b087e94a5d14530c3953d617623d075a13294c8
│ args: jj commit -m 'commit 3'
[EOF]
");
// The working-copy operation id isn't updated if it differs from the repo.
// It could be updated if the tree matches, but there's no extra logic for
// that.
let output = work_dir.run_jj(["op", "abandon", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 operations and reparented 1 descendant operations.
Warning: The working copy operation 0d4bb8e4a2ba is not updated because it differs from the repo f5e2d13c1aac.
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["debug", "local-working-copy", "--ignore-working-copy"]), @r#"
Current operation: OperationId("0d4bb8e4a2babc4c216be0f9bde32aeef888abebde0062aeb1c204dde5e1f476fa951fcbeceb2263cf505008ba87a834849469dede30dfc589f37d5073aedfbe")
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
[EOF]
"#);
insta::assert_snapshot!(work_dir.run_jj(["op", "log", "-n1", "--ignore-working-copy"]), @r"
@ aa53bfb9a190 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ commit 4b087e94a5d14530c3953d617623d075a13294c8
│ args: jj commit -m 'commit 3'
[EOF]
");
}
#[test]
fn test_op_abandon_multiple_heads() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Create 1 base operation + 2 operations to be diverged.
work_dir.run_jj(["commit", "-m", "commit 1"]).success();
work_dir.run_jj(["commit", "-m", "commit 2"]).success();
work_dir.run_jj(["commit", "-m", "commit 3"]).success();
let output = work_dir
.run_jj(["op", "log", "--no-graph", r#"-Tid.short() ++ "\n""#])
.success();
let [head_op_id, prev_op_id] = output.stdout.raw().lines().next_array().unwrap();
insta::assert_snapshot!(head_op_id, @"0d4bb8e4a2ba");
insta::assert_snapshot!(prev_op_id, @"3fc56f6bb4db");
// Create 1 other concurrent operation.
work_dir
.run_jj(["commit", "--at-op=@--", "-m", "commit 4"])
.success();
// Can't resolve operation relative to @.
let output = work_dir.run_jj(["op", "abandon", "@-"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: The "@" expression resolved to more than one operation
Hint: Try specifying one of the operations by ID: 0d4bb8e4a2ba, 56b918336386
[EOF]
[exit status: 1]
"#);
let (_, other_head_op_id) = output.stderr.raw().trim_end().rsplit_once(", ").unwrap();
insta::assert_snapshot!(other_head_op_id, @"56b918336386");
assert_ne!(head_op_id, other_head_op_id);
// Can't abandon one of the head operations.
let output = work_dir.run_jj(["op", "abandon", head_op_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Cannot abandon the current operation 0d4bb8e4a2ba
[EOF]
[exit status: 1]
");
// Can't abandon the other head operation.
let output = work_dir.run_jj(["op", "abandon", other_head_op_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Cannot abandon the current operation 56b918336386
[EOF]
[exit status: 1]
");
// Can abandon the operation which is not an ancestor of the other head.
// This would crash if we attempted to remap the unchanged op in the op
// heads store.
let output = work_dir.run_jj(["op", "abandon", prev_op_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 operations and reparented 2 descendant operations.
[EOF]
");
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 4bc6ca79dcdc test-username@host.example.com 2001-02-03 04:05:17.000 +07:00 - 2001-02-03 04:05:17.000 +07:00
├─╮ reconcile divergent operations
│ │ args: jj op log
○ │ f5e2d13c1aac test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ │ commit 4b087e94a5d14530c3953d617623d075a13294c8
│ │ args: jj commit -m 'commit 3'
│ ○ 56b918336386 test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
├─╯ commit 4e0592f3dd52e7a4998a97d9a1f354e2727a856b
│ args: jj commit '--at-op=@--' -m 'commit 4'
○ c815486340d5 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj commit -m 'commit 1'
○ 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]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
}
#[test]
fn test_op_recover_from_bad_gc() {
let test_env = TestEnvironment::default();
test_env
.run_jj_in(".", ["git", "init", "repo", "--colocate"])
.success();
let work_dir = test_env.work_dir("repo");
let git_object_path = |hex: &str| {
let (shard, file_name) = hex.split_at(2);
let mut file_path = work_dir.root().to_owned();
file_path.extend([".git", "objects", shard, file_name]);
file_path
};
work_dir.run_jj(["describe", "-m1"]).success();
work_dir.run_jj(["describe", "-m2"]).success(); // victim
work_dir.run_jj(["abandon"]).success(); // break predecessors chain
work_dir.run_jj(["new", "-m3"]).success();
work_dir.run_jj(["describe", "-m4"]).success();
let output = work_dir
.run_jj(["op", "log", "--no-graph", r#"-Tid.short() ++ "\n""#])
.success();
let [head_op_id, _, _, bad_op_id] = output.stdout.raw().lines().next_array().unwrap();
insta::assert_snapshot!(head_op_id, @"9a34044af622");
insta::assert_snapshot!(bad_op_id, @"65860cfb750d");
// Corrupt the repo by removing hidden but reachable commit object.
let output = work_dir
.run_jj([
"log",
"--at-op",
bad_op_id,
"--no-graph",
"-r@",
"-Tcommit_id",
])
.success();
let bad_commit_id = output.stdout.into_raw();
insta::assert_snapshot!(bad_commit_id, @"4e123bae951c3216a145dbcd56d60522739d362e");
std::fs::remove_file(git_object_path(&bad_commit_id)).unwrap();
// Do concurrent modification to make the situation even worse. At this
// point, the index can be loaded, so this command succeeds.
work_dir
.run_jj(["--at-op=@-", "describe", "-m4.1"])
.success();
let output = work_dir.run_jj(["--at-op", head_op_id, "debug", "reindex"]);
insta::assert_snapshot!(output.strip_stderr_last_line(), @r"
------- stderr -------
Internal error: Failed to index commits at operation 65860cfb750d760cabfc2ba588b16b1619e048bbd2dcb0295d0d32442da72beee0675a5ea07c47e28e297572d385826f6286e16efd885f2f94114692688fb87f
Caused by:
1: Object 4e123bae951c3216a145dbcd56d60522739d362e of type commit not found
[EOF]
[exit status: 255]
");
// "op log" should still be usable.
let output = work_dir.run_jj(["op", "log", "--ignore-working-copy", "--at-op", head_op_id]);
insta::assert_snapshot!(output, @r"
@ 9a34044af622 test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
│ describe commit a053bc8736064a739ab73f2c775a6ac2851bf1a3
│ args: jj describe -m4
○ c08e984b3923 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
│ new empty commit
│ args: jj new -m3
○ 9988649fbebb test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ abandon commit 4e123bae951c3216a145dbcd56d60522739d362e
│ args: jj abandon
○ 65860cfb750d test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ describe commit 884fe9b9c65602d724c7c0f2a238d5549efbe5e6
│ args: jj describe -m2
○ 0a7467a95483 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m1
○ 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]
");
// "op abandon" should work.
let output = work_dir.run_jj(["op", "abandon", &format!("..{bad_op_id}")]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 3 operations and reparented 4 descendant operations.
[EOF]
");
// The repo should no longer be corrupt.
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ mzvwutvl?? test.user@example.com 2001-02-03 08:05:12 29d07a2d
│ (empty) 4
│ ○ mzvwutvl?? test.user@example.com 2001-02-03 08:05:15 bc027e2c
├─╯ (empty) 4.1
○ zsuskuln test.user@example.com 2001-02-03 08:05:10 git_head() c2934cfb
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
}
#[test]
fn test_op_corrupted_operation_file() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let op_store_path = work_dir
.root()
.join(PathBuf::from_iter([".jj", "repo", "op_store"]));
let op_id = work_dir.current_operation_id();
insta::assert_snapshot!(op_id, @"8f47435a3990362feaf967ca6de2eb0a31c8b883dfcb66fba5c22200d12bbe61e3dc8bc855f1f6879285fcafaf85ac792f9a43bcc36e57d28737d18347d5e752");
let op_file_path = op_store_path.join("operations").join(&op_id);
assert!(op_file_path.exists());
// truncated
std::fs::write(&op_file_path, b"").unwrap();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Internal error: Failed to load an operation
Caused by:
1: Error when reading object 8f47435a3990362feaf967ca6de2eb0a31c8b883dfcb66fba5c22200d12bbe61e3dc8bc855f1f6879285fcafaf85ac792f9a43bcc36e57d28737d18347d5e752 of type operation
2: Invalid hash length (expected 64 bytes, got 0 bytes)
[EOF]
[exit status: 255]
");
// undecodable
std::fs::write(&op_file_path, b"\0").unwrap();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Internal error: Failed to load an operation
Caused by:
1: Error when reading object 8f47435a3990362feaf967ca6de2eb0a31c8b883dfcb66fba5c22200d12bbe61e3dc8bc855f1f6879285fcafaf85ac792f9a43bcc36e57d28737d18347d5e752 of type operation
2: failed to decode Protobuf message: invalid tag value: 0
[EOF]
[exit status: 255]
");
}
#[test]
fn test_op_summary_diff_template() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Tests in color (easier to read with `less -R`)
work_dir
.run_jj(["new", "--no-edit", "-m=scratch"])
.success();
let output = work_dir.run_jj(["op", "undo", "--color=always"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: [38;5;4m8c2682708d2e[39m ([38;5;6m2001-02-03 08:05:08[39m) new empty commit
[EOF]
");
let output = work_dir.run_jj([
"op",
"diff",
"--from",
"0000000",
"--to",
"@",
"--color=always",
]);
insta::assert_snapshot!(output, @r"
From operation: [38;5;4m000000000000[39m [38;5;2mroot()[39m
To operation: [38;5;4m5b09d908ed2f[39m ([38;5;6m2001-02-03 08:05:09[39m) undo operation 8c2682708d2e786e9c489d18b4cfc68c675d0d49b9be85de9540a973b775c7ef715c0a37c760fe74ee6a31e50487f6d64e392944124a1d288ca31493bf9e36f2
Changed commits:
○ [38;5;2m+[39m [1m[38;5;13mq[38;5;8mpvuntsm[39m [38;5;12me[38;5;8m8849ae1[39m [38;5;10m(empty)[39m [38;5;10m(no description set)[0m
Changed working copy [38;5;2mdefault@[39m:
[38;5;2m+[39m [1m[38;5;13mq[38;5;8mpvuntsm[39m [38;5;12me[38;5;8m8849ae1[39m [38;5;10m(empty)[39m [38;5;10m(no description set)[0m
[38;5;1m-[39m (absent)
[EOF]
");
// Tests with templates
work_dir
.run_jj(["new", "--no-edit", "-m=scratch"])
.success();
let output = work_dir.run_jj(["op", "undo", "--color=debug"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: [38;5;4m<<operation id short::0f553bee92fc>>[39m<<operation:: (>>[38;5;6m<<operation time end local format::2001-02-03 08:05:11>>[39m<<operation::) >><<operation description first_line::new empty commit>>
[EOF]
");
let output = work_dir.run_jj([
"op",
"diff",
"--from",
"0000000",
"--to",
"@",
"--color=debug",
]);
insta::assert_snapshot!(output, @r"
From operation: [38;5;4m<<op_diff operation id short::000000000000>>[39m<<op_diff operation:: >>[38;5;2m<<op_diff operation root::root()>>[39m
To operation: [38;5;4m<<op_diff operation id short::8840c54e3995>>[39m<<op_diff operation:: (>>[38;5;6m<<op_diff operation time end local format::2001-02-03 08:05:12>>[39m<<op_diff operation::) >><<op_diff operation description first_line::undo operation 0f553bee92fc9d54642c987c93e78aa1f391225cf8b82a5a0198782a4e49753e65fae15bc648b81b913f514a11ca15840e9a6a083e2e3a9198cebf09ebde06f2>>
Changed commits:
○ [38;5;2m<<diff added::+>>[39m [1m[38;5;13m<<op_diff commit working_copy change_id shortest prefix::q>>[38;5;8m<<op_diff commit working_copy change_id shortest rest::pvuntsm>>[39m<<op_diff commit working_copy:: >>[38;5;12m<<op_diff commit working_copy commit_id shortest prefix::e>>[38;5;8m<<op_diff commit working_copy commit_id shortest rest::8849ae1>>[39m<<op_diff commit working_copy:: >>[38;5;10m<<op_diff commit working_copy empty::(empty)>>[39m<<op_diff commit working_copy:: >>[38;5;10m<<op_diff commit working_copy empty description placeholder::(no description set)>>[0m
Changed working copy [38;5;2m<<working_copies::default@>>[39m:
[38;5;2m<<diff added::+>>[39m [1m[38;5;13m<<op_diff commit working_copy change_id shortest prefix::q>>[38;5;8m<<op_diff commit working_copy change_id shortest rest::pvuntsm>>[39m<<op_diff commit working_copy:: >>[38;5;12m<<op_diff commit working_copy commit_id shortest prefix::e>>[38;5;8m<<op_diff commit working_copy commit_id shortest rest::8849ae1>>[39m<<op_diff commit working_copy:: >>[38;5;10m<<op_diff commit working_copy empty::(empty)>>[39m<<op_diff commit working_copy:: >>[38;5;10m<<op_diff commit working_copy empty description placeholder::(no description set)>>[0m
[38;5;1m<<diff removed::->>[39m (absent)
[EOF]
");
}
#[test]
fn test_op_diff() {
let test_env = TestEnvironment::default();
let git_repo_path = test_env.env_root().join("git-repo");
let git_repo = init_bare_git_repo(&git_repo_path);
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir
.run_jj(["git", "remote", "add", "origin", "../git-repo"])
.success();
work_dir.run_jj(["git", "fetch"]).success();
work_dir
.run_jj(["bookmark", "track", "bookmark-1@origin"])
.success();
// Overview of op log.
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ f63e1950e7be test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ track remote bookmark bookmark-1@origin
│ args: jj bookmark track bookmark-1@origin
○ e922d994bdc4 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ fetch from git remote(s) origin
│ args: jj git fetch
○ 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]
");
// Diff between the same operation should be empty.
let output = work_dir.run_jj(["op", "diff", "--from", "0000000", "--to", "0000000"]);
insta::assert_snapshot!(output, @r"
From operation: 000000000000 root()
To operation: 000000000000 root()
[EOF]
");
let output = work_dir.run_jj(["op", "diff", "--from", "@", "--to", "@"]);
insta::assert_snapshot!(output, @r"
From operation: f63e1950e7be (2001-02-03 08:05:10) track remote bookmark bookmark-1@origin
To operation: f63e1950e7be (2001-02-03 08:05:10) track remote bookmark bookmark-1@origin
[EOF]
");
// Diff from parent operation to latest operation.
// `jj op diff --op @` should behave identically to `jj op diff --from
// @- --to @` (if `@` is not a merge commit).
let output = work_dir.run_jj(["op", "diff", "--from", "@-", "--to", "@"]);
insta::assert_snapshot!(output, @r"
From operation: e922d994bdc4 (2001-02-03 08:05:09) fetch from git remote(s) origin
To operation: f63e1950e7be (2001-02-03 08:05:10) track remote bookmark bookmark-1@origin
Changed local bookmarks:
bookmark-1:
+ pukowqtp 0cb7e07e bookmark-1 | Commit 1
- (absent)
Changed remote bookmarks:
bookmark-1@origin:
+ tracked pukowqtp 0cb7e07e bookmark-1 | Commit 1
- untracked pukowqtp 0cb7e07e bookmark-1 | Commit 1
[EOF]
");
let output_without_from_to = work_dir.run_jj(["op", "diff"]);
assert_eq!(output, output_without_from_to);
// Diff from root operation to latest operation
let output = work_dir.run_jj(["op", "diff", "--from", "0000000"]);
insta::assert_snapshot!(output, @r"
From operation: 000000000000 root()
To operation: f63e1950e7be (2001-02-03 08:05:10) track remote bookmark bookmark-1@origin
Changed commits:
○ + rnnslrkn 4ff62539 bookmark-2@origin | Commit 2
○ + rnnkyono 11671e4c bookmark-3@origin | Commit 3
○ + pukowqtp 0cb7e07e bookmark-1 | Commit 1
○ + qpvuntsm e8849ae1 (empty) (no description set)
Changed working copy default@:
+ qpvuntsm e8849ae1 (empty) (no description set)
- (absent)
Changed local bookmarks:
bookmark-1:
+ pukowqtp 0cb7e07e bookmark-1 | Commit 1
- (absent)
Changed remote bookmarks:
bookmark-1@origin:
+ tracked pukowqtp 0cb7e07e bookmark-1 | Commit 1
- untracked (absent)
bookmark-2@origin:
+ untracked rnnslrkn 4ff62539 bookmark-2@origin | Commit 2
- untracked (absent)
bookmark-3@origin:
+ untracked rnnkyono 11671e4c bookmark-3@origin | Commit 3
- untracked (absent)
[EOF]
");
// Diff from latest operation to root operation
let output = work_dir.run_jj(["op", "diff", "--to", "0000000"]);
insta::assert_snapshot!(output, @r"
From operation: f63e1950e7be (2001-02-03 08:05:10) track remote bookmark bookmark-1@origin
To operation: 000000000000 root()
Changed commits:
○ - rnnslrkn hidden 4ff62539 Commit 2
○ - rnnkyono hidden 11671e4c Commit 3
○ - pukowqtp hidden 0cb7e07e Commit 1
○ - qpvuntsm hidden e8849ae1 (empty) (no description set)
Changed working copy default@:
+ (absent)
- qpvuntsm hidden e8849ae1 (empty) (no description set)
Changed local bookmarks:
bookmark-1:
+ (absent)
- pukowqtp hidden 0cb7e07e Commit 1
Changed remote bookmarks:
bookmark-1@origin:
+ untracked (absent)
- tracked pukowqtp hidden 0cb7e07e Commit 1
bookmark-2@origin:
+ untracked (absent)
- untracked rnnslrkn hidden 4ff62539 Commit 2
bookmark-3@origin:
+ untracked (absent)
- untracked rnnkyono hidden 11671e4c Commit 3
[EOF]
");
// Create a conflicted bookmark using a concurrent operation.
work_dir
.run_jj([
"bookmark",
"set",
"bookmark-1",
"-r",
"bookmark-2@origin",
"--at-op",
"@-",
])
.success();
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
│ ○ pukowqtp someone@example.org 1970-01-01 11:00:00 bookmark-1?? bookmark-1@origin 0cb7e07e
├─╯ Commit 1
◆ zzzzzzzz root() 00000000
[EOF]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 913172f3f51a test-username@host.example.com 2001-02-03 04:05:19.000 +07:00 - 2001-02-03 04:05:19.000 +07:00
├─╮ reconcile divergent operations
│ │ args: jj log
○ │ f63e1950e7be test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ │ track remote bookmark bookmark-1@origin
│ │ args: jj bookmark track bookmark-1@origin
│ ○ 5a866c412d4a test-username@host.example.com 2001-02-03 04:05:18.000 +07:00 - 2001-02-03 04:05:18.000 +07:00
├─╯ point bookmark bookmark-1 to commit 4ff6253913375c6ebdddd8423c11df3b3f17e331
│ args: jj bookmark set bookmark-1 -r bookmark-2@origin --at-op @-
○ e922d994bdc4 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ fetch from git remote(s) origin
│ args: jj git fetch
○ 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]
");
let op_log_lines = output.stdout.raw().lines().collect_vec();
let op_id = op_log_lines[0].split(' ').nth(4).unwrap();
let first_parent_id = op_log_lines[3].split(' ').nth(3).unwrap();
let second_parent_id = op_log_lines[6].split(' ').nth(3).unwrap();
// Diff between the first parent of the merge operation and the merge operation.
let output = work_dir.run_jj(["op", "diff", "--from", first_parent_id, "--to", op_id]);
insta::assert_snapshot!(output, @r"
From operation: f63e1950e7be (2001-02-03 08:05:10) track remote bookmark bookmark-1@origin
To operation: 913172f3f51a (2001-02-03 08:05:19) reconcile divergent operations
Changed local bookmarks:
bookmark-1:
+ (added) pukowqtp 0cb7e07e bookmark-1?? bookmark-1@origin | Commit 1
+ (added) rnnslrkn 4ff62539 bookmark-1?? bookmark-2@origin | Commit 2
- pukowqtp 0cb7e07e bookmark-1?? bookmark-1@origin | Commit 1
[EOF]
");
// Diff between the second parent of the merge operation and the merge
// operation.
let output = work_dir.run_jj(["op", "diff", "--from", second_parent_id, "--to", op_id]);
insta::assert_snapshot!(output, @r"
From operation: 5a866c412d4a (2001-02-03 08:05:18) point bookmark bookmark-1 to commit 4ff6253913375c6ebdddd8423c11df3b3f17e331
To operation: 913172f3f51a (2001-02-03 08:05:19) reconcile divergent operations
Changed local bookmarks:
bookmark-1:
+ (added) pukowqtp 0cb7e07e bookmark-1?? bookmark-1@origin | Commit 1
+ (added) rnnslrkn 4ff62539 bookmark-1?? bookmark-2@origin | Commit 2
- rnnslrkn 4ff62539 bookmark-1?? bookmark-2@origin | Commit 2
Changed remote bookmarks:
bookmark-1@origin:
+ tracked pukowqtp 0cb7e07e bookmark-1?? bookmark-1@origin | Commit 1
- untracked pukowqtp 0cb7e07e bookmark-1?? bookmark-1@origin | Commit 1
[EOF]
");
// Test fetching from git remote.
modify_git_repo(git_repo);
let output = work_dir.run_jj(["git", "fetch"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
bookmark: bookmark-1@origin [updated] tracked
bookmark: bookmark-2@origin [updated] untracked
bookmark: bookmark-3@origin [deleted] untracked
Abandoned 1 commits that are no longer reachable.
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: 913172f3f51a (2001-02-03 08:05:19) reconcile divergent operations
To operation: 0e0a422f79d9 (2001-02-03 08:05:23) fetch from git remote(s) origin
Changed commits:
○ + kulxwnxm e1a239a5 bookmark-2@origin | Commit 5
○ + zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
○ - rnnkyono hidden 11671e4c Commit 3
Changed local bookmarks:
bookmark-1:
+ (added) zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
+ (added) rnnslrkn 4ff62539 bookmark-1?? | Commit 2
- (added) pukowqtp 0cb7e07e Commit 1
- (added) rnnslrkn 4ff62539 bookmark-1?? | Commit 2
Changed remote bookmarks:
bookmark-1@origin:
+ tracked zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
- tracked pukowqtp 0cb7e07e Commit 1
bookmark-2@origin:
+ untracked kulxwnxm e1a239a5 bookmark-2@origin | Commit 5
- untracked rnnslrkn 4ff62539 bookmark-1?? | Commit 2
bookmark-3@origin:
+ untracked (absent)
- untracked rnnkyono hidden 11671e4c Commit 3
[EOF]
");
// Test creation of bookmark.
let output = work_dir.run_jj([
"bookmark",
"create",
"bookmark-2",
"-r",
"bookmark-2@origin",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to kulxwnxm e1a239a5 bookmark-2 bookmark-2@origin | Commit 5
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: 0e0a422f79d9 (2001-02-03 08:05:23) fetch from git remote(s) origin
To operation: f39e1e8ef9e6 (2001-02-03 08:05:25) create bookmark bookmark-2 pointing to commit e1a239a57eb15cefc5910198befbbbe2b43c47af
Changed local bookmarks:
bookmark-2:
+ kulxwnxm e1a239a5 bookmark-2 bookmark-2@origin | Commit 5
- (absent)
[EOF]
");
// Test tracking of bookmark.
let output = work_dir.run_jj(["bookmark", "track", "bookmark-2@origin"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Started tracking 1 remote bookmarks.
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: f39e1e8ef9e6 (2001-02-03 08:05:25) create bookmark bookmark-2 pointing to commit e1a239a57eb15cefc5910198befbbbe2b43c47af
To operation: 691bbfe04a96 (2001-02-03 08:05:27) track remote bookmark bookmark-2@origin
Changed remote bookmarks:
bookmark-2@origin:
+ tracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
- untracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
[EOF]
");
// Test creation of new commit.
// Test tracking of bookmark.
let output = work_dir.run_jj(["bookmark", "track", "bookmark-2@origin"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: Remote bookmark already tracked: bookmark-2@origin
Nothing changed.
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: f39e1e8ef9e6 (2001-02-03 08:05:25) create bookmark bookmark-2 pointing to commit e1a239a57eb15cefc5910198befbbbe2b43c47af
To operation: 691bbfe04a96 (2001-02-03 08:05:27) track remote bookmark bookmark-2@origin
Changed remote bookmarks:
bookmark-2@origin:
+ tracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
- untracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
[EOF]
");
// Test creation of new commit.
let output = work_dir.run_jj(["new", "bookmark-1@origin", "-m", "new commit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: xlzxqlsl 731ab199 (empty) new commit
Parent commit (@-) : zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
Added 2 files, modified 0 files, removed 0 files
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: 691bbfe04a96 (2001-02-03 08:05:27) track remote bookmark bookmark-2@origin
To operation: 60a91a8c707a (2001-02-03 08:05:31) new empty commit
Changed commits:
○ + xlzxqlsl 731ab199 (empty) new commit
○ - qpvuntsm hidden e8849ae1 (empty) (no description set)
Changed working copy default@:
+ xlzxqlsl 731ab199 (empty) new commit
- qpvuntsm hidden e8849ae1 (empty) (no description set)
[EOF]
");
// Test updating of local bookmark.
let output = work_dir.run_jj(["bookmark", "set", "bookmark-1", "-r", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to xlzxqlsl 731ab199 bookmark-1* | (empty) new commit
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: 60a91a8c707a (2001-02-03 08:05:31) new empty commit
To operation: 9f7576674264 (2001-02-03 08:05:33) point bookmark bookmark-1 to commit 731ab19950fc6fc1199b9ea73cb8b9016f22e8f3
Changed local bookmarks:
bookmark-1:
+ xlzxqlsl 731ab199 bookmark-1* | (empty) new commit
- (added) zkmtkqvo 0dee6313 bookmark-1@origin | Commit 4
- (added) rnnslrkn 4ff62539 Commit 2
[EOF]
");
// Test deletion of local bookmark.
let output = work_dir.run_jj(["bookmark", "delete", "bookmark-2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Deleted 1 bookmarks.
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: 9f7576674264 (2001-02-03 08:05:33) point bookmark bookmark-1 to commit 731ab19950fc6fc1199b9ea73cb8b9016f22e8f3
To operation: 9b51b9c5a5ee (2001-02-03 08:05:35) delete bookmark bookmark-2
Changed local bookmarks:
bookmark-2:
+ (absent)
- kulxwnxm e1a239a5 bookmark-2@origin | Commit 5
[EOF]
");
// Test pushing to Git remote.
let output = work_dir.run_jj(["git", "push", "--tracked", "--deleted"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark-1 from 0dee631320b1 to 731ab19950fc
Delete bookmark bookmark-2 from e1a239a57eb1
[EOF]
");
let output = work_dir.run_jj(["op", "diff"]);
insta::assert_snapshot!(output, @r"
From operation: 9b51b9c5a5ee (2001-02-03 08:05:35) delete bookmark bookmark-2
To operation: 7a434343b4ad (2001-02-03 08:05:37) push all tracked bookmarks to git remote origin
Changed remote bookmarks:
bookmark-1@origin:
+ tracked xlzxqlsl 731ab199 bookmark-1 | (empty) new commit
- tracked zkmtkqvo 0dee6313 Commit 4
bookmark-2@origin:
+ untracked (absent)
- tracked kulxwnxm e1a239a5 Commit 5
[EOF]
");
}
#[test]
fn test_op_diff_patch() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Update working copy with a single file and create new commit.
work_dir.write_file("file", "a\n");
let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz c1c924b8 (empty) (no description set)
Parent commit (@-) : qpvuntsm 6b57e33c (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "diff", "--op", "@-", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
From operation: 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
To operation: 688a949038f6 (2001-02-03 08:05:08) snapshot working copy
Changed commits:
○ + qpvuntsm 6b57e33c (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no description set)
diff --git a/file b/file
new file mode 100644
index 0000000000..7898192261
--- /dev/null
+++ b/file
@@ -0,0 +1,1 @@
+a
Changed working copy default@:
+ qpvuntsm 6b57e33c (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "diff", "--op", "@", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
From operation: 688a949038f6 (2001-02-03 08:05:08) snapshot working copy
To operation: ed6f6674bcf8 (2001-02-03 08:05:08) new empty commit
Changed commits:
○ + rlvkpnrz c1c924b8 (empty) (no description set)
Changed working copy default@:
+ rlvkpnrz c1c924b8 (empty) (no description set)
- qpvuntsm 6b57e33c (no description set)
[EOF]
");
// Squash the working copy commit.
work_dir.write_file("file", "b\n");
let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl 6cbd01ae (empty) (no description set)
Parent commit (@-) : qpvuntsm 7aa2ec5d (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "diff", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
From operation: 36a5d140ea10 (2001-02-03 08:05:11) snapshot working copy
To operation: cfb8edbeae42 (2001-02-03 08:05:11) squash commits into 6b57e33cc56babbeaa6bcd6e2a296236b52ad93c
Changed commits:
○ + mzvwutvl 6cbd01ae (empty) (no description set)
│ ○ - rlvkpnrz hidden 05a2969e (no description set)
├─╯ diff --git a/file b/file
│ index 7898192261..6178079822 100644
│ --- a/file
│ +++ b/file
│ @@ -1,1 +1,1 @@
│ -a
│ +b
○ + qpvuntsm 7aa2ec5d (no description set)
- qpvuntsm hidden 6b57e33c (no description set)
diff --git a/file b/file
index 7898192261..6178079822 100644
--- a/file
+++ b/file
@@ -1,1 +1,1 @@
-a
+b
Changed working copy default@:
+ mzvwutvl 6cbd01ae (empty) (no description set)
- rlvkpnrz hidden 05a2969e (no description set)
[EOF]
");
// Abandon the working copy commit.
let output = work_dir.run_jj(["abandon"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
mzvwutvl 6cbd01ae (empty) (no description set)
Working copy (@) now at: yqosqzyt c97a8573 (empty) (no description set)
Parent commit (@-) : qpvuntsm 7aa2ec5d (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "diff", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
From operation: cfb8edbeae42 (2001-02-03 08:05:11) squash commits into 6b57e33cc56babbeaa6bcd6e2a296236b52ad93c
To operation: dd1ab16f2720 (2001-02-03 08:05:13) abandon commit 6cbd01aefe5ae05a015328311dbd63b7305b8ebe
Changed commits:
○ + yqosqzyt c97a8573 (empty) (no description set)
○ - mzvwutvl hidden 6cbd01ae (empty) (no description set)
Changed working copy default@:
+ yqosqzyt c97a8573 (empty) (no description set)
- mzvwutvl hidden 6cbd01ae (empty) (no description set)
[EOF]
");
}
#[test]
fn test_op_diff_sibling() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
let output = work_dir
.run_jj(["op", "log", "--no-graph", r#"-Tid.short() ++ "\n""#])
.success();
let base_op_id = output.stdout.raw().lines().next().unwrap();
insta::assert_snapshot!(base_op_id, @"8f47435a3990");
// Create merge commit at one operation side. The parent trees will have to
// be merged when diffing, which requires the commit index of this side.
work_dir.run_jj(["new", "root()", "-mA.1"]).success();
work_dir.write_file("file1", "a\n");
work_dir.run_jj(["new", "root()", "-mA.2"]).success();
work_dir.write_file("file2", "a\n");
work_dir.run_jj(["new", "all:@-+", "-mA"]).success();
// Create another operation diverged from the base operation.
work_dir
.run_jj(["describe", "--at-op", base_op_id, "-mB"])
.success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ 0fce99d88f9f test-username@host.example.com 2001-02-03 04:05:13.000 +07:00 - 2001-02-03 04:05:13.000 +07:00
├─╮ reconcile divergent operations
│ │ args: jj op log
○ │ 9f1e89c03a5b test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
│ │ new empty commit
│ │ args: jj new 'all:@-+' -mA
○ │ 1f3ff302e831 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
│ │ snapshot working copy
│ │ args: jj new 'all:@-+' -mA
○ │ a625f0ff4f09 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ │ new empty commit
│ │ args: jj new 'root()' -mA.2
○ │ 1e7f1f82a257 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ │ snapshot working copy
│ │ args: jj new 'root()' -mA.2
○ │ 3f5210eaa799 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ │ new empty commit
│ │ args: jj new 'root()' -mA.1
│ ○ 252ff3a5a0e6 test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
├─╯ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe --at-op 8f47435a3990 -mB
○ 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]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
let output = work_dir
.run_jj(["op", "log", "--no-graph", r#"-Tid.short() ++ "\n""#])
.success();
let [head_op_id, p1_op_id, _, _, _, _, p2_op_id] =
output.stdout.raw().lines().next_array().unwrap();
insta::assert_snapshot!(head_op_id, @"0fce99d88f9f");
insta::assert_snapshot!(p1_op_id, @"9f1e89c03a5b");
insta::assert_snapshot!(p2_op_id, @"252ff3a5a0e6");
// Diff between p1 and p2 operations should work no matter if p2 is chosen
// as a base operation.
let output = work_dir.run_jj([
"op",
"diff",
"--at-op",
p1_op_id,
"--from",
p1_op_id,
"--to",
p2_op_id,
"--summary",
]);
insta::assert_snapshot!(output, @r"
From operation: 9f1e89c03a5b (2001-02-03 08:05:11) new empty commit
To operation: 252ff3a5a0e6 (2001-02-03 08:05:12) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
Changed commits:
○ + qpvuntsm b1ca67e2 (empty) B
○ - mzvwutvl hidden 08c63613 (empty) A
├─╮
│ ○ - kkmpptxz hidden 6c70a4f7 A.1
│ A file1
○ - zsuskuln hidden 47b9525e A.2
A file2
Changed working copy default@:
+ qpvuntsm b1ca67e2 (empty) B
- mzvwutvl hidden 08c63613 (empty) A
[EOF]
");
let output = work_dir.run_jj([
"op",
"diff",
"--at-op",
p2_op_id,
"--from",
p2_op_id,
"--to",
p1_op_id,
"--summary",
]);
insta::assert_snapshot!(output, @r"
From operation: 252ff3a5a0e6 (2001-02-03 08:05:12) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
To operation: 9f1e89c03a5b (2001-02-03 08:05:11) new empty commit
Changed commits:
○ + mzvwutvl 08c63613 (empty) A
├─╮
│ ○ + kkmpptxz 6c70a4f7 A.1
│ A file1
○ + zsuskuln 47b9525e A.2
A file2
○ - qpvuntsm hidden b1ca67e2 (empty) B
Changed working copy default@:
+ mzvwutvl 08c63613 (empty) A
- qpvuntsm hidden b1ca67e2 (empty) B
[EOF]
");
}
#[test]
fn test_op_diff_word_wrap() {
let test_env = TestEnvironment::default();
let git_repo_path = test_env.env_root().join("git-repo");
init_bare_git_repo(&git_repo_path);
test_env
.run_jj_in(".", ["git", "clone", "git-repo", "repo"])
.success();
let work_dir = test_env.work_dir("repo");
let render = |args: &[&str], columns: u32, word_wrap: bool| {
let word_wrap = to_toml_value(word_wrap);
work_dir.run_jj_with(|cmd| {
cmd.args(args)
.arg(format!("--config=ui.log-word-wrap={word_wrap}"))
.env("COLUMNS", columns.to_string())
})
};
// Add some file content changes
work_dir.write_file("file1", "foo\n".repeat(100));
work_dir.run_jj(["debug", "snapshot"]).success();
// ui.log-word-wrap option works, and diff stat respects content width
insta::assert_snapshot!(render(&["op", "diff", "--from=@---", "--stat"], 40, true), @r"
From operation: 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
To operation: 4fe1b71ec70b (2001-02-03 08:05:08) snapshot working copy
Changed commits:
○ + sqpuoqvx f6f32c19 (no description
│ set)
│ file1 | 100 ++++++++++++++++++++++
│ 1 file changed, 100 insertions(+), 0 deletions(-)
○ + pukowqtp 0cb7e07e bookmark-1 |
Commit 1
some-file | 1 +
1 file changed, 1 insertion(+), 0 deletions(-)
○ + rnnslrkn 4ff62539 bookmark-2@origin
| Commit 2
some-file | 1 +
1 file changed, 1 insertion(+), 0 deletions(-)
○ + rnnkyono 11671e4c bookmark-3@origin
| Commit 3
some-file | 1 +
1 file changed, 1 insertion(+), 0 deletions(-)
○ - qpvuntsm hidden e8849ae1 (empty)
(no description set)
0 files changed, 0 insertions(+), 0 deletions(-)
Changed working copy default@:
+ sqpuoqvx f6f32c19 (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no
description set)
Changed local bookmarks:
bookmark-1:
+ pukowqtp 0cb7e07e bookmark-1 | Commit
1
- (absent)
Changed remote bookmarks:
bookmark-1@origin:
+ tracked pukowqtp 0cb7e07e bookmark-1 |
Commit 1
- untracked (absent)
bookmark-2@origin:
+ untracked rnnslrkn 4ff62539
bookmark-2@origin | Commit 2
- untracked (absent)
bookmark-3@origin:
+ untracked rnnkyono 11671e4c
bookmark-3@origin | Commit 3
- untracked (absent)
[EOF]
");
// Graph width should be subtracted from the term width
let config = r#"templates.commit_summary='"0 1 2 3 4 5 6 7 8 9"'"#;
insta::assert_snapshot!(
render(&["op", "diff", "--from=@---", "--config", config], 10, true), @r"
From operation: 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
To operation: 4fe1b71ec70b (2001-02-03 08:05:08) snapshot working copy
Changed
commits:
○ + 0 1 2
│ 3 4 5 6
│ 7 8 9
○ + 0 1 2
3 4 5 6
7 8 9
○ + 0 1 2
3 4 5 6
7 8 9
○ + 0 1 2
3 4 5 6
7 8 9
○ - 0 1 2
3 4 5 6
7 8 9
Changed
working
copy
default@:
+ 0 1 2 3
4 5 6 7 8
9
- 0 1 2 3
4 5 6 7 8
9
Changed
local
bookmarks:
bookmark-1:
+ 0 1 2 3
4 5 6 7 8
9
- (absent)
Changed
remote
bookmarks:
bookmark-1@origin:
+ tracked
0 1 2 3 4
5 6 7 8 9
-
untracked
(absent)
bookmark-2@origin:
+
untracked
0 1 2 3 4
5 6 7 8 9
-
untracked
(absent)
bookmark-3@origin:
+
untracked
0 1 2 3 4
5 6 7 8 9
-
untracked
(absent)
[EOF]
");
}
#[test]
fn test_op_show() {
let test_env = TestEnvironment::default();
let git_repo_path = test_env.env_root().join("git-repo");
let git_repo = init_bare_git_repo(&git_repo_path);
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir
.run_jj(["git", "remote", "add", "origin", "../git-repo"])
.success();
work_dir.run_jj(["git", "fetch"]).success();
work_dir
.run_jj(["bookmark", "track", "bookmark-1@origin"])
.success();
// Overview of op log.
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ f63e1950e7be test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ track remote bookmark bookmark-1@origin
│ args: jj bookmark track bookmark-1@origin
○ e922d994bdc4 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ fetch from git remote(s) origin
│ args: jj git fetch
○ 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]
");
// The root operation is empty.
let output = work_dir.run_jj(["op", "show", "0000000"]);
insta::assert_snapshot!(output, @r"
000000000000 root()
[EOF]
");
// Showing the latest operation.
let output = work_dir.run_jj(["op", "show", "@"]);
insta::assert_snapshot!(output, @r"
f63e1950e7be test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
track remote bookmark bookmark-1@origin
args: jj bookmark track bookmark-1@origin
Changed local bookmarks:
bookmark-1:
+ pukowqtp 0cb7e07e bookmark-1 | Commit 1
- (absent)
Changed remote bookmarks:
bookmark-1@origin:
+ tracked pukowqtp 0cb7e07e bookmark-1 | Commit 1
- untracked pukowqtp 0cb7e07e bookmark-1 | Commit 1
[EOF]
");
// `jj op show @` should behave identically to `jj op show`.
let output_without_op_id = work_dir.run_jj(["op", "show"]);
assert_eq!(output, output_without_op_id);
// Showing a given operation.
let output = work_dir.run_jj(["op", "show", "@-"]);
insta::assert_snapshot!(output, @r"
e922d994bdc4 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
fetch from git remote(s) origin
args: jj git fetch
Changed commits:
○ + rnnslrkn 4ff62539 bookmark-2@origin | Commit 2
○ + rnnkyono 11671e4c bookmark-3@origin | Commit 3
○ + pukowqtp 0cb7e07e bookmark-1@origin | Commit 1
Changed remote bookmarks:
bookmark-1@origin:
+ untracked pukowqtp 0cb7e07e bookmark-1@origin | Commit 1
- untracked (absent)
bookmark-2@origin:
+ untracked rnnslrkn 4ff62539 bookmark-2@origin | Commit 2
- untracked (absent)
bookmark-3@origin:
+ untracked rnnkyono 11671e4c bookmark-3@origin | Commit 3
- untracked (absent)
[EOF]
");
// Create a conflicted bookmark using a concurrent operation.
work_dir
.run_jj([
"bookmark",
"set",
"bookmark-1",
"-r",
"bookmark-2@origin",
"--at-op",
"@-",
])
.success();
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
│ ○ pukowqtp someone@example.org 1970-01-01 11:00:00 bookmark-1?? bookmark-1@origin 0cb7e07e
├─╯ Commit 1
◆ zzzzzzzz root() 00000000
[EOF]
------- stderr -------
Concurrent modification detected, resolving automatically.
[EOF]
");
// Showing a merge operation is empty.
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
d1cef38569e5 test-username@host.example.com 2001-02-03 04:05:17.000 +07:00 - 2001-02-03 04:05:17.000 +07:00
reconcile divergent operations
args: jj log
[EOF]
");
// Test fetching from git remote.
modify_git_repo(git_repo);
let output = work_dir.run_jj(["git", "fetch"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
bookmark: bookmark-1@origin [updated] tracked
bookmark: bookmark-2@origin [updated] untracked
bookmark: bookmark-3@origin [deleted] untracked
Abandoned 1 commits that are no longer reachable.
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
25f087162efe test-username@host.example.com 2001-02-03 04:05:19.000 +07:00 - 2001-02-03 04:05:19.000 +07:00
fetch from git remote(s) origin
args: jj git fetch
Changed commits:
○ + kulxwnxm e1a239a5 bookmark-2@origin | Commit 5
○ + zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
○ - rnnkyono hidden 11671e4c Commit 3
Changed local bookmarks:
bookmark-1:
+ (added) zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
+ (added) rnnslrkn 4ff62539 bookmark-1?? | Commit 2
- (added) pukowqtp 0cb7e07e Commit 1
- (added) rnnslrkn 4ff62539 bookmark-1?? | Commit 2
Changed remote bookmarks:
bookmark-1@origin:
+ tracked zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
- tracked pukowqtp 0cb7e07e Commit 1
bookmark-2@origin:
+ untracked kulxwnxm e1a239a5 bookmark-2@origin | Commit 5
- untracked rnnslrkn 4ff62539 bookmark-1?? | Commit 2
bookmark-3@origin:
+ untracked (absent)
- untracked rnnkyono hidden 11671e4c Commit 3
[EOF]
");
// Test creation of bookmark.
let output = work_dir.run_jj([
"bookmark",
"create",
"bookmark-2",
"-r",
"bookmark-2@origin",
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to kulxwnxm e1a239a5 bookmark-2 bookmark-2@origin | Commit 5
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
3f01d2bbe9da test-username@host.example.com 2001-02-03 04:05:21.000 +07:00 - 2001-02-03 04:05:21.000 +07:00
create bookmark bookmark-2 pointing to commit e1a239a57eb15cefc5910198befbbbe2b43c47af
args: jj bookmark create bookmark-2 -r bookmark-2@origin
Changed local bookmarks:
bookmark-2:
+ kulxwnxm e1a239a5 bookmark-2 bookmark-2@origin | Commit 5
- (absent)
[EOF]
");
// Test tracking of a bookmark.
let output = work_dir.run_jj(["bookmark", "track", "bookmark-2@origin"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Started tracking 1 remote bookmarks.
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
b9fec1580033 test-username@host.example.com 2001-02-03 04:05:23.000 +07:00 - 2001-02-03 04:05:23.000 +07:00
track remote bookmark bookmark-2@origin
args: jj bookmark track bookmark-2@origin
Changed remote bookmarks:
bookmark-2@origin:
+ tracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
- untracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
[EOF]
");
// Test creation of new commit.
let output = work_dir.run_jj(["bookmark", "track", "bookmark-2@origin"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: Remote bookmark already tracked: bookmark-2@origin
Nothing changed.
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
b9fec1580033 test-username@host.example.com 2001-02-03 04:05:23.000 +07:00 - 2001-02-03 04:05:23.000 +07:00
track remote bookmark bookmark-2@origin
args: jj bookmark track bookmark-2@origin
Changed remote bookmarks:
bookmark-2@origin:
+ tracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
- untracked kulxwnxm e1a239a5 bookmark-2 | Commit 5
[EOF]
");
// Test creation of new commit.
let output = work_dir.run_jj(["new", "bookmark-1@origin", "-m", "new commit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: tlkvzzqu 8f340dd7 (empty) new commit
Parent commit (@-) : zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
Added 2 files, modified 0 files, removed 0 files
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
de4c030a0bc0 test-username@host.example.com 2001-02-03 04:05:27.000 +07:00 - 2001-02-03 04:05:27.000 +07:00
new empty commit
args: jj new bookmark-1@origin -m 'new commit'
Changed commits:
○ + tlkvzzqu 8f340dd7 (empty) new commit
○ - qpvuntsm hidden e8849ae1 (empty) (no description set)
Changed working copy default@:
+ tlkvzzqu 8f340dd7 (empty) new commit
- qpvuntsm hidden e8849ae1 (empty) (no description set)
[EOF]
");
// Test updating of local bookmark.
let output = work_dir.run_jj(["bookmark", "set", "bookmark-1", "-r", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to tlkvzzqu 8f340dd7 bookmark-1* | (empty) new commit
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
3719246c9ba5 test-username@host.example.com 2001-02-03 04:05:29.000 +07:00 - 2001-02-03 04:05:29.000 +07:00
point bookmark bookmark-1 to commit 8f340dd76dc637e4deac17f30056eef7d8eaf682
args: jj bookmark set bookmark-1 -r @
Changed local bookmarks:
bookmark-1:
+ tlkvzzqu 8f340dd7 bookmark-1* | (empty) new commit
- (added) zkmtkqvo 0dee6313 bookmark-1@origin | Commit 4
- (added) rnnslrkn 4ff62539 Commit 2
[EOF]
");
// Test deletion of local bookmark.
let output = work_dir.run_jj(["bookmark", "delete", "bookmark-2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Deleted 1 bookmarks.
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
5dc28083437f test-username@host.example.com 2001-02-03 04:05:31.000 +07:00 - 2001-02-03 04:05:31.000 +07:00
delete bookmark bookmark-2
args: jj bookmark delete bookmark-2
Changed local bookmarks:
bookmark-2:
+ (absent)
- kulxwnxm e1a239a5 bookmark-2@origin | Commit 5
[EOF]
");
// Test pushing to Git remote.
let output = work_dir.run_jj(["git", "push", "--tracked", "--deleted"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark-1 from 0dee631320b1 to 8f340dd76dc6
Delete bookmark bookmark-2 from e1a239a57eb1
[EOF]
");
let output = work_dir.run_jj(["op", "show"]);
insta::assert_snapshot!(output, @r"
7d47c561dcb4 test-username@host.example.com 2001-02-03 04:05:33.000 +07:00 - 2001-02-03 04:05:33.000 +07:00
push all tracked bookmarks to git remote origin
args: jj git push --tracked --deleted
Changed remote bookmarks:
bookmark-1@origin:
+ tracked tlkvzzqu 8f340dd7 bookmark-1 | (empty) new commit
- tracked zkmtkqvo 0dee6313 Commit 4
bookmark-2@origin:
+ untracked (absent)
- tracked kulxwnxm e1a239a5 Commit 5
[EOF]
");
}
#[test]
fn test_op_show_patch() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Update working copy with a single file and create new commit.
work_dir.write_file("file", "a\n");
let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz c1c924b8 (empty) (no description set)
Parent commit (@-) : qpvuntsm 6b57e33c (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "show", "@-", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
688a949038f6 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 new
Changed commits:
○ + qpvuntsm 6b57e33c (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no description set)
diff --git a/file b/file
new file mode 100644
index 0000000000..7898192261
--- /dev/null
+++ b/file
@@ -0,0 +1,1 @@
+a
Changed working copy default@:
+ qpvuntsm 6b57e33c (no description set)
- qpvuntsm hidden e8849ae1 (empty) (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "show", "@", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
ed6f6674bcf8 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
new empty commit
args: jj new
Changed commits:
○ + rlvkpnrz c1c924b8 (empty) (no description set)
Changed working copy default@:
+ rlvkpnrz c1c924b8 (empty) (no description set)
- qpvuntsm 6b57e33c (no description set)
[EOF]
");
// Squash the working copy commit.
work_dir.write_file("file", "b\n");
let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl 6cbd01ae (empty) (no description set)
Parent commit (@-) : qpvuntsm 7aa2ec5d (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "show", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
cfb8edbeae42 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
squash commits into 6b57e33cc56babbeaa6bcd6e2a296236b52ad93c
args: jj squash
Changed commits:
○ + mzvwutvl 6cbd01ae (empty) (no description set)
│ ○ - rlvkpnrz hidden 05a2969e (no description set)
├─╯ diff --git a/file b/file
│ index 7898192261..6178079822 100644
│ --- a/file
│ +++ b/file
│ @@ -1,1 +1,1 @@
│ -a
│ +b
○ + qpvuntsm 7aa2ec5d (no description set)
- qpvuntsm hidden 6b57e33c (no description set)
diff --git a/file b/file
index 7898192261..6178079822 100644
--- a/file
+++ b/file
@@ -1,1 +1,1 @@
-a
+b
Changed working copy default@:
+ mzvwutvl 6cbd01ae (empty) (no description set)
- rlvkpnrz hidden 05a2969e (no description set)
[EOF]
");
// Abandon the working copy commit.
let output = work_dir.run_jj(["abandon"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
mzvwutvl 6cbd01ae (empty) (no description set)
Working copy (@) now at: yqosqzyt c97a8573 (empty) (no description set)
Parent commit (@-) : qpvuntsm 7aa2ec5d (no description set)
[EOF]
");
let output = work_dir.run_jj(["op", "show", "-p", "--git"]);
insta::assert_snapshot!(output, @r"
dd1ab16f2720 test-username@host.example.com 2001-02-03 04:05:13.000 +07:00 - 2001-02-03 04:05:13.000 +07:00
abandon commit 6cbd01aefe5ae05a015328311dbd63b7305b8ebe
args: jj abandon
Changed commits:
○ + yqosqzyt c97a8573 (empty) (no description set)
○ - mzvwutvl hidden 6cbd01ae (empty) (no description set)
Changed working copy default@:
+ yqosqzyt c97a8573 (empty) (no description set)
- mzvwutvl hidden 6cbd01ae (empty) (no description set)
[EOF]
");
// Try again with "op log".
let output = work_dir.run_jj(["op", "log", "--git"]);
insta::assert_snapshot!(output, @r"
@ dd1ab16f2720 test-username@host.example.com 2001-02-03 04:05:13.000 +07:00 - 2001-02-03 04:05:13.000 +07:00
│ abandon commit 6cbd01aefe5ae05a015328311dbd63b7305b8ebe
│ args: jj abandon
│
│ Changed commits:
│ ○ + yqosqzyt c97a8573 (empty) (no description set)
│ ○ - mzvwutvl hidden 6cbd01ae (empty) (no description set)
│
│ Changed working copy default@:
│ + yqosqzyt c97a8573 (empty) (no description set)
│ - mzvwutvl hidden 6cbd01ae (empty) (no description set)
○ cfb8edbeae42 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
│ squash commits into 6b57e33cc56babbeaa6bcd6e2a296236b52ad93c
│ args: jj squash
│
│ Changed commits:
│ ○ + mzvwutvl 6cbd01ae (empty) (no description set)
│ │ ○ - rlvkpnrz hidden 05a2969e (no description set)
│ ├─╯ diff --git a/file b/file
│ │ index 7898192261..6178079822 100644
│ │ --- a/file
│ │ +++ b/file
│ │ @@ -1,1 +1,1 @@
│ │ -a
│ │ +b
│ ○ + qpvuntsm 7aa2ec5d (no description set)
│ - qpvuntsm hidden 6b57e33c (no description set)
│ diff --git a/file b/file
│ index 7898192261..6178079822 100644
│ --- a/file
│ +++ b/file
│ @@ -1,1 +1,1 @@
│ -a
│ +b
│
│ Changed working copy default@:
│ + mzvwutvl 6cbd01ae (empty) (no description set)
│ - rlvkpnrz hidden 05a2969e (no description set)
○ 36a5d140ea10 test-username@host.example.com 2001-02-03 04:05:11.000 +07:00 - 2001-02-03 04:05:11.000 +07:00
│ snapshot working copy
│ args: jj squash
│
│ Changed commits:
│ ○ + rlvkpnrz 05a2969e (no description set)
│ - rlvkpnrz hidden c1c924b8 (empty) (no description set)
│ diff --git a/file b/file
│ index 7898192261..6178079822 100644
│ --- a/file
│ +++ b/file
│ @@ -1,1 +1,1 @@
│ -a
│ +b
│
│ Changed working copy default@:
│ + rlvkpnrz 05a2969e (no description set)
│ - rlvkpnrz hidden c1c924b8 (empty) (no description set)
○ ed6f6674bcf8 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ new empty commit
│ args: jj new
│
│ Changed commits:
│ ○ + rlvkpnrz c1c924b8 (empty) (no description set)
│
│ Changed working copy default@:
│ + rlvkpnrz c1c924b8 (empty) (no description set)
│ - qpvuntsm 6b57e33c (no description set)
○ 688a949038f6 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 new
│
│ Changed commits:
│ ○ + qpvuntsm 6b57e33c (no description set)
│ - qpvuntsm hidden e8849ae1 (empty) (no description set)
│ diff --git a/file b/file
│ new file mode 100644
│ index 0000000000..7898192261
│ --- /dev/null
│ +++ b/file
│ @@ -0,0 +1,1 @@
│ +a
│
│ Changed working copy default@:
│ + qpvuntsm 6b57e33c (no description set)
│ - qpvuntsm hidden e8849ae1 (empty) (no description set)
○ 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'
│
│ Changed commits:
│ ○ + qpvuntsm e8849ae1 (empty) (no description set)
│
│ Changed working copy default@:
│ + qpvuntsm e8849ae1 (empty) (no description set)
│ - (absent)
○ 000000000000 root()
[EOF]
");
}
fn init_bare_git_repo(git_repo_path: &Path) -> gix::Repository {
let git_repo = git::init_bare(git_repo_path);
let commit_result = git::add_commit(
&git_repo,
"refs/heads/bookmark-1",
"some-file",
b"some content",
"Commit 1",
&[],
);
git::write_commit(
&git_repo,
"refs/heads/bookmark-2",
commit_result.tree_id,
"Commit 2",
&[],
);
git::write_commit(
&git_repo,
"refs/heads/bookmark-3",
commit_result.tree_id,
"Commit 3",
&[],
);
git::set_head_to_id(&git_repo, commit_result.commit_id);
git_repo
}
fn modify_git_repo(git_repo: gix::Repository) -> gix::Repository {
let bookmark1_commit = git_repo
.find_reference("refs/heads/bookmark-1")
.unwrap()
.peel_to_commit()
.unwrap()
.id();
let bookmark2_commit = git_repo
.find_reference("refs/heads/bookmark-2")
.unwrap()
.peel_to_commit()
.unwrap()
.id();
let commit_result = git::add_commit(
&git_repo,
"refs/heads/bookmark-1",
"next-file",
b"more content",
"Commit 4",
&[bookmark1_commit.detach()],
);
git::write_commit(
&git_repo,
"refs/heads/bookmark-2",
commit_result.tree_id,
"Commit 5",
&[bookmark2_commit.detach()],
);
git_repo
.find_reference("refs/heads/bookmark-3")
.unwrap()
.delete()
.unwrap();
git_repo
}
#[must_use]
fn get_log_output(work_dir: &TestWorkDir, op_id: &str) -> CommandOutput {
work_dir.run_jj(["log", "-T", "commit_id", "--at-op", op_id, "-r", "all()"])
}
|