/usr/include/subversion-1/svn_wc.h is in libsvn-dev 1.6.17dfsg-3ubuntu3.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
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 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 | /**
* @copyright
* ====================================================================
* Copyright (c) 2000-2008 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://subversion.tigris.org/license-1.html.
* If newer versions of this license are posted there, you may use a
* newer version instead, at your option.
*
* This software consists of voluntary contributions made by many
* individuals. For exact contribution history, see the revision
* history and logs, available at http://subversion.tigris.org/.
* ====================================================================
* @endcopyright
*
* @file svn_wc.h
* @brief Subversion's working copy library
*
* Requires:
* - A working copy
*
* Provides:
* - Ability to manipulate working copy's versioned data.
* - Ability to manipulate working copy's administrative files.
*
* Used By:
* - Clients.
*
* Notes:
* The 'path' parameters to most of these functions can be
* absolute or relative (relative to current working
* directory). If there are any cases where they are
* relative to the path associated with the
* 'svn_wc_adm_access_t *adm_access' baton passed along
* with the path, those cases should be explicitly
* documented, and if they are not, please fix it.
*/
#ifndef SVN_WC_H
#define SVN_WC_H
#include <apr.h>
#include <apr_pools.h>
#include <apr_tables.h>
#include <apr_hash.h>
#include <apr_time.h>
#include <apr_file_io.h>
#include "svn_types.h"
#include "svn_string.h"
#include "svn_checksum.h"
#include "svn_io.h"
#include "svn_delta.h" /* for svn_stream_t */
#include "svn_opt.h"
#include "svn_ra.h" /* for svn_ra_reporter_t type */
#include "svn_version.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**
* Get libsvn_wc version information.
*
* @since New in 1.1.
*/
const svn_version_t *
svn_wc_version(void);
/**
* @defgroup svn_wc Working copy management
* @{
*/
/** Flags for use with svn_wc_translated_file2
*
* @defgroup translate_flags Translation flags
*
* @{
*/
/** Translate from Normal Form.
*
* The working copy text bases and repository files are stored
* in normal form. Some files' contents - or ever representation -
* differs between the working copy and the normal form. This flag
* specifies to take the latter form as input and transform it
* to the former.
*
* Either this flag or @c SVN_WC_TRANSLATE_TO_NF should be specified,
* but not both.
*/
#define SVN_WC_TRANSLATE_FROM_NF 0x00000000
/** Translate to Normal Form.
*
* Either this flag or @c SVN_WC_TRANSLATE_FROM_NF should be specified,
* but not both.
*/
#define SVN_WC_TRANSLATE_TO_NF 0x00000001
/** Force repair of eol styles, making sure the output file consistently
* contains the one eol style as specified by the svn:eol-style
* property and the required translation direction.
*
*/
#define SVN_WC_TRANSLATE_FORCE_EOL_REPAIR 0x00000002
/** Don't register a pool cleanup to delete the output file */
#define SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP 0x00000004
/** Guarantee a new file is created on successful return.
* The default shortcuts translation by returning the path
* of the untranslated file when no translation is required.
*/
#define SVN_WC_TRANSLATE_FORCE_COPY 0x00000008
/** Use a non-wc-local tmp directory for creating output files,
* instead of in the working copy admin tmp area which is the default.
*
* @since New in 1.4.
*/
#define SVN_WC_TRANSLATE_USE_GLOBAL_TMP 0x00000010
/** @} */
/* Locking/Opening/Closing */
/** Baton for access to a working copy administrative area.
*
* One day all such access will require a baton, we're not there yet.
*
* Access batons can be grouped into sets, by passing an existing open
* baton when opening a new baton. Given one baton in a set, other batons
* may be retrieved. This allows an entire hierarchy to be locked, and
* then the set of batons can be passed around by passing a single baton.
*/
typedef struct svn_wc_adm_access_t svn_wc_adm_access_t;
/**
* Return, in @a *adm_access, a pointer to a new access baton for the working
* copy administrative area associated with the directory @a path. If
* @a write_lock is TRUE the baton will include a write lock, otherwise the
* baton can only be used for read access. If @a path refers to a directory
* that is already write locked then the error @c SVN_ERR_WC_LOCKED will be
* returned. The error @c SVN_ERR_WC_NOT_DIRECTORY will be returned if
* @a path is not a versioned directory.
*
* If @a associated is an open access baton then @a adm_access will be added
* to the set containing @a associated. @a associated can be @c NULL, in
* which case @a adm_access is the start of a new set.
*
* @a levels_to_lock specifies how far to lock. Zero means just the specified
* directory. Any negative value means to lock the entire working copy
* directory hierarchy under @a path. A positive value indicates the number of
* levels of directories to lock -- 1 means just immediate subdirectories, 2
* means immediate subdirectories and their subdirectories, etc. All the
* access batons will become part of the set containing @a adm_access. This
* is an all-or-nothing option, if it is not possible to lock all the
* requested directories then an error will be returned and @a adm_access will
* be invalid, with the exception that subdirectories of @a path that are
* missing from the physical filesystem will not be locked and will not cause
* an error. The error @c SVN_ERR_WC_LOCKED will be returned if a
* subdirectory of @a path is already write locked.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
* if the client has cancelled the operation.
*
* @a pool will be used to allocate memory for the baton and any subsequently
* cached items. If @a adm_access has not been closed when the pool is
* cleared, it will be closed automatically at that point, and removed from
* its set. A baton closed in this way will not remove physical locks from
* the working copy if cleanup is required.
*
* The first baton in a set, with @a associated passed as @c NULL, must have
* the longest lifetime of all the batons in the set. This implies it must be
* the root of the hierarchy.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_adm_open3(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_adm_open3(), but without cancellation support.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_open2(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
apr_pool_t *pool);
/**
* Similar to svn_wc_adm_open2(), but with @a tree_lock instead of
* @a levels_to_lock. @a levels_to_lock is set to -1 if @a tree_lock
* is @c TRUE, else 0.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_open(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
svn_boolean_t tree_lock,
apr_pool_t *pool);
/**
* Checks the working copy to determine the node type of @a path. If
* @a path is a versioned directory then the behaviour is like that of
* svn_wc_adm_open3(), otherwise, if @a path is a file or does not
* exist, then the behaviour is like that of svn_wc_adm_open3() with
* @a path replaced by the parent directory of @a path. If @a path is
* an unversioned directory, the behaviour is also like that of
* svn_wc_adm_open3() on the parent, except that if the open fails,
* then the returned SVN_ERR_WC_NOT_DIRECTORY error refers to @a path,
* not to @a path's parent.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_adm_probe_open3(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_adm_probe_open3() without the cancel
* functionality.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_probe_open2(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
apr_pool_t *pool);
/**
* Similar to svn_wc_adm_probe_open2(), but with @a tree_lock instead of
* @a levels_to_lock. @a levels_to_lock is set to -1 if @a tree_lock
* is @c TRUE, else 0.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_probe_open(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
svn_boolean_t tree_lock,
apr_pool_t *pool);
/**
* Open access batons for @a path and return in @a *anchor_access and
* @a *target the anchor and target required to drive an editor. Return
* in @a *target_access the access baton for the target, which may be the
* same as @a *anchor_access (in which case @a *target is the empty
* string, never NULL). All the access batons will be in the
* @a *anchor_access set.
*
* @a levels_to_lock determines the levels_to_lock used when opening
* @a path if @a path is a versioned directory, @a levels_to_lock is
* ignored otherwise. If @a write_lock is @c TRUE the access batons
* will hold write locks.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
* if the client has cancelled the operation.
*
* This function is essentially a combination of svn_wc_adm_open3() and
* svn_wc_get_actual_target(), with the emphasis on reducing physical IO.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_adm_open_anchor(svn_wc_adm_access_t **anchor_access,
svn_wc_adm_access_t **target_access,
const char **target,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/** Return, in @a *adm_access, a pointer to an existing access baton associated
* with @a path. @a path must be a directory that is locked as part of the
* set containing the @a associated access baton.
*
* If the requested access baton is marked as missing in, or is simply
* absent from, @a associated, return SVN_ERR_WC_NOT_LOCKED.
*
* @a pool is used only for local processing, it is not used for the batons.
*/
svn_error_t *
svn_wc_adm_retrieve(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
apr_pool_t *pool);
/** Check the working copy to determine the node type of @a path. If
* @a path is a versioned directory then the behaviour is like that of
* svn_wc_adm_retrieve(), otherwise, if @a path is a file, an unversioned
* directory, or does not exist, then the behaviour is like that of
* svn_wc_adm_retrieve() with @a path replaced by the parent directory of
* @a path.
*/
svn_error_t *
svn_wc_adm_probe_retrieve(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
apr_pool_t *pool);
/**
* Try various ways to obtain an access baton for @a path.
*
* First, try to obtain @a *adm_access via svn_wc_adm_probe_retrieve(),
* but if this fails because @a associated can't give a baton for
* @a path or @a path's parent, then try svn_wc_adm_probe_open3(),
* this time passing @a write_lock and @a levels_to_lock. If there is
* still no access because @a path is not a versioned directory, then
* just set @a *adm_access to NULL and return success. But if it is
* because @a path is locked, then return the error @c SVN_ERR_WC_LOCKED,
* and the effect on @a *adm_access is undefined. (Or if the attempt
* fails for any other reason, return the corresponding error, and the
* effect on @a *adm_access is also undefined.)
*
* If svn_wc_adm_probe_open3() succeeds, then add @a *adm_access to
* @a associated.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
* if the client has cancelled the operation.
*
* Use @a pool only for local processing, not to allocate @a *adm_access.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_adm_probe_try3(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_adm_probe_try3() without the cancel
* functionality.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_probe_try2(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
int levels_to_lock,
apr_pool_t *pool);
/**
* Similar to svn_wc_adm_probe_try2(), but with @a tree_lock instead of
* @a levels_to_lock. @a levels_to_lock is set to -1 if @a tree_lock
* is @c TRUE, else 0.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_probe_try(svn_wc_adm_access_t **adm_access,
svn_wc_adm_access_t *associated,
const char *path,
svn_boolean_t write_lock,
svn_boolean_t tree_lock,
apr_pool_t *pool);
/** Give up the access baton @a adm_access, and its lock if any. This will
* recursively close any batons in the same set that are direct
* subdirectories of @a adm_access. Any physical locks will be removed from
* the working copy. Lock removal is unconditional, there is no check to
* determine if cleanup is required.
*
* Any temporary allocations are performed using @a scratch_pool.
*
* @since New in 1.6
*/
svn_error_t *
svn_wc_adm_close2(svn_wc_adm_access_t *adm_access,
apr_pool_t *scratch_pool);
/* @deprecated Provided for backward compabibility with the 1.5 API. */
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_close(svn_wc_adm_access_t *adm_access);
/** Return the path used to open the access baton @a adm_access */
const char *
svn_wc_adm_access_path(const svn_wc_adm_access_t *adm_access);
/** Return the pool used by access baton @a adm_access */
apr_pool_t *
svn_wc_adm_access_pool(const svn_wc_adm_access_t *adm_access);
/** Return @c TRUE is the access baton @a adm_access has a write lock,
* @c FALSE otherwise. Compared to svn_wc_locked() this is a cheap, fast
* function that doesn't access the filesystem.
*/
svn_boolean_t
svn_wc_adm_locked(const svn_wc_adm_access_t *adm_access);
/** Set @a *locked to non-zero if @a path is locked, else set it to zero. */
svn_error_t *
svn_wc_locked(svn_boolean_t *locked,
const char *path,
apr_pool_t *pool);
/**
* Return @c TRUE if @a name is the name of the WC administrative
* directory. Use @a pool for any temporary allocations. Only works
* with base directory names, not paths or URIs.
*
* For compatibility, the default name (.svn) will always be treated
* as an admin dir name, even if the working copy is actually using an
* alternative name.
*
* @since New in 1.3.
*/
svn_boolean_t
svn_wc_is_adm_dir(const char *name, apr_pool_t *pool);
/**
* Return the name of the administrative directory.
* Use @a pool for any temporary allocations.
*
* The returned pointer will refer to either a statically allocated
* string, or to a string allocated in @a pool.
*
* @since New in 1.3.
*/
const char *
svn_wc_get_adm_dir(apr_pool_t *pool);
/**
* Use @a name for the administrative directory in the working copy.
* Use @a pool for any temporary allocations.
*
* The list of valid names is limited. Currently only ".svn" (the
* default) and "_svn" are allowed.
*
* @note This function changes global (per-process) state and must be
* called in a single-threaded context during the initialization of a
* Subversion client.
*
* @since New in 1.3.
*/
svn_error_t *
svn_wc_set_adm_dir(const char *name,
apr_pool_t *pool);
/** Traversal information is information gathered by a working copy
* crawl or update. For example, the before and after values of the
* svn:externals property are important after an update, and since
* we're traversing the working tree anyway (a complete traversal
* during the initial crawl, and a traversal of changed paths during
* the checkout/update/switch), it makes sense to gather the
* property's values then instead of making a second pass.
*/
typedef struct svn_wc_traversal_info_t svn_wc_traversal_info_t;
/** Return a new, empty traversal info object, allocated in @a pool. */
svn_wc_traversal_info_t *
svn_wc_init_traversal_info(apr_pool_t *pool);
/** Set @a *externals_old and @a *externals_new to hash tables representing
* changes to values of the svn:externals property on directories
* traversed by @a traversal_info.
*
* @a traversal_info is obtained from svn_wc_init_traversal_info(), but is
* only useful after it has been passed through another function, such
* as svn_wc_crawl_revisions(), svn_wc_get_update_editor(),
* svn_wc_get_switch_editor(), etc.
*
* Each hash maps <tt>const char *</tt> directory names onto
* <tt>const char *</tt> values of the externals property for that directory.
* The dir names are full paths -- that is, anchor plus target, not target
* alone. The values are not parsed, they are simply copied raw, and are
* never NULL: directories that acquired or lost the property are
* simply omitted from the appropriate table. Directories whose value
* of the property did not change show the same value in each hash.
*
* The hashes, keys, and values have the same lifetime as @a traversal_info.
*/
void
svn_wc_edited_externals(apr_hash_t **externals_old,
apr_hash_t **externals_new,
svn_wc_traversal_info_t *traversal_info);
/** Set @a *depths to a hash table mapping <tt>const char *</tt>
* directory names (directories traversed by @a traversal_info) to
* <tt>const char *</tt> values (the depths of those directories, as
* converted by svn_depth_to_word()).
*
* @a traversal_info is obtained from svn_wc_init_traversal_info(), but is
* only useful after it has been passed through another function, such
* as svn_wc_crawl_revisions(), svn_wc_get_update_editor(),
* svn_wc_get_switch_editor(), etc.
*
* The dir names are full paths -- that is, anchor plus target, not target
* alone. The values are not allocated, they are static constant strings.
* Although the values are never NULL, not all directories traversed
* are necessarily listed. For example, directories which did not
* have an svn:externals property set or modified are not included.
*
* The hashes and keys have the same lifetime as @a traversal_info.
*
* @since New in 1.5.
*/
void
svn_wc_traversed_depths(apr_hash_t **depths,
svn_wc_traversal_info_t *traversal_info);
/** One external item. This usually represents one line from an
* svn:externals description but with the path and URL
* canonicalized.
*
* In order to avoid backwards compatibility problems clients should use
* svn_wc_external_item_create() to allocate and initialize this structure
* instead of doing so themselves.
*
* @since New in 1.5.
*/
typedef struct svn_wc_external_item2_t
{
/** The name of the subdirectory into which this external should be
checked out. This is relative to the parent directory that
holds this external item. (Note that these structs are often
stored in hash tables with the target dirs as keys, so this
field will often be redundant.) */
const char *target_dir;
/** Where to check out from. */
const char *url;
/** What revision to check out. The only valid kinds for this are
svn_opt_revision_number, svn_opt_revision_date, and
svn_opt_revision_head. */
svn_opt_revision_t revision;
/** The peg revision to use when checking out. The only valid kinds are
svn_opt_revision_number, svn_opt_revision_date, and
svn_opt_revision_head. */
svn_opt_revision_t peg_revision;
} svn_wc_external_item2_t;
/**
* Initialize an external item.
* Set @a *item to an external item object, allocated in @a pool.
*
* In order to avoid backwards compatibility problems, this function
* is used to initialize and allocate the @c svn_wc_external_item2_t
* structure rather than doing so explicitly, as the size of this
* structure may change in the future.
*
* The current implementation never returns error, but callers should
* still check for error, for compatibility with future versions.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_external_item_create(const svn_wc_external_item2_t **item,
apr_pool_t *pool);
/**
* Return a duplicate of @a item, allocated in @a pool. No part of the new
* item will be shared with @a item.
*
* @since New in 1.5.
*/
svn_wc_external_item2_t *
svn_wc_external_item2_dup(const svn_wc_external_item2_t *item,
apr_pool_t *pool);
/**
* One external item. Similar to svn_wc_external_item2_t, except
* @a revision is interpreted as both the operational revision and the
* peg revision.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
typedef struct svn_wc_external_item_t
{
/** Same as @c svn_wc_external_item2_t.target_dir */
const char *target_dir;
/** Same as @c svn_wc_external_item2_t.url */
const char *url;
/** Same as @c svn_wc_external_item2_t.revision */
svn_opt_revision_t revision;
} svn_wc_external_item_t;
/**
* Return a duplicate of @a item, allocated in @a pool. No part of the new
* item will be shared with @a item.
*
* @since New in 1.3.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_wc_external_item_t *
svn_wc_external_item_dup(const svn_wc_external_item_t *item,
apr_pool_t *pool);
/**
* If @a externals_p is non-NULL, set @a *externals_p to an array of
* @c svn_wc_external_item2_t * objects based on @a desc. The @a url
* member of the objects will be canonicalized if @a canonicalize_url
* is @c TRUE.
*
* If the format of @a desc is invalid, don't touch @a *externals_p and
* return @c SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION. Thus, if
* you just want to check the validity of an externals description,
* and don't care about the parsed result, pass NULL for @a externals_p.
*
* The format of @a desc is the same as for values of the directory
* property @c SVN_PROP_EXTERNALS, which see.
*
* Allocate the table, keys, and values in @a pool.
*
* Use @a parent_directory only in constructing error strings.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_parse_externals_description3(apr_array_header_t **externals_p,
const char *parent_directory,
const char *desc,
svn_boolean_t canonicalize_url,
apr_pool_t *pool);
/**
* Similar to svn_wc_parse_externals_description3() with @a
* canonicalize_url set to @c TRUE, but returns an array of @c
* svn_wc_external_item_t * objects instead of @c
* svn_wc_external_item2_t * objects
*
* @since New in 1.1.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_parse_externals_description2(apr_array_header_t **externals_p,
const char *parent_directory,
const char *desc,
apr_pool_t *pool);
/**
* Similar to svn_wc_parse_externals_description2(), but returns the
* parsed externals in a hash instead of an array. This function
* should not be used, as storing the externals in a hash causes their
* order of evaluation to be not easily identifiable.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_parse_externals_description(apr_hash_t **externals_p,
const char *parent_directory,
const char *desc,
apr_pool_t *pool);
/* Notification/callback handling. */
/**
* @defgroup svn_wc_notifications Notification callback handling
* @{
*
* In many cases, the WC library will scan a working copy and make
* changes. The caller usually wants to know when each of these changes
* has been made, so that it can display some kind of notification to
* the user.
*
* These notifications have a standard callback function type, which
* takes the path of the file that was affected, and a caller-
* supplied baton.
*
* Note that the callback is a 'void' return -- this is a simple
* reporting mechanism, rather than an opportunity for the caller to
* alter the operation of the WC library.
*
* Note also that some of the actions are used across several
* different Subversion commands. For example, the update actions are
* also used for checkouts, switches, and merges.
*/
/** The type of action occurring. */
typedef enum svn_wc_notify_action_t
{
/** Adding a path to revision control. */
svn_wc_notify_add = 0,
/** Copying a versioned path. */
svn_wc_notify_copy,
/** Deleting a versioned path. */
svn_wc_notify_delete,
/** Restoring a missing path from the pristine text-base. */
svn_wc_notify_restore,
/** Reverting a modified path. */
svn_wc_notify_revert,
/** A revert operation has failed. */
svn_wc_notify_failed_revert,
/** Resolving a conflict. */
svn_wc_notify_resolved,
/** Skipping a path. */
svn_wc_notify_skip,
/** Got a delete in an update. */
svn_wc_notify_update_delete,
/** Got an add in an update. */
svn_wc_notify_update_add,
/** Got any other action in an update. */
svn_wc_notify_update_update,
/** The last notification in an update (including updates of externals). */
svn_wc_notify_update_completed,
/** Updating an external module. */
svn_wc_notify_update_external,
/** The last notification in a status (including status on externals). */
svn_wc_notify_status_completed,
/** Running status on an external module. */
svn_wc_notify_status_external,
/** Committing a modification. */
svn_wc_notify_commit_modified,
/** Committing an addition. */
svn_wc_notify_commit_added,
/** Committing a deletion. */
svn_wc_notify_commit_deleted,
/** Committing a replacement. */
svn_wc_notify_commit_replaced,
/** Transmitting post-fix text-delta data for a file. */
svn_wc_notify_commit_postfix_txdelta,
/** Processed a single revision's blame. */
svn_wc_notify_blame_revision,
/** Locking a path. @since New in 1.2. */
svn_wc_notify_locked,
/** Unlocking a path. @since New in 1.2. */
svn_wc_notify_unlocked,
/** Failed to lock a path. @since New in 1.2. */
svn_wc_notify_failed_lock,
/** Failed to unlock a path. @since New in 1.2. */
svn_wc_notify_failed_unlock,
/** Tried adding a path that already exists. @since New in 1.5. */
svn_wc_notify_exists,
/** Changelist name set. @since New in 1.5. */
svn_wc_notify_changelist_set,
/** Changelist name cleared. @since New in 1.5. */
svn_wc_notify_changelist_clear,
/** Warn user that a path has moved from one changelist to another.
@since New in 1.5. */
svn_wc_notify_changelist_moved,
/** A merge operation (to path) has begun. See @c merge_range in
@c svn_wc_notify_t. @since New in 1.5. */
svn_wc_notify_merge_begin,
/** A merge operation (to path) from a foreign repository has begun.
See @c merge_range in @c svn_wc_notify_t. @since New in 1.5. */
svn_wc_notify_foreign_merge_begin,
/** Replace notification. @since New in 1.5. */
svn_wc_notify_update_replace,
/** Property added. @since New in 1.6. */
svn_wc_notify_property_added,
/** Property updated. @since New in 1.6. */
svn_wc_notify_property_modified,
/** Property deleted. @since New in 1.6. */
svn_wc_notify_property_deleted,
/** Nonexistent property deleted. @since New in 1.6. */
svn_wc_notify_property_deleted_nonexistent,
/** Revprop set. @since New in 1.6. */
svn_wc_notify_revprop_set,
/** Revprop deleted. @since New in 1.6. */
svn_wc_notify_revprop_deleted,
/** The last notification in a merge. @since New in 1.6. */
svn_wc_notify_merge_completed,
/** The path is a tree-conflict victim of the intended action (*not*
* a persistent tree-conflict from an earlier operation, but *this*
* operation caused the tree-conflict). @since New in 1.6. */
svn_wc_notify_tree_conflict,
/** The path is a subdirectory referenced in an externals definition
* which is unable to be operated on. @since New in 1.6. */
svn_wc_notify_failed_external
} svn_wc_notify_action_t;
/** The type of notification that is occurring. */
typedef enum svn_wc_notify_state_t
{
svn_wc_notify_state_inapplicable = 0,
/** Notifier doesn't know or isn't saying. */
svn_wc_notify_state_unknown,
/** The state did not change. */
svn_wc_notify_state_unchanged,
/** The item wasn't present. */
svn_wc_notify_state_missing,
/** An unversioned item obstructed work. */
svn_wc_notify_state_obstructed,
/** Pristine state was modified. */
svn_wc_notify_state_changed,
/** Modified state had mods merged in. */
svn_wc_notify_state_merged,
/** Modified state got conflicting mods. */
svn_wc_notify_state_conflicted
} svn_wc_notify_state_t;
/**
* What happened to a lock during an operation.
*
* @since New in 1.2.
*/
typedef enum svn_wc_notify_lock_state_t
{
svn_wc_notify_lock_state_inapplicable = 0,
svn_wc_notify_lock_state_unknown,
/** The lock wasn't changed. */
svn_wc_notify_lock_state_unchanged,
/** The item was locked. */
svn_wc_notify_lock_state_locked,
/** The item was unlocked. */
svn_wc_notify_lock_state_unlocked
} svn_wc_notify_lock_state_t;
/**
* Structure used in the @c svn_wc_notify_func2_t function.
*
* @c kind, @c content_state, @c prop_state and @c lock_state are from
* after @c action, not before.
*
* @note If @c action is @c svn_wc_notify_update, then @c path has
* already been installed, so it is legitimate for an implementation of
* @c svn_wc_notify_func2_t to examine @c path in the working copy.
*
* @note The purpose of the @c kind, @c mime_type, @c content_state, and
* @c prop_state fields is to provide "for free" information that an
* implementation is likely to want, and which it would otherwise be
* forced to deduce via expensive operations such as reading entries
* and properties. However, if the caller does not have this
* information, it will simply pass the corresponding `*_unknown'
* values, and it is up to the implementation how to handle that
* (i.e., whether to attempt deduction, or just to punt and
* give a less informative notification).
*
* @note Callers of notification functions should use svn_wc_create_notify()
* or svn_wc_create_notify_url() to create structures of this type to allow
* for extensibility.
*
* @since New in 1.2.
*/
typedef struct svn_wc_notify_t {
/** Path, either absolute or relative to the current working directory
* (i.e., not relative to an anchor).@c path is "." or another valid path
* value for compatibilty reasons when the real target is an url that
* is available in @c url. */
const char *path;
/** Action that describes what happened to @c path. */
svn_wc_notify_action_t action;
/** Node kind of @c path. */
svn_node_kind_t kind;
/** If non-NULL, indicates the mime-type of @c path.
* It is always @c NULL for directories. */
const char *mime_type;
/** Points to the lock structure received from the repository when
* @c action is @c svn_wc_notify_locked. For other actions, it is
* @c NULL. */
const svn_lock_t *lock;
/** Points to an error describing the reason for the failure when @c
* action is one of the following: @c svn_wc_notify_failed_lock, @c
* svn_wc_notify_failed_unlock, @c svn_wc_notify_failed_external.
* Is @c NULL otherwise. */
svn_error_t *err;
/** The type of notification that is occurring about node content. */
svn_wc_notify_state_t content_state;
/** The type of notification that is occurring about node properties. */
svn_wc_notify_state_t prop_state;
/** Reflects the addition or removal of a lock token in the working copy. */
svn_wc_notify_lock_state_t lock_state;
/** When @c action is @c svn_wc_notify_update_completed, target revision
* of the update, or @c SVN_INVALID_REVNUM if not available; when @c
* action is @c svn_wc_notify_blame_revision, processed revision.
* In all other cases, it is @c SVN_INVALID_REVNUM. */
svn_revnum_t revision;
/** When @c action is @c svn_wc_notify_changelist_add or name. In all other
* cases, it is @c NULL. @since New in 1.5 */
const char *changelist_name;
/** When @c action is @c svn_wc_notify_merge_begin, and both the
* left and right sides of the merge are from the same URL. In all
* other cases, it is @c NULL. @since New in 1.5 */
svn_merge_range_t *merge_range;
/** Similar to @c path, but if non-NULL the notification is about a url.
* @since New in 1.6 */
const char *url;
/** If non-NULL, specifies an absolute path prefix that can be subtracted
* from the start of the absolute path in @c path or @c url. Its purpose
* is to allow notification to remove a common prefix from all the paths
* displayed for an operation. @since New in 1.6 */
const char *path_prefix;
/** If @c action relates to properties, specifies the name of the property.
* @since New in 1.6 */
const char *prop_name;
/** If @c action is @c svn_wc_notify_blame_revision, contains a list of
* revision properties for the specified revision */
apr_hash_t *rev_props;
/* NOTE: Add new fields at the end to preserve binary compatibility.
Also, if you add fields here, you have to update svn_wc_create_notify
and svn_wc_dup_notify. */
} svn_wc_notify_t;
/**
* Allocate an @c svn_wc_notify_t structure in @a pool, initialize and return
* it.
*
* Set the @c path field of the created struct to @a path, and @c action to
* @a action. Set all other fields to their @c _unknown, @c NULL or
* invalid value, respectively. Make only a shallow copy of the pointer
* @a path.
*
* @since New in 1.2.
*/
svn_wc_notify_t *
svn_wc_create_notify(const char *path,
svn_wc_notify_action_t action,
apr_pool_t *pool);
/**
* Allocate an @c svn_wc_notify_t structure in @a pool, initialize and return
* it.
*
* Set the @c url field of the created struct to @a url, @c action to, @c path
* to "." and @a action. Set all other fields to their @c _unknown, @c NULL or
* invalid value, respectively. Make only a shallow copy of the pointer
* @a url.
*
* @since New in 1.6.
*/
svn_wc_notify_t *
svn_wc_create_notify_url(const char *url,
svn_wc_notify_action_t action,
apr_pool_t *pool);
/**
* Return a deep copy of @a notify, allocated in @a pool.
*
* @since New in 1.2.
*/
svn_wc_notify_t *
svn_wc_dup_notify(const svn_wc_notify_t *notify,
apr_pool_t *pool);
/**
* Notify the world that @a notify->action has happened to @a notify->path.
*
* Recommendation: callers of @c svn_wc_notify_func2_t should avoid
* invoking it multiple times on the same path within a given
* operation, and implementations should not bother checking for such
* duplicate calls. For example, in an update, the caller should not
* invoke the notify func on receiving a prop change and then again
* on receiving a text change. Instead, wait until all changes have
* been received, and then invoke the notify func once (from within
* an @c svn_delta_editor_t's close_file(), for example), passing
* the appropriate @a notify->content_state and @a notify->prop_state flags.
*
* @since New in 1.2.
*/
typedef void (*svn_wc_notify_func2_t)(void *baton,
const svn_wc_notify_t *notify,
apr_pool_t *pool);
/**
* Similar to @c svn_wc_notify_func2_t, but takes the information as arguments
* instead of struct fields.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
typedef void (*svn_wc_notify_func_t)(void *baton,
const char *path,
svn_wc_notify_action_t action,
svn_node_kind_t kind,
const char *mime_type,
svn_wc_notify_state_t content_state,
svn_wc_notify_state_t prop_state,
svn_revnum_t revision);
/** @} */
/**
* A simple callback type to wrap svn_ra_get_file(); see that
* docstring for more information.
*
* This technique allows libsvn_client to 'wrap' svn_ra_get_file() and
* pass it down into libsvn_wc functions, thus allowing the WC layer
* to legally call the RA function via (blind) callback.
*
* @since New in 1.5
*/
typedef svn_error_t *(*svn_wc_get_file_t)(void *baton,
const char *path,
svn_revnum_t revision,
svn_stream_t *stream,
svn_revnum_t *fetched_rev,
apr_hash_t **props,
apr_pool_t *pool);
/**
* Interactive conflict handling
*
* @defgroup svn_wc_conflict Conflict callback functionality
*
* @{
*
* This API gives a Subversion client application the opportunity to
* define a callback that allows the user to resolve conflicts
* interactively during updates and merges.
*
* If a conflict is discovered, libsvn_wc invokes the callback with an
* @c svn_wc_conflict_description_t. This structure describes the
* path in conflict, whether it's a text or property conflict, and may
* also present up to three files that can be used to resolve the
* conflict (perhaps by launching an editor or 3rd-party merging
* tool). The structure also provides a possible fourth file (@c
* merged_file) which, if not NULL, represents libsvn_wc's attempt to
* contextually merge the first three files. (Note that libsvn_wc
* will not attempt to merge a file that it believes is binary, and it
* will only attempt to merge property values it believes to be a
* series of multi-line text.)
*
* When the callback is finished interacting with the user, it
* responds by returning a @c svn_wc_conflict_result_t. This
* structure indicates whether the user wants to postpone the conflict
* for later (allowing libsvn_wc to mark the path "conflicted" as
* usual), or whether the user wants libsvn_wc to use one of the four
* files as the "final" state for resolving the conflict immediately.
*
* Note that the callback is at liberty (and encouraged) to merge the
* three files itself. If it does so, it signals this to libsvn_wc by
* returning a choice of @c svn_wc_conflict_choose_merged. To return
* the 'final' merged file to libsvn_wc, the callback has the option of
* either:
*
* - editing the original @c merged_file in-place
*
* or, if libsvn_wc never supplied a merged_file in the
* description structure (i.e. passed NULL for that field),
*
* - return the merged file in the @c svn_wc_conflict_result_t.
*
*/
/** The type of action being attempted on an object.
*
* @since New in 1.5.
*/
typedef enum svn_wc_conflict_action_t
{
svn_wc_conflict_action_edit, /* attempting to change text or props */
svn_wc_conflict_action_add, /* attempting to add object */
svn_wc_conflict_action_delete /* attempting to delete object */
} svn_wc_conflict_action_t;
/** The pre-existing condition which is causing a state of conflict.
*
* @since New in 1.5.
*/
typedef enum svn_wc_conflict_reason_t
{
/** Local edits are already present */
svn_wc_conflict_reason_edited,
/** Another object is in the way */
svn_wc_conflict_reason_obstructed,
/** Object is already schedule-delete */
svn_wc_conflict_reason_deleted,
/** Object is unknown or missing */
svn_wc_conflict_reason_missing,
/** Object is unversioned */
svn_wc_conflict_reason_unversioned,
/** Object is already added or schedule-add. @since New in 1.6. */
svn_wc_conflict_reason_added
} svn_wc_conflict_reason_t;
/** The type of conflict being described by an @c
* svn_wc_conflict_description_t (see below).
*
* @since New in 1.5.
*/
typedef enum svn_wc_conflict_kind_t
{
/** textual conflict (on a file) */
svn_wc_conflict_kind_text,
/** property conflict (on a file or dir) */
svn_wc_conflict_kind_property,
/** tree conflict (on a dir) @since New in 1.6. */
svn_wc_conflict_kind_tree
} svn_wc_conflict_kind_t;
/** The user operation that exposed a conflict.
*
* @since New in 1.6.
*/
typedef enum svn_wc_operation_t
{
svn_wc_operation_none = 0,
svn_wc_operation_update,
svn_wc_operation_switch,
svn_wc_operation_merge
} svn_wc_operation_t;
/** Info about one of the conflicting versions of a node. Each field may
* have its respective null/invalid/unknown value if the corresponding
* information is not relevant or not available.
*
* @todo Consider making some or all of the info mandatory, to reduce
* complexity.
*
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type.
*
* @see svn_wc_conflict_version_create()
* @see svn_wc_conflict_version_dup()
*
* @since New in 1.6.
*/
typedef struct svn_wc_conflict_version_t
{
/** @name Where to find this node version in a repository */
/**@{*/
/** URL of repository root */
const char *repos_url;
/** revision at which to look up path_in_repos */
svn_revnum_t peg_rev;
/** path within repos; must not start with '/' */
const char *path_in_repos;
/* @todo We may decide to add the repository UUID, to handle conflicts
* properly during a repository move. */
/** @} */
/** Info about this node */
svn_node_kind_t node_kind; /* note that 'none' is a legitimate value */
/* @todo Add metadata about a local copy of the node, if and when
* we store one. */
/* Remember to update svn_wc_conflict_version_create() and
* svn_wc_conflict_version_dup() in case you add fields to this struct. */
} svn_wc_conflict_version_t;
/**
* Allocate an @c svn_wc_conflict_version_t structure in @a pool,
* initialize to contain a conflict origin, and return it.
*
* Set the @c repos_url field of the created struct to @a repos_url, the
* @c path_in_repos field to @a path_in_repos, the @c peg_rev field to
* @a peg_rev and the the @c node_kind to @c node_kind. Make only shallow
* copies of the pointer arguments.
*
* @since New in 1.6.
*/
svn_wc_conflict_version_t *
svn_wc_conflict_version_create(const char *repos_url,
const char* path_in_repos,
svn_revnum_t peg_rev,
svn_node_kind_t node_kind,
apr_pool_t *pool);
/** Return a duplicate of @a version, allocated in @a pool.
* No part of the new version will be shared with @a version.
*
* @since New in 1.6.
*/
svn_wc_conflict_version_t *
svn_wc_conflict_version_dup(const svn_wc_conflict_version_t *version,
apr_pool_t *pool);
/** A struct that describes a conflict that has occurred in the
* working copy. Passed to @c svn_wc_conflict_resolver_func_t.
*
* The conflict described by this structure is one of:
* - a conflict on the content of the file node @a path
* - a conflict on the property @a property_name of @a path
*
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type but should use
* svn_wc_create_conflict_description_text() or
* svn_wc_create_conflict_description_prop() or
* svn_wc_create_conflict_description_tree() instead.
*
* @since New in 1.5.
*/
typedef struct svn_wc_conflict_description_t
{
/** The path that is in conflict (for a tree conflict, it is the victim) */
const char *path;
/** The node type of the path being operated on (for a tree conflict,
* ### which version?) */
svn_node_kind_t node_kind;
/** What sort of conflict are we describing? */
svn_wc_conflict_kind_t kind;
/** The name of the property whose conflict is being described.
* (Only if @a kind is 'property'; else undefined.) */
const char *property_name;
/** Whether svn thinks ('my' version of) @c path is a 'binary' file.
* (Only if @c kind is 'text', else undefined.) */
svn_boolean_t is_binary;
/** The svn:mime-type property of ('my' version of) @c path, if available,
* else NULL.
* (Only if @c kind is 'text', else undefined.) */
const char *mime_type;
/** If not NULL, an open working copy access baton to either the
* path itself (if @c path is a directory), or to the parent
* directory (if @c path is a file.)
* For a tree conflict, this will always be an access baton
* to the parent directory of the path, even if the path is
* a directory. */
svn_wc_adm_access_t *access;
/** The action being attempted on the conflicted node or property.
* (When @c kind is 'text', this action must be 'edit'.) */
svn_wc_conflict_action_t action;
/** The state of the target node or property, relative to its merge-left
* source, that is the reason for the conflict.
* (When @c kind is 'text', this reason must be 'edited'.) */
svn_wc_conflict_reason_t reason;
/** If this is text-conflict and involves the merging of two files
* descended from a common ancestor, here are the paths of up to
* four fulltext files that can be used to interactively resolve the
* conflict. All four files will be in repository-normal form -- LF
* line endings and contracted keywords. (If any of these files are
* not available, they default to NULL.)
*
* On the other hand, if this is a property-conflict, then these
* paths represent temporary files that contain the three different
* property-values in conflict. The fourth path (@c merged_file)
* may or may not be NULL; if set, it represents libsvn_wc's
* attempt to merge the property values together. (Remember that
* property values are technically binary values, and thus can't
* always be merged.)
*/
const char *base_file; /* common ancestor of the two files being merged */
/** their version of the file */
const char *their_file;
/** my locally-edited version of the file */
const char *my_file;
/** merged version; may contain conflict markers */
const char *merged_file;
/** The operation that exposed the conflict.
* Used only for tree conflicts.
*
* @since New in 1.6.
*/
svn_wc_operation_t operation;
/** Info on the "merge-left source" or "older" version of incoming change.
* @since New in 1.6. */
svn_wc_conflict_version_t *src_left_version;
/** Info on the "merge-right source" or "their" version of incoming change.
* @since New in 1.6. */
svn_wc_conflict_version_t *src_right_version;
/* Remember to adjust svn_wc__conflict_description_dup()
* if you add new fields to this struct. */
} svn_wc_conflict_description_t;
/**
* Allocate an @c svn_wc_conflict_description_t structure in @a pool,
* initialize to represent a text conflict, and return it.
*
* Set the @c path field of the created struct to @a path, the @c access
* field to @a adm_access, the @c kind field to @c
* svn_wc_conflict_kind_text, the @c node_kind to @c svn_node_file, the @c
* action to @c svn_wc_conflict_action_edit, and the @c reason to @c
* svn_wc_conflict_reason_edited. Make only shallow copies of the pointer
* arguments.
*
* @note: It is the caller's responsibility to set the other required fields
* (such as the four file names and @c mime_type and @c is_binary).
*
* @since New in 1.6.
*/
svn_wc_conflict_description_t *
svn_wc_conflict_description_create_text(const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/**
* Allocate an @c svn_wc_conflict_description_t structure in @a pool,
* initialize to represent a property conflict, and return it.
*
* Set the @c path field of the created struct to @a path, the @c access
* field to @a adm_access, the @c kind field to @c
* svn_wc_conflict_kind_prop, the @c node_kind to @a node_kind, and the @c
* property_name to @a property_name. Make only shallow copies of the pointer
* arguments.
*
* @note: It is the caller's responsibility to set the other required fields
* (such as the four file names and @c action and @c reason).
*
* @since New in 1.6.
*/
svn_wc_conflict_description_t *
svn_wc_conflict_description_create_prop(const char *path,
svn_wc_adm_access_t *adm_access,
svn_node_kind_t node_kind,
const char *property_name,
apr_pool_t *pool);
/**
* Allocate an @c svn_wc_conflict_description_t structure in @a pool,
* initialize to represent a tree conflict, and return it.
*
* Set the @c path field of the created struct to @a path, the @c access
* field to @a adm_access, the @c kind field to @c
* svn_wc_conflict_kind_tree, the @c node_kind to @a node_kind, the @c
* operation to @a operation, the @c src_left_version field to
* @a src_left_version, and the @c src_right_version field to
* @a src_right_version.
* Make only shallow copies of the pointer arguments.
*
* @note: It is the caller's responsibility to set the other required fields
* (such as the four file names and @c action and @c reason).
*
* @since New in 1.6.
*/
svn_wc_conflict_description_t *
svn_wc_conflict_description_create_tree(const char *path,
svn_wc_adm_access_t *adm_access,
svn_node_kind_t node_kind,
svn_wc_operation_t operation,
svn_wc_conflict_version_t
*src_left_version,
svn_wc_conflict_version_t
*src_right_version,
apr_pool_t *pool);
/** The way in which the conflict callback chooses a course of action.
*
* @since New in 1.5.
*/
typedef enum svn_wc_conflict_choice_t
{
/* Don't resolve the conflict now. Let libsvn_wc mark the path
'conflicted', so user can run 'svn resolved' later. */
svn_wc_conflict_choose_postpone,
/* If their were files to choose from, select one as a way of
resolving the conflict here and now. libsvn_wc will then do the
work of "installing" the chosen file.
*/
svn_wc_conflict_choose_base, /* original version */
svn_wc_conflict_choose_theirs_full, /* incoming version */
svn_wc_conflict_choose_mine_full, /* own version */
svn_wc_conflict_choose_theirs_conflict, /* incoming (for conflicted hunks) */
svn_wc_conflict_choose_mine_conflict, /* own (for conflicted hunks) */
svn_wc_conflict_choose_merged /* merged version */
} svn_wc_conflict_choice_t;
/** The final result returned by @c svn_wc_conflict_resolver_func_t.
*
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type. Instead,
* construct this structure using @c svn_wc_create_conflict_result()
* below.
*
* @since New in 1.5.
*/
typedef struct svn_wc_conflict_result_t
{
/** A choice to either delay the conflict resolution or select a
particular file to resolve the conflict. */
svn_wc_conflict_choice_t choice;
/** If not NULL, this is a path to a file which contains the client's
(or more likely, the user's) merging of the three values in
conflict. libsvn_wc accepts this file if (and only if) @c choice
is set to @c svn_wc_conflict_choose_merged.*/
const char *merged_file;
/** If true, save a backup copy of merged_file (or the original
merged_file from the conflict description, if merged_file is
NULL) in the user's working copy. */
svn_boolean_t save_merged;
} svn_wc_conflict_result_t;
/**
* Allocate an @c svn_wc_conflict_result_t structure in @a pool,
* initialize and return it.
*
* Set the @c choice field of the structure to @a choice, and @c
* merged_file to @a merged_file. Set all other fields to their @c
* _unknown, @c NULL or invalid value, respectively. Make only a shallow
* copy of the pointer argument @a merged_file.
*
* @since New in 1.5.
*/
svn_wc_conflict_result_t *
svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice,
const char *merged_file,
apr_pool_t *pool);
/** A callback used in svn_client_merge3(), svn_client_update3(), and
* svn_client_switch2() for resolving conflicts during the application
* of a tree delta to a working copy.
*
* @a description describes the exact nature of the conflict, and
* provides information to help resolve it. @a baton is a closure
* object; it should be provided by the implementation, and passed by
* the caller. All allocations should be performed in @a pool. When
* finished, the callback signals its resolution by returning a
* structure in @a *result. (See @c svn_wc_conflict_result_t.)
*
* The values @c svn_wc_conflict_choose_mine_conflict and @c
* svn_wc_conflict_choose_theirs_conflict are not legal for conflicts
* in binary files or properties.
*
* Implementations of this callback are free to present the conflict
* using any user interface. This may include simple contextual
* conflicts in a file's text or properties, or more complex
* 'tree'-based conflcts related to obstructed additions, deletions,
* and edits. The callback implementation is free to decide which
* sorts of conflicts to handle; it's also free to decide which types
* of conflicts are automatically resolvable and which require user
* interaction.
*
* @since New in 1.5.
*/
typedef svn_error_t *(*svn_wc_conflict_resolver_func_t)
(svn_wc_conflict_result_t **result,
const svn_wc_conflict_description_t *description,
void *baton,
apr_pool_t *pool);
/** @} */
/**
* A callback vtable invoked by our diff-editors, as they receive
* diffs from the server. 'svn diff' and 'svn merge' both implement
* their own versions of this table.
*
* Common parameters:
*
* @a adm_access will be an access baton for the directory containing
* @a path, or @c NULL if the diff editor is not using access batons.
*
* If @a state is non-NULL, set @a *state to the state of the item
* after the operation has been performed. (In practice, this is only
* useful with merge, not diff; diff callbacks will probably set
* @a *state to @c svn_wc_notify_state_unknown, since they do not change
* the state and therefore do not bother to know the state after the
* operation.) By default, @a state refers to the item's content
* state. Functions concerned with property state have separate
* @a contentstate and @a propstate arguments.
*
* If @a tree_conflicted is non-NULL, set @a *tree_conflicted to true if
* this operation caused a tree conflict, else to false. (Like with @a
* state, this is only useful with merge, not diff; diff callbacks
* should set this to false.)
*
* @since New in 1.6.
*/
typedef struct svn_wc_diff_callbacks3_t
{
/**
* A file @a path has changed. If @a tmpfile2 is non-NULL, the
* contents have changed and those changes can be seen by comparing
* @a tmpfile1 and @a tmpfile2, which represent @a rev1 and @a rev2 of
* the file, respectively.
*
* If known, the @c svn:mime-type value of each file is passed into
* @a mimetype1 and @a mimetype2; either or both of the values can
* be NULL. The implementor can use this information to decide if
* (or how) to generate differences.
*
* @a propchanges is an array of (@c svn_prop_t) structures. If it contains
* any elements, the original list of properties is provided in
* @a originalprops, which is a hash of @c svn_string_t values, keyed on the
* property name.
*
*/
svn_error_t *(*file_changed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
svn_revnum_t rev1,
svn_revnum_t rev2,
const char *mimetype1,
const char *mimetype2,
const apr_array_header_t *propchanges,
apr_hash_t *originalprops,
void *diff_baton);
/**
* A file @a path was added. The contents can be seen by comparing
* @a tmpfile1 and @a tmpfile2, which represent @a rev1 and @a rev2
* of the file, respectively. (If either file is empty, the rev
* will be 0.)
*
* If known, the @c svn:mime-type value of each file is passed into
* @a mimetype1 and @a mimetype2; either or both of the values can
* be NULL. The implementor can use this information to decide if
* (or how) to generate differences.
*
* @a propchanges is an array of (@c svn_prop_t) structures. If it contains
* any elements, the original list of properties is provided in
* @a originalprops, which is a hash of @c svn_string_t values, keyed on the
* property name.
*/
svn_error_t *(*file_added)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
svn_revnum_t rev1,
svn_revnum_t rev2,
const char *mimetype1,
const char *mimetype2,
const apr_array_header_t *propchanges,
apr_hash_t *originalprops,
void *diff_baton);
/**
* A file @a path was deleted. The [loss of] contents can be seen by
* comparing @a tmpfile1 and @a tmpfile2. @a originalprops provides
* the properties of the file.
* ### Some existing callers include WC "entry props" in @a originalprops.
*
* If known, the @c svn:mime-type value of each file is passed into
* @a mimetype1 and @a mimetype2; either or both of the values can
* be NULL. The implementor can use this information to decide if
* (or how) to generate differences.
*/
svn_error_t *(*file_deleted)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
const char *mimetype1,
const char *mimetype2,
apr_hash_t *originalprops,
void *diff_baton);
/**
* A directory @a path was added. @a rev is the revision that the
* directory came from.
*/
svn_error_t *(*dir_added)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
svn_revnum_t rev,
void *diff_baton);
/**
* A directory @a path was deleted.
*/
svn_error_t *(*dir_deleted)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
void *diff_baton);
/**
* A list of property changes (@a propchanges) was applied to the
* directory @a path.
*
* The array is a list of (@c svn_prop_t) structures.
*
* The original list of properties is provided in @a original_props,
* which is a hash of @c svn_string_t values, keyed on the property
* name.
*/
svn_error_t *(*dir_props_changed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
const apr_array_header_t *propchanges,
apr_hash_t *original_props,
void *diff_baton);
/**
* A directory @a path has been opened. @a rev is the revision that the
* directory came from.
*
* This function is called for @a path before any of the callbacks are
* called for a child of @a path.
*/
svn_error_t *(*dir_opened)(svn_wc_adm_access_t *adm_access,
svn_boolean_t *tree_conflicted,
const char *path,
svn_revnum_t rev,
void *diff_baton);
/**
* A directory @a path has been closed.
*/
svn_error_t *(*dir_closed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
void *diff_baton);
} svn_wc_diff_callbacks3_t;
/**
* Similar to @c svn_wc_diff_callbacks3_t, but without the dir_opened()
* function, and without the 'tree_conflicted' argument to the functions.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
typedef struct svn_wc_diff_callbacks2_t
{
/** The same as @c file_changed in @c svn_wc_diff_callbacks3_t. */
svn_error_t *(*file_changed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
svn_revnum_t rev1,
svn_revnum_t rev2,
const char *mimetype1,
const char *mimetype2,
const apr_array_header_t *propchanges,
apr_hash_t *originalprops,
void *diff_baton);
/** The same as @c file_added in @c svn_wc_diff_callbacks3_t. */
svn_error_t *(*file_added)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
svn_revnum_t rev1,
svn_revnum_t rev2,
const char *mimetype1,
const char *mimetype2,
const apr_array_header_t *propchanges,
apr_hash_t *originalprops,
void *diff_baton);
/** The same as @c file_deleted in @c svn_wc_diff_callbacks3_t. */
svn_error_t *(*file_deleted)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
const char *mimetype1,
const char *mimetype2,
apr_hash_t *originalprops,
void *diff_baton);
/** The same as @c dir_added in @c svn_wc_diff_callbacks3_t. */
svn_error_t *(*dir_added)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
svn_revnum_t rev,
void *diff_baton);
/** The same as @c dir_deleted in @c svn_wc_diff_callbacks3_t. */
svn_error_t *(*dir_deleted)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
void *diff_baton);
/** The same as @c dir_props_changed in @c svn_wc_diff_callbacks3_t. */
svn_error_t *(*dir_props_changed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
const apr_array_header_t *propchanges,
apr_hash_t *original_props,
void *diff_baton);
} svn_wc_diff_callbacks2_t;
/**
* Similar to @c svn_wc_diff_callbacks2_t, but with file additions/content
* changes and property changes split into different functions.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
typedef struct svn_wc_diff_callbacks_t
{
/** Similar to @c file_changed in @c svn_wc_diff_callbacks2_t, but without
* property change information. @a tmpfile2 is never NULL. @a state applies
* to the file contents. */
svn_error_t *(*file_changed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
svn_revnum_t rev1,
svn_revnum_t rev2,
const char *mimetype1,
const char *mimetype2,
void *diff_baton);
/** Similar to @c file_added in @c svn_wc_diff_callbacks2_t, but without
* property change information. @a *state applies to the file contents. */
svn_error_t *(*file_added)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
svn_revnum_t rev1,
svn_revnum_t rev2,
const char *mimetype1,
const char *mimetype2,
void *diff_baton);
/** Similar to @c file_deleted in @c svn_wc_diff_callbacks2_t, but without
* the properties. */
svn_error_t *(*file_deleted)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
const char *tmpfile1,
const char *tmpfile2,
const char *mimetype1,
const char *mimetype2,
void *diff_baton);
/** The same as @c dir_added in @c svn_wc_diff_callbacks2_t. */
svn_error_t *(*dir_added)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
svn_revnum_t rev,
void *diff_baton);
/** The same as @c dir_deleted in @c svn_wc_diff_callbacks2_t. */
svn_error_t *(*dir_deleted)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
void *diff_baton);
/** Similar to @c dir_props_changed in @c svn_wc_diff_callbacks2_t, but this
* function is called for files as well as directories. */
svn_error_t *(*props_changed)(svn_wc_adm_access_t *adm_access,
svn_wc_notify_state_t *state,
const char *path,
const apr_array_header_t *propchanges,
apr_hash_t *original_props,
void *diff_baton);
} svn_wc_diff_callbacks_t;
/* Asking questions about a working copy. */
/** Set @a *wc_format to @a path's working copy format version number if
* @a path is a valid working copy directory, else set it to 0.
* Return error @c APR_ENOENT if @a path does not exist at all.
*/
svn_error_t *
svn_wc_check_wc(const char *path,
int *wc_format,
apr_pool_t *pool);
/** Set @a *has_binary_prop to @c TRUE iff @a path has been marked
* with a property indicating that it is non-text (in other words, binary).
* @a adm_access is an access baton set that contains @a path.
*/
svn_error_t *
svn_wc_has_binary_prop(svn_boolean_t *has_binary_prop,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/* Detecting modification. */
/** Set @a *modified_p to non-zero if @a filename's text is modified
* with regard to the base revision, else set @a *modified_p to zero.
* @a filename is a path to the file, not just a basename. @a adm_access
* must be an access baton for @a filename.
*
* If @a force_comparison is @c TRUE, this function will not allow
* early return mechanisms that avoid actual content comparison.
* Instead, if there is a text base, a full byte-by-byte comparison
* will be done, and the entry checksum verified as well. (This means
* that if the text base is much longer than the working file, every
* byte of the text base will still be examined.)
*
* If @a filename does not exist, consider it unmodified. If it exists
* but is not under revision control (not even scheduled for
* addition), return the error @c SVN_ERR_ENTRY_NOT_FOUND.
*
* If @a filename is unmodified but has a timestamp variation then this
* function may "repair" @a filename's text-time by setting it to
* @a filename's last modification time.
*/
svn_error_t *
svn_wc_text_modified_p(svn_boolean_t *modified_p,
const char *filename,
svn_boolean_t force_comparison,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Set @a *modified_p to non-zero if @a path's properties are modified
* with regard to the base revision, else set @a modified_p to zero.
* @a adm_access must be an access baton for @a path.
*/
svn_error_t *
svn_wc_props_modified_p(svn_boolean_t *modified_p,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Administrative subdir.
*
* Ideally, this would be completely private to wc internals (in fact,
* it used to be that adm_subdir() in adm_files.c was the only function
* who knew the adm subdir's name). However, import wants to protect
* against importing administrative subdirs, so now the name is a
* matter of public record.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
#define SVN_WC_ADM_DIR_NAME ".svn"
/* Entries and status. */
/** The schedule states an entry can be in. */
typedef enum svn_wc_schedule_t
{
/** Nothing special here */
svn_wc_schedule_normal,
/** Slated for addition */
svn_wc_schedule_add,
/** Slated for deletion */
svn_wc_schedule_delete,
/** Slated for replacement (delete + add) */
svn_wc_schedule_replace
} svn_wc_schedule_t;
/**
* Values for the working_size field in svn_wc_entry_t
* when it isn't set to the actual size value of the unchanged
* working file.
*
* @defgroup svn_wc_entry_working_size_constants Working size constants
*
* @{
*/
/** The value of the working size is unknown (hasn't been
* calculated and stored in the past for whatever reason).
*
* @since New in 1.5
*/
#define SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN (-1)
/** @} */
/** A working copy entry -- that is, revision control information about
* one versioned entity.
*/
typedef struct svn_wc_entry_t
{
/* IMPORTANT: If you extend this structure, add new fields to the end. */
/* General Attributes */
/** entry's name */
const char *name;
/** base revision */
svn_revnum_t revision;
/** url in repository */
const char *url;
/** canonical repository URL or NULL if not known */
const char *repos;
/** repository uuid */
const char *uuid;
/** node kind (file, dir, ...) */
svn_node_kind_t kind;
/* State information */
/** scheduling (add, delete, replace ...) */
svn_wc_schedule_t schedule;
/** in a copied state (possibly because the entry is a child of a
* path that is @c svn_wc_schedule_add or @c svn_wc_schedule_replace,
* when the entry itself is @c svn_wc_schedule_normal).
* COPIED is true for nodes under a directory that was copied, but
* COPYFROM_URL is null there. They are both set for the root
* destination of the copy.
*/
svn_boolean_t copied;
/** The directory containing this entry had a versioned child of this
* name, but this entry represents a different revision or a switched
* path at which no item exists in the repository. This typically
* arises from committing or updating to a deletion of this entry
* without committing or updating the parent directory.
*
* The schedule can be 'normal' or 'add'. */
svn_boolean_t deleted;
/** absent -- we know an entry of this name exists, but that's all
(usually this happens because of authz restrictions) */
svn_boolean_t absent;
/** for THIS_DIR entry, implies whole entries file is incomplete */
svn_boolean_t incomplete;
/** copyfrom location */
const char *copyfrom_url;
/** copyfrom revision */
svn_revnum_t copyfrom_rev;
/** old version of conflicted file. A file basename, relative to the
* user's directory that the THIS_DIR entry refers to. */
const char *conflict_old;
/** new version of conflicted file. A file basename, relative to the
* user's directory that the THIS_DIR entry refers to. */
const char *conflict_new;
/** working version of conflicted file. A file basename, relative to the
* user's directory that the THIS_DIR entry refers to. */
const char *conflict_wrk;
/** property reject file. A file basename, relative to the user's
* directory that the THIS_DIR entry refers to. */
const char *prejfile;
/** last up-to-date time for text contents (0 means no information available)
*/
apr_time_t text_time;
/** last up-to-date time for properties (0 means no information available)
*
* @deprecated This value will always be 0 in version 1.4 and later.
*/
apr_time_t prop_time;
/** Hex MD5 checksum for the untranslated text base file,
* can be @c NULL for backwards compatibility.
*/
const char *checksum;
/* "Entry props" */
/** last revision this was changed */
svn_revnum_t cmt_rev;
/** last date this was changed */
apr_time_t cmt_date;
/** last commit author of this item */
const char *cmt_author;
/** lock token or NULL if path not locked in this WC
* @since New in 1.2.
*/
const char *lock_token;
/** lock owner, or NULL if not locked in this WC
* @since New in 1.2.
*/
const char *lock_owner;
/** lock comment or NULL if not locked in this WC or no comment
* @since New in 1.2.
*/
const char *lock_comment;
/** Lock creation date or 0 if not locked in this WC
* @since New in 1.2.
*/
apr_time_t lock_creation_date;
/** Whether this entry has any working properties.
* False if this information is not stored in the entry.
*
* @since New in 1.4. */
svn_boolean_t has_props;
/** Whether this entry has property modifications.
*
* @note For working copies in older formats, this flag is not valid.
*
* @see svn_wc_props_modified_p().
*
* @since New in 1.4. */
svn_boolean_t has_prop_mods;
/** A space-separated list of all properties whose presence/absence is cached
* in this entry.
*
* @see @c present_props.
*
* @since New in 1.4.
* @deprecated This value will always be "" in version 1.7 and later. */
const char *cachable_props;
/** Cached property existence for this entry.
* This is a space-separated list of property names. If a name exists in
* @c cachable_props but not in this list, this entry does not have that
* property. If a name exists in both lists, the property is present on this
* entry.
*
* @since New in 1.4.
* @deprecated This value will always be "" in version 1.7 and later. */
const char *present_props;
/** which changelist this item is part of, or NULL if not part of any.
* @since New in 1.5.
*/
const char *changelist;
/** Size of the file after being translated into local
* representation, or @c SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN if
* unknown.
*
* @since New in 1.5.
*/
apr_off_t working_size;
/** Whether a local copy of this entry should be kept in the working copy
* after a deletion has been committed, Only valid for the this-dir entry
* when it is scheduled for deletion.
*
* @since New in 1.5. */
svn_boolean_t keep_local;
/** The depth of this entry.
*
* ### It's a bit annoying that we only use this on this_dir
* ### entries, yet it will exist (with value svn_depth_infinity) on
* ### all entries. Maybe some future extensibility would make this
* ### field meaningful on entries besides this_dir.
*
* @since New in 1.5. */
svn_depth_t depth;
/** Serialized data for all of the tree conflicts detected in this_dir.
*
* @since New in 1.6. */
const char *tree_conflict_data;
/** The entry is a intra-repository file external and this is the
* repository root relative path to the file specified in the
* externals definition, otherwise NULL if the entry is not a file
* external.
*
* @since New in 1.6. */
const char *file_external_path;
/** The entry is a intra-repository file external and this is the
* peg revision number specified in the externals definition. This
* field is only valid when the file_external_path field is
* non-NULL. The only permissible values are
* svn_opt_revision_unspecified if the entry is not an external,
* svn_opt_revision_head if the external revision is unspecified or
* specified with -r HEAD or svn_opt_revision_number for a specific
* revision number.
*
* @since New in 1.6. */
svn_opt_revision_t file_external_peg_rev;
/** The entry is a intra-repository file external and this is the
* operative revision number specified in the externals definition.
* This field is only valid when the file_external_path field is
* non-NULL. The only permissible values are
* svn_opt_revision_unspecified if the entry is not an external,
* svn_opt_revision_head if the external revision is unspecified or
* specified with -r HEAD or svn_opt_revision_number for a specific
* revision number.
*
* @since New in 1.6. */
svn_opt_revision_t file_external_rev;
/* IMPORTANT: If you extend this structure, check the following functions in
* subversion/libsvn_wc/entries.c, to see if you need to extend them as well.
*
* svn_wc__atts_to_entry()
* svn_wc_entry_dup()
* alloc_entry()
* read_entry()
* write_entry()
* fold_entry()
*/
} svn_wc_entry_t;
/** How an entries file's owner dir is named in the entries file. */
#define SVN_WC_ENTRY_THIS_DIR ""
/** Set @a *entry to an entry for @a path, allocated in the access baton pool.
* If @a show_hidden is TRUE, return the entry even if it's in 'excluded',
* 'deleted' or 'absent' state. Excluded entries are those with their depth
* set to @c svn_depth_exclude. If @a path is not under revision control, or
* if entry is hidden, not scheduled for re-addition, and @a show_hidden is @c
* FALSE, then set @a *entry to @c NULL.
*
* @a *entry should not be modified, since doing so modifies the entries
* cache in @a adm_access without changing the entries file on disk.
*
* If @a path is not a directory then @a adm_access must be an access baton
* for the parent directory of @a path. To avoid needing to know whether
* @a path is a directory or not, if @a path is a directory @a adm_access
* can still be an access baton for the parent of @a path so long as the
* access baton for @a path itself is in the same access baton set.
*
* @a path can be relative or absolute but must share the same base used
* to open @a adm_access.
*
* Note that it is possible for @a path to be absent from disk but still
* under revision control; and conversely, it is possible for @a path to
* be present, but not under revision control.
*
* Use @a pool only for local processing.
*/
svn_error_t *
svn_wc_entry(const svn_wc_entry_t **entry,
const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t show_hidden,
apr_pool_t *pool);
/** Parse the `entries' file for @a adm_access and return a hash @a entries,
* whose keys are (<tt>const char *</tt>) entry names and values are
* (<tt>svn_wc_entry_t *</tt>). The hash @a entries, and its keys and
* values, are allocated from the pool used to open the @a adm_access
* baton (that's how the entries caching works). @a pool is used for
* transient allocations.
*
* Entries that are in a 'excluded', 'deleted' or 'absent' state (and not
* scheduled for re-addition) are not returned in the hash, unless
* @a show_hidden is TRUE. Excluded entries are those with their depth set to
* @c svn_depth_exclude.
*
* @par Important:
* The @a entries hash is the entries cache in @a adm_access
* and so usually the hash itself, the keys and the values should be treated
* as read-only. If any of these are modified then it is the caller's
* responsibility to ensure that the entries file on disk is updated. Treat
* the hash values as type (<tt>const svn_wc_entry_t *</tt>) if you wish to
* avoid accidental modification. Modifying the schedule member is a
* particularly bad idea, as the entries writing process relies on having
* access to the original schedule. Use a duplicate entry to modify the
* schedule.
*
* @par Important:
* Only the entry structures representing files and
* @c SVN_WC_ENTRY_THIS_DIR contain complete information. The entry
* structures representing subdirs have only the `kind' and `state'
* fields filled in. If you want info on a subdir, you must use this
* routine to open its @a path and read the @c SVN_WC_ENTRY_THIS_DIR
* structure, or call svn_wc_entry() on its @a path.
*/
svn_error_t *
svn_wc_entries_read(apr_hash_t **entries,
svn_wc_adm_access_t *adm_access,
svn_boolean_t show_hidden,
apr_pool_t *pool);
/** Return a duplicate of @a entry, allocated in @a pool. No part of the new
* entry will be shared with @a entry.
*/
svn_wc_entry_t *
svn_wc_entry_dup(const svn_wc_entry_t *entry,
apr_pool_t *pool);
/** Given a @a path in a dir under version control, decide if it is in a
* state of conflict; return the answers in @a *text_conflicted_p, @a
* *prop_conflicted_p, and @a *tree_conflicted_p. If one or two of the
* answers are uninteresting, simply pass @c NULL pointers for those.
*
* If @a path is unversioned or does not exist, @a *text_conflicted_p and
* @a *prop_conflicted_p will be @c FALSE if non-NULL.
*
* @a adm_access is the admin access baton of the parent directory.
*
* If the @a path has corresponding text conflict files (with suffix .mine,
* .theirs, etc.) that cannot be found, assume that the text conflict has
* been resolved by the user and return @c FALSE in @a *text_conflicted_p.
*
* Similarly, if a property conflicts file (.prej suffix) is said to exist,
* but it cannot be found, assume that the property conflicts have been
* resolved by the user and return @c FALSE in @a *prop_conflicted_p.
*
* @a *tree_conflicted_p can't be auto-resolved in this fashion. An
* explicit `resolved' is needed.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_conflicted_p2(svn_boolean_t *text_conflicted_p,
svn_boolean_t *prop_conflicted_p,
svn_boolean_t *tree_conflicted_p,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Given a @a dir_path under version control, decide if one of its entries
* (@a entry) is in a state of conflict; return the answers in @a
* text_conflicted_p and @a prop_conflicted_p. These pointers must not be
* null.
*
* If the @a entry mentions that text conflict files (with suffix .mine,
* .theirs, etc.) exist, but they cannot be found, assume the text conflict
* has been resolved by the user and return FALSE in @a *text_conflicted_p.
*
* Similarly, if the @a entry mentions that a property conflicts file (.prej
* suffix) exists, but it cannot be found, assume the property conflicts
* have been resolved by the user and return FALSE in @a *prop_conflicted_p.
*
* The @a entry is not updated.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_conflicted_p(svn_boolean_t *text_conflicted_p,
svn_boolean_t *prop_conflicted_p,
const char *dir_path,
const svn_wc_entry_t *entry,
apr_pool_t *pool);
/** Set @a *url and @a *rev to the ancestor URL and revision for @a path,
* allocating in @a pool. @a adm_access must be an access baton for @a path.
*
* If @a url or @a rev is NULL, then ignore it (just don't return the
* corresponding information).
*/
svn_error_t *
svn_wc_get_ancestry(char **url,
svn_revnum_t *rev,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** A callback vtable invoked by the generic entry-walker function.
* @since New in 1.5.
*/
typedef struct svn_wc_entry_callbacks2_t
{
/** An @a entry was found at @a path. */
svn_error_t *(*found_entry)(const char *path,
const svn_wc_entry_t *entry,
void *walk_baton,
apr_pool_t *pool);
/** Handle the error @a err encountered while processing @a path.
* Wrap or squelch @a err as desired, and return an @c svn_error_t
* *, or @c SVN_NO_ERROR.
*/
svn_error_t *(*handle_error)(const char *path,
svn_error_t *err,
void *walk_baton,
apr_pool_t *pool);
} svn_wc_entry_callbacks2_t;
/** @deprecated Provided for backward compatibility with the 1.4 API. */
typedef struct svn_wc_entry_callbacks_t
{
/** An @a entry was found at @a path. */
svn_error_t *(*found_entry)(const char *path,
const svn_wc_entry_t *entry,
void *walk_baton,
apr_pool_t *pool);
} svn_wc_entry_callbacks_t;
/**
* A generic entry-walker.
*
* Do a potentially recursive depth-first entry-walk beginning on
* @a path, which can be a file or dir. Call callbacks in
* @a walk_callbacks, passing @a walk_baton to each. Use @a pool for
* looping, recursion, and to allocate all entries returned.
* @a adm_access must be an access baton for @a path.
*
* If @a depth is @c svn_depth_empty, invoke the callbacks on @a path
* and return without recursing further. If @c svn_depth_files, do
* the same and invoke the callbacks on file children (if any) of
* @a path, then return. If @c svn_depth_immediates, do the preceding
* but also invoke callbacks on immediate subdirectories, then return.
* If @c svn_depth_infinity, recurse fully starting from @a path.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
* if the client has cancelled the operation.
*
* Like our other entries interfaces, entries that are in a 'excluded',
* 'deleted' or 'absent' state (and not scheduled for re-addition) are not
* discovered, unless @a show_hidden is TRUE. Excluded entries are those with
* their depth set to @c svn_depth_exclude.
*
* When a new directory is entered, @c SVN_WC_ENTRY_THIS_DIR will always
* be returned first.
*
* @note Callers should be aware that each directory will be
* returned *twice*: first as an entry within its parent, and
* subsequently as the '.' entry within itself. The two calls can be
* distinguished by looking for @c SVN_WC_ENTRY_THIS_DIR in the 'name'
* field of the entry.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_walk_entries3(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_wc_entry_callbacks2_t *walk_callbacks,
void *walk_baton,
svn_depth_t depth,
svn_boolean_t show_hidden,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_walk_entries3(), but without cancellation support
* or error handling from @a walk_callbacks, and with @a depth always
* set to @c svn_depth_infinity.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_walk_entries2(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_wc_entry_callbacks_t *walk_callbacks,
void *walk_baton,
svn_boolean_t show_hidden,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_walk_entries2(), but without cancellation support.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_walk_entries(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_wc_entry_callbacks_t *walk_callbacks,
void *walk_baton,
svn_boolean_t show_hidden,
apr_pool_t *pool);
/** Mark missing @a path as 'deleted' in its @a parent's list of entries.
*
* Return @c SVN_ERR_WC_PATH_FOUND if @a path isn't actually missing.
*/
svn_error_t *
svn_wc_mark_missing_deleted(const char *path,
svn_wc_adm_access_t *parent,
apr_pool_t *pool);
/** Ensure that an administrative area exists for @a path, so that @a
* path is a working copy subdir based on @a url at @a revision, with
* depth @a depth, and with repository UUID @a uuid and repository
* root URL @a repos.
*
* @a depth must be a definite depth, it cannot be @c svn_depth_unknown.
* @a uuid and @a repos may be @c NULL. If non-@c NULL, @a repos must
* be a prefix of @a url.
*
* If the administrative area does not exist, then create it and
* initialize it to an unlocked state.
*
* If the administrative area already exists then the given @a url
* must match the URL in the administrative area and the given
* @a revision must match the BASE of the working copy dir unless
* the admin directory is scheduled for deletion or the
* SVN_ERR_WC_OBSTRUCTED_UPDATE error will be returned.
*
* Do not ensure existence of @a path itself; if @a path does not
* exist, return error.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_ensure_adm3(const char *path,
const char *uuid,
const char *url,
const char *repos,
svn_revnum_t revision,
svn_depth_t depth,
apr_pool_t *pool);
/**
* Similar to svn_wc_ensure_adm3(), but with @a depth set to
* @c svn_depth_infinity.
*
* @deprecated Provided for backwards compatibility with the 1.4 API.
*
* @since New in 1.3.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_ensure_adm2(const char *path,
const char *uuid,
const char *url,
const char *repos,
svn_revnum_t revision,
apr_pool_t *pool);
/**
* Similar to svn_wc_ensure_adm2(), but with @a repos set to @c NULL.
*
* @deprecated Provided for backwards compatibility with the 1.2 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_ensure_adm(const char *path,
const char *uuid,
const char *url,
svn_revnum_t revision,
apr_pool_t *pool);
/** Set the repository root URL of @a path to @a repos, if possible.
*
* @a adm_access must contain @a path and be write-locked, if @a path
* is versioned. Return no error if path is missing or unversioned.
* Use @a pool for temporary allocations.
*
* @note In some circumstances, the repository root can't be set
* without making the working copy corrupt. In such cases, this
* function just returns no error, without modifying the @a path entry.
*
* @note This function exists to make it possible to try to set the repository
* root in old working copies; new working copies normally get this set at
* creation time.
*
* @since New in 1.3.
*/
svn_error_t *
svn_wc_maybe_set_repos_root(svn_wc_adm_access_t *adm_access,
const char *path,
const char *repos,
apr_pool_t *pool);
/**
* @defgroup svn_wc_status Working copy status.
* @{
*
* We have two functions for getting working copy status: one function
* for getting the status of exactly one thing, and another for
* getting the statuses of (potentially) multiple things.
*
* The concept of depth, as explained in the documentation for
* svn_depth_t, may be useful in understanding this. Suppose we're
* getting the status of directory D:
*
* To offer all three levels, we could have one unified function,
* taking a `depth' parameter. Unfortunately, because this function
* would have to handle multiple return values as well as the single
* return value case, getting the status of just one entity would
* become cumbersome: you'd have to roll through a hash to find one
* lone status.
*
* So we have svn_wc_status() for depth-empty (just D itself), and
* svn_wc_get_status_editor() for depth-immediates and depth-infinity,
* since the latter two involve multiple return values.
*
* @note The status structures may contain a @c NULL ->entry field.
* This indicates an item that is not versioned in the working copy.
*/
/** The type of status for the working copy. */
enum svn_wc_status_kind
{
/** does not exist */
svn_wc_status_none = 1,
/** is not a versioned thing in this wc */
svn_wc_status_unversioned,
/** exists, but uninteresting */
svn_wc_status_normal,
/** is scheduled for addition */
svn_wc_status_added,
/** under v.c., but is missing */
svn_wc_status_missing,
/** scheduled for deletion */
svn_wc_status_deleted,
/** was deleted and then re-added */
svn_wc_status_replaced,
/** text or props have been modified */
svn_wc_status_modified,
/** local mods received repos mods */
svn_wc_status_merged,
/** local mods received conflicting repos mods */
svn_wc_status_conflicted,
/** is unversioned but configured to be ignored */
svn_wc_status_ignored,
/** an unversioned resource is in the way of the versioned resource */
svn_wc_status_obstructed,
/** an unversioned directory path populated by an svn:externals
property; this status is not used for file externals */
svn_wc_status_external,
/** a directory doesn't contain a complete entries list */
svn_wc_status_incomplete
};
/**
* Structure for holding the "status" of a working copy item.
*
* The item's entry data is in @a entry, augmented and possibly shadowed
* by the other fields. @a entry is @c NULL if this item is not under
* version control.
*
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type.
*
* @since New in 1.2.
*/
typedef struct svn_wc_status2_t
{
/** Can be @c NULL if not under version control. */
svn_wc_entry_t *entry;
/** The status of the entries text. */
enum svn_wc_status_kind text_status;
/** The status of the entries properties. */
enum svn_wc_status_kind prop_status;
/** a directory can be 'locked' if a working copy update was interrupted. */
svn_boolean_t locked;
/** a file or directory can be 'copied' if it's scheduled for
* addition-with-history (or part of a subtree that is scheduled as such.).
*/
svn_boolean_t copied;
/** a file or directory can be 'switched' if the switch command has been
* used. If this is TRUE, then file_external will be FALSE.
*/
svn_boolean_t switched;
/** The entry's text status in the repository. */
enum svn_wc_status_kind repos_text_status;
/** The entry's property status in the repository. */
enum svn_wc_status_kind repos_prop_status;
/** The entry's lock in the repository, if any. */
svn_lock_t *repos_lock;
/** Set to the URI (actual or expected) of the item.
* @since New in 1.3
*/
const char *url;
/**
* @defgroup svn_wc_status_ood WC out-of-date info from the repository
* @{
*
* When the working copy item is out-of-date compared to the
* repository, the following fields represent the state of the
* youngest revision of the item in the repository. If the working
* copy is not out of date, the fields are initialized as described
* below.
*/
/** Set to the youngest committed revision, or @c SVN_INVALID_REVNUM
* if not out of date.
* @since New in 1.3
*/
svn_revnum_t ood_last_cmt_rev;
/** Set to the most recent commit date, or @c 0 if not out of date.
* @since New in 1.3
*/
apr_time_t ood_last_cmt_date;
/** Set to the node kind of the youngest commit, or @c svn_node_none
* if not out of date.
* @since New in 1.3
*/
svn_node_kind_t ood_kind;
/** Set to the user name of the youngest commit, or @c NULL if not
* out of date or non-existent. Because a non-existent @c
* svn:author property has the same behavior as an out-of-date
* working copy, examine @c ood_last_cmt_rev to determine whether
* the working copy is out of date.
* @since New in 1.3
*/
const char *ood_last_cmt_author;
/** @} */
/** Non-NULL if the entry is the victim of a tree conflict.
* @since New in 1.6
*/
svn_wc_conflict_description_t *tree_conflict;
/** If the item is a file that was added to the working copy with an
* svn:externals; if file_external is TRUE, then switched is always
* FALSE.
* @since New in 1.6
*/
svn_boolean_t file_external;
/** The actual status of the text compared to the pristine base of the
* file. This value isn't masked by other working copy statuses.
* @c pristine_text_status is @c svn_wc_status_none if this value was
* not calculated during the status walk.
* @since New in 1.6
*/
enum svn_wc_status_kind pristine_text_status;
/** The actual status of the properties compared to the pristine base of
* the node. This value isn't masked by other working copy statuses.
* @c pristine_prop_status is @c svn_wc_status_none if this value was
* not calculated during the status walk.
* @since New in 1.6
*/
enum svn_wc_status_kind pristine_prop_status;
/* NOTE! Please update svn_wc_dup_status2() when adding new fields here. */
} svn_wc_status2_t;
/**
* Same as @c svn_wc_status2_t, but without the svn_lock_t 'repos_lock' field.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
typedef struct svn_wc_status_t
{
/** Can be @c NULL if not under version control. */
svn_wc_entry_t *entry;
/** The status of the entries text. */
enum svn_wc_status_kind text_status;
/** The status of the entries properties. */
enum svn_wc_status_kind prop_status;
/** a directory can be 'locked' if a working copy update was interrupted. */
svn_boolean_t locked;
/** a file or directory can be 'copied' if it's scheduled for
* addition-with-history (or part of a subtree that is scheduled as such.).
*/
svn_boolean_t copied;
/** a file or directory can be 'switched' if the switch command has been
* used.
*/
svn_boolean_t switched;
/** The entry's text status in the repository. */
enum svn_wc_status_kind repos_text_status;
/** The entry's property status in the repository. */
enum svn_wc_status_kind repos_prop_status;
} svn_wc_status_t;
/**
* Return a deep copy of the @a orig_stat status structure, allocated
* in @a pool.
*
* @since New in 1.2.
*/
svn_wc_status2_t *
svn_wc_dup_status2(const svn_wc_status2_t *orig_stat,
apr_pool_t *pool);
/**
* Same as svn_wc_dup_status2(), but for older svn_wc_status_t structures.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_wc_status_t *
svn_wc_dup_status(const svn_wc_status_t *orig_stat,
apr_pool_t *pool);
/**
* Fill @a *status for @a path, allocating in @a pool.
* @a adm_access must be an access baton for @a path.
*
* Here are some things to note about the returned structure. A quick
* examination of the @c status->text_status after a successful return of
* this function can reveal the following things:
*
* - @c svn_wc_status_none : @a path is not versioned, and is either not
* present on disk, or is ignored by svn's
* default ignore regular expressions or the
* svn:ignore property setting for @a path's
* parent directory.
*
* - @c svn_wc_status_missing : @a path is versioned, but is missing from
* the working copy.
*
* - @c svn_wc_status_unversioned : @a path is not versioned, but is
* present on disk and not being
* ignored (see above).
*
* The other available results for the @c text_status field are more
* straightforward in their meanings. See the comments on the
* @c svn_wc_status_kind structure for some hints.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_status2(svn_wc_status2_t **status,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/**
* Same as svn_wc_status2(), but for older svn_wc_status_t structures.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_status(svn_wc_status_t **status,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/**
* A callback for reporting a @a status about @a path.
*
* @a baton is a closure object; it should be provided by the
* implementation, and passed by the caller.
*
* @a pool will be cleared between invocations to the callback.
*
* @since New in 1.6.
*/
typedef svn_error_t *(*svn_wc_status_func3_t)(void *baton,
const char *path,
svn_wc_status2_t *status,
apr_pool_t *pool);
/**
* Same as svn_wc_status_func3_t(), but without a provided pool or
* the ability to propagate errors.
*
* @since New in 1.2.
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
typedef void (*svn_wc_status_func2_t)(void *baton,
const char *path,
svn_wc_status2_t *status);
/**
* Same as svn_wc_status_func2_t(), but for older svn_wc_status_t structures.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
typedef void (*svn_wc_status_func_t)(void *baton,
const char *path,
svn_wc_status_t *status);
/**
* Set @a *editor and @a *edit_baton to an editor that generates @c
* svn_wc_status2_t structures and sends them through @a status_func /
* @a status_baton. @a anchor is an access baton, with a tree lock,
* for the local path to the working copy which will be used as the
* root of our editor. If @a target is not empty, it represents an
* entry in the @a anchor path which is the subject of the editor
* drive (otherwise, the @a anchor is the subject).
*
* If @a set_locks_baton is non-@c NULL, it will be set to a baton that can
* be used in a call to the svn_wc_status_set_repos_locks() function.
*
* Callers drive this editor to describe working copy out-of-dateness
* with respect to the repository. If this information is not
* available or not desired, callers should simply call the
* close_edit() function of the @a editor vtable.
*
* If the editor driver calls @a editor's set_target_revision() vtable
* function, then when the edit drive is completed, @a *edit_revision
* will contain the revision delivered via that interface.
*
* Assuming the target is a directory, then:
*
* - If @a get_all is FALSE, then only locally-modified entries will be
* returned. If TRUE, then all entries will be returned.
*
* - If @a depth is @c svn_depth_empty, a status structure will
* be returned for the target only; if @c svn_depth_files, for the
* target and its immediate file children; if
* @c svn_depth_immediates, for the target and its immediate
* children; if @c svn_depth_infinity, for the target and
* everything underneath it, fully recursively.
*
* If @a depth is @c svn_depth_unknown, take depths from the
* working copy and behave as above in each directory's case.
*
* If the given @a depth is incompatible with the depth found in a
* working copy directory, the found depth always governs.
*
* If @a no_ignore is set, statuses that would typically be ignored
* will instead be reported.
*
* @a ignore_patterns is an array of file patterns matching
* unversioned files to ignore for the purposes of status reporting,
* or @c NULL if the default set of ignorable file patterns should be used.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton while building
* the @a statushash to determine if the client has cancelled the operation.
*
* If @a traversal_info is non-NULL, then record pre-update traversal
* state in it. (Caller should obtain @a traversal_info from
* svn_wc_init_traversal_info().)
*
* Allocate the editor itself in @a pool, but the editor does temporary
* allocations in a subpool of @a pool.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_get_status_editor4(const svn_delta_editor_t **editor,
void **edit_baton,
void **set_locks_baton,
svn_revnum_t *edit_revision,
svn_wc_adm_access_t *anchor,
const char *target,
svn_depth_t depth,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
const apr_array_header_t *ignore_patterns,
svn_wc_status_func3_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Same as svn_wc_get_status_editor4(), but using @c svn_wc_status_func2_t
* instead of @c svn_wc_status_func3_t.
*
* @since New in 1.5.
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_status_editor3(const svn_delta_editor_t **editor,
void **edit_baton,
void **set_locks_baton,
svn_revnum_t *edit_revision,
svn_wc_adm_access_t *anchor,
const char *target,
svn_depth_t depth,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
apr_array_header_t *ignore_patterns,
svn_wc_status_func2_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Like svn_wc_get_status_editor3(), but with @a ignore_patterns
* provided from the corresponding value in @a config, and @a recurse
* instead of @a depth. If @a recurse is TRUE, behave as if for @c
* svn_depth_infinity; else if @a recurse is FALSE, behave as if for
* @c svn_depth_immediates.
*
* @since New in 1.2.
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_status_editor2(const svn_delta_editor_t **editor,
void **edit_baton,
void **set_locks_baton,
svn_revnum_t *edit_revision,
svn_wc_adm_access_t *anchor,
const char *target,
apr_hash_t *config,
svn_boolean_t recurse,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
svn_wc_status_func2_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Same as svn_wc_get_status_editor2(), but with @a set_locks_baton set
* to @c NULL, and taking a deprecated svn_wc_status_func_t argument.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_status_editor(const svn_delta_editor_t **editor,
void **edit_baton,
svn_revnum_t *edit_revision,
svn_wc_adm_access_t *anchor,
const char *target,
apr_hash_t *config,
svn_boolean_t recurse,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
svn_wc_status_func_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Associate @a locks, a hash table mapping <tt>const char*</tt>
* absolute repository paths to <tt>svn_lock_t</tt> objects, with a
* @a set_locks_baton returned by an earlier call to
* svn_wc_get_status_editor3(). @a repos_root is the repository root URL.
* Perform all allocations in @a pool.
*
* @note @a locks will not be copied, so it must be valid throughout the
* edit. @a pool must also not be destroyed or cleared before the edit is
* finished.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_status_set_repos_locks(void *set_locks_baton,
apr_hash_t *locks,
const char *repos_root,
apr_pool_t *pool);
/** @} */
/**
* Copy @a src to @a dst_basename in @a dst_parent, and schedule
* @a dst_basename for addition to the repository, remembering the copy
* history.
*
* @a src must be a file or directory under version control; @a dst_parent
* must be a directory under version control in the same working copy;
* @a dst_basename will be the name of the copied item, and it must not
* exist already.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton at
* various points during the operation. If it returns an error
* (typically @c SVN_ERR_CANCELLED), return that error immediately.
*
* For each file or directory copied, @a notify_func will be called
* with its path and the @a notify_baton. @a notify_func may be @c NULL
* if you are not interested in this information.
*
* @par Important:
* This is a variant of svn_wc_add(). No changes will happen
* to the repository until a commit occurs. This scheduling can be
* removed with svn_client_revert2().
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_copy2(const char *src,
svn_wc_adm_access_t *dst_parent,
const char *dst_basename,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_copy2(), but takes an @c svn_wc_notify_func_t instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_copy(const char *src,
svn_wc_adm_access_t *dst_parent,
const char *dst_basename,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Schedule @a path for deletion, it will be deleted from the repository on
* the next commit. If @a path refers to a directory, then a recursive
* deletion will occur. @a adm_access must hold a write lock for the parent
* of @a path.
*
* If @a keep_local is FALSE, this function immediately deletes all files,
* modified and unmodified, versioned and unversioned from the working copy.
* It also immediately deletes unversioned directories and directories that
* are scheduled to be added. Only versioned directories will remain in the
* working copy, these get deleted by the update following the commit.
*
* If @a keep_local is TRUE, all files and directories will be kept in the
* working copy (and will become unversioned on the next commit).
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton at
* various points during the operation. If it returns an error
* (typically @c SVN_ERR_CANCELLED), return that error immediately.
*
* For each path marked for deletion, @a notify_func will be called with
* the @a notify_baton and that path. The @a notify_func callback may be
* @c NULL if notification is not needed.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_delete3(const char *path,
svn_wc_adm_access_t *adm_access,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_boolean_t keep_local,
apr_pool_t *pool);
/**
* Similar to svn_wc_delete3(), but with @a keep_local always set to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_delete2(const char *path,
svn_wc_adm_access_t *adm_access,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_delete2(), but takes an @c svn_wc_notify_func_t instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_delete(const char *path,
svn_wc_adm_access_t *adm_access,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Put @a path under version control by adding an entry in its parent,
* and, if @a path is a directory, adding an administrative area. The
* new entry and anything under it is scheduled for addition to the
* repository. @a parent_access should hold a write lock for the parent
* directory of @a path. If @a path is a directory then an access baton
* for @a path will be added to the set containing @a parent_access.
*
* If @a path does not exist, return @c SVN_ERR_WC_PATH_NOT_FOUND.
*
* If @a path is a directory, add it at @a depth; otherwise, ignore
* @a depth.
*
* If @a copyfrom_url is non-NULL, it and @a copyfrom_rev are used as
* `copyfrom' args. This is for copy operations, where one wants
* to schedule @a path for addition with a particular history.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton at
* various points during the operation. If it returns an error
* (typically @c SVN_ERR_CANCELLED), return that error immediately.
*
* When the @a path has been added, then @a notify_func will be called
* (if it is not @c NULL) with the @a notify_baton and the path.
*
* Return @c SVN_ERR_WC_NODE_KIND_CHANGE if @a path is both an unversioned
* directory and a file that is scheduled for deletion or in state deleted.
*
*<pre> ### This function currently does double duty -- it is also
* ### responsible for "switching" a working copy directory over to a
* ### new copyfrom ancestry and scheduling it for addition. Here is
* ### the old doc string from Ben, lightly edited to bring it
* ### up-to-date, explaining the TRUE, secret life of this function:</pre>
*
* Given a @a path within a working copy of type KIND, follow this algorithm:
*
* - if @a path is not under version control:
* - Place it under version control and schedule for addition;
* if @a copyfrom_url is non-NULL, use it and @a copyfrom_rev as
* 'copyfrom' history
*
* - if @a path is already under version control:
* (This can only happen when a directory is copied, in which
* case ancestry must have been supplied as well.)
*
* - Schedule the directory itself for addition with copyfrom history.
* - Mark all its children with a 'copied' flag
* - Rewrite all the URLs to what they will be after a commit.
* - ### @todo Remove old wcprops too, see the '###' below.
*
*<pre> ### I think possibly the "switchover" functionality should be
* ### broken out into a separate function, but its all intertwined in
* ### the code right now. Ben, thoughts? Hard? Easy? Mauve?</pre>
*
* ### Update: see "###" comment in svn_wc_add_repos_file3()'s doc
* string about this.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_add3(const char *path,
svn_wc_adm_access_t *parent_access,
svn_depth_t depth,
const char *copyfrom_url,
svn_revnum_t copyfrom_rev,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_add3(), but with the @a depth parameter always
* @c svn_depth_infinity.
*
* @since New in 1.2.
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_add2(const char *path,
svn_wc_adm_access_t *parent_access,
const char *copyfrom_url,
svn_revnum_t copyfrom_rev,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_add2(), but takes an @c svn_wc_notify_func_t instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_add(const char *path,
svn_wc_adm_access_t *parent_access,
const char *copyfrom_url,
svn_revnum_t copyfrom_rev,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/** Add a file to a working copy at @a dst_path, obtaining the text-base's
* contents from @a new_base_contents, the wc file's content from
* @a new_contents, its base properties from @a new_base_props and
* wc properties from @a new_props.
*
* The base text and props normally come from the repository file
* represented by the copyfrom args, see below. The new file will
* be scheduled for addition with history.
*
* @a new_contents and @a new_props may be NULL, in which case
* the working copy text and props are taken from the base files with
* appropriate translation of the file's content.
*
* @a new_contents must be provided in Normal Form. This is required
* in order to pass both special and non-special files through a stream.
*
* @a adm_access, or an access baton in its associated set, must
* contain a write lock for the parent of @a dst_path.
*
* If @a copyfrom_url is non-NULL, then @a copyfrom_rev must be a
* valid revision number, and together they are the copyfrom history
* for the new file.
*
* The @a cancel_func and @a cancel_baton are a standard cancellation
* callback, or NULL if no callback is needed. @a notify_func and
* @a notify_baton are a notification callback, and will be notified
* of the addition of this file.
*
* Use @a scratch_pool for temporary allocations.
*
* ### NOTE: the notification callback/baton is not yet used.
*
* ### This function is very redundant with svn_wc_add(). Ideally,
* we'd merge them, so that svn_wc_add() would just take optional
* new_props and optional copyfrom information. That way it could be
* used for both 'svn add somefilesittingonmydisk' and for adding
* files from repositories, with or without copyfrom history.
*
* The problem with this Ideal Plan is that svn_wc_add() also takes
* care of recursive URL-rewriting. There's a whole comment in its
* doc string about how that's really weird, outside its core mission,
* etc, etc. So another part of the Ideal Plan is that that
* functionality of svn_wc_add() would move into a separate function.
*
* @since New in 1.6
*/
svn_error_t *
svn_wc_add_repos_file3(const char *dst_path,
svn_wc_adm_access_t *adm_access,
svn_stream_t *new_base_contents,
svn_stream_t *new_contents,
apr_hash_t *new_base_props,
apr_hash_t *new_props,
const char *copyfrom_url,
svn_revnum_t copyfrom_rev,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool);
/** Same as svn_wc_add_repos_file3(), except that it has pathnames rather
* than streams for the text base, and actual text, and has no cancellation.
*
* @since New in 1.4.
* @deprecated Provided for compatibility with the 1.5 API
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_add_repos_file2(const char *dst_path,
svn_wc_adm_access_t *adm_access,
const char *new_text_base_path,
const char *new_text_path,
apr_hash_t *new_base_props,
apr_hash_t *new_props,
const char *copyfrom_url,
svn_revnum_t copyfrom_rev,
apr_pool_t *pool);
/** Same as svn_wc_add_repos_file3(), except that it doesn't have the
* BASE arguments or cancellation.
*
* @deprecated Provided for compatibility with the 1.3 API
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_add_repos_file(const char *dst_path,
svn_wc_adm_access_t *adm_access,
const char *new_text_path,
apr_hash_t *new_props,
const char *copyfrom_url,
svn_revnum_t copyfrom_rev,
apr_pool_t *pool);
/** Remove entry @a name in @a adm_access from revision control. @a name
* must be either a file or @c SVN_WC_ENTRY_THIS_DIR. @a adm_access must
* hold a write lock.
*
* If @a name is a file, all its info will be removed from @a adm_access's
* administrative directory. If @a name is @c SVN_WC_ENTRY_THIS_DIR, then
* @a adm_access's entire administrative area will be deleted, along with
* *all* the administrative areas anywhere in the tree below @a adm_access.
*
* Normally, only administrative data is removed. However, if
* @a destroy_wf is TRUE, then all working file(s) and dirs are deleted
* from disk as well. When called with @a destroy_wf, any locally
* modified files will *not* be deleted, and the special error
* @c SVN_ERR_WC_LEFT_LOCAL_MOD might be returned. (Callers only need to
* check for this special return value if @a destroy_wf is TRUE.)
*
* If @a instant_error is TRUE, then return @c
* SVN_ERR_WC_LEFT_LOCAL_MOD the instant a locally modified file is
* encountered. Otherwise, leave locally modified files in place and
* return the error only after all the recursion is complete.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton at
* various points during the removal. If it returns an error
* (typically @c SVN_ERR_CANCELLED), return that error immediately.
*
* WARNING: This routine is exported for careful, measured use by
* libsvn_client. Do *not* call this routine unless you really
* understand what the heck you're doing.
*/
svn_error_t *
svn_wc_remove_from_revision_control(svn_wc_adm_access_t *adm_access,
const char *name,
svn_boolean_t destroy_wf,
svn_boolean_t instant_error,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Assuming @a path is under version control and in a state of conflict,
* then take @a path *out* of this state. If @a resolve_text is TRUE then
* any text conflict is resolved, if @a resolve_props is TRUE then any
* property conflicts are resolved, if @a resolve_tree is TRUE then any
* tree conflicts are resolved.
*
* If @a depth is @c svn_depth_empty, act only on @a path; if
* @c svn_depth_files, resolve @a path and its conflicted file
* children (if any); if @c svn_depth_immediates, resolve @a path and
* all its immediate conflicted children (both files and directories,
* if any); if @c svn_depth_infinity, resolve @a path and every
* conflicted file or directory anywhere beneath it.
*
* If @a conflict_choice is @c svn_wc_conflict_choose_base, resolve the
* conflict with the old file contents; if
* @c svn_wc_conflict_choose_mine_full, use the original working contents;
* if @c svn_wc_conflict_choose_theirs_full, the new contents; and if
* @c svn_wc_conflict_choose_merged, don't change the contents at all,
* just remove the conflict status, which is the pre-1.5 behavior.
*
* @c svn_wc_conflict_choose_theirs_conflict and @c
* svn_wc_conflict_choose_mine_conflict are not legal for binary
* files or properties.
*
* @a adm_access is an access baton, with a write lock, for @a path.
*
* Needless to say, this function doesn't touch conflict markers or
* anything of that sort -- only a human can semantically resolve a
* conflict. Instead, this function simply marks a file as "having
* been resolved", clearing the way for a commit.
*
* The implementation details are opaque, as our "conflicted" criteria
* might change over time. (At the moment, this routine removes the
* three fulltext 'backup' files and any .prej file created in a conflict,
* and modifies @a path's entry.)
*
* If @a path is not under version control, return @c SVN_ERR_ENTRY_NOT_FOUND.
* If @a path isn't in a state of conflict to begin with, do nothing, and
* return @c SVN_NO_ERROR.
*
* If @c path was successfully taken out of a state of conflict, report this
* information to @c notify_func (if non-@c NULL.) If only text, only
* property, or only tree conflict resolution was requested, and it was
* successful, then success gets reported.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_resolved_conflict4(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t resolve_text,
svn_boolean_t resolve_props,
svn_boolean_t resolve_tree,
svn_depth_t depth,
svn_wc_conflict_choice_t conflict_choice,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_resolved_conflict4(), but without tree-conflict
* resolution support.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_resolved_conflict3(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t resolve_text,
svn_boolean_t resolve_props,
svn_depth_t depth,
svn_wc_conflict_choice_t conflict_choice,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_resolved_conflict3(), but without automatic conflict
* resolution support, and with @a depth set according to @a recurse:
* if @a recurse is TRUE, @a depth is @c svn_depth_infinity, else it is
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_resolved_conflict2(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t resolve_text,
svn_boolean_t resolve_props,
svn_boolean_t recurse,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_resolved_conflict2(), but takes an
* svn_wc_notify_func_t and doesn't have cancellation support.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_resolved_conflict(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t resolve_text,
svn_boolean_t resolve_props,
svn_boolean_t recurse,
svn_wc_notify_func_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/* Commits. */
/**
* Storage type for queued post-commit data.
*
* @since New in 1.5.
*/
typedef struct svn_wc_committed_queue_t svn_wc_committed_queue_t;
/**
* Create a queue for use with svn_wc_queue_committed() and
* svn_wc_process_committed_queue().
*
* The returned queue and all further allocations required for queueing
* new items will also be done from @a pool.
*
* @since New in 1.5.
*/
svn_wc_committed_queue_t *
svn_wc_committed_queue_create(apr_pool_t *pool);
/**
* Queue committed items to be processed later by
* svn_wc_process_committed_queue().
*
* All pointer data passed to this function (@a path, @a adm_access,
* @a wcprop_changes and @a checksum) should remain valid until the queue
* has been processed by svn_wc_process_committed_queue().
*
* Record in @a queue that @a path will need to be bumped after a commit
* succeeds. @a adm_access must hold a write lock appropriate for @a path.
*
* If non-NULL, @a wcprop_changes is an array of <tt>svn_prop_t *</tt>
* changes to wc properties; if an @c svn_prop_t->value is NULL, then
* that property is deleted.
*
* If @a remove_lock is @c TRUE, any entryprops related to a repository
* lock will be removed.
*
* If @a remove_changelist is @c TRUE, any association with a
* changelist will be removed.
*
* If @a path is a file and @a checksum is non-NULL, use @a checksum as
* the checksum for the new text base. Otherwise, calculate the checksum
* if needed.
*
* If @a recurse is TRUE and @a path is a directory, then bump every
* versioned object at or under @a path. This is usually done for
* copied trees.
*
* Temporary allocations will be performed in @a scratch_pool, and persistent
* allocations will use the same pool as @a queue used when it was created.
*
* @note the @a recurse parameter should be used with extreme care since
* it will bump ALL nodes under the directory, regardless of their
* actual inclusion in the new revision.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_queue_committed2(svn_wc_committed_queue_t *queue,
const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
svn_checksum_t *checksum,
apr_pool_t *scratch_pool);
/** Same as svn_wc_queue_committed2() but the @a queue parameter has an
* extra indirection and @a digest is supplied instead of a checksum type.
*
* @note despite the extra indirection, this function does NOT allocate
* the queue for you. svn_wc_committed_queue_create() must be called.
*
* @since New in 1.5
*
* @deprecated Provided for backwards compatibility with 1.5
*/
svn_error_t *
svn_wc_queue_committed(svn_wc_committed_queue_t **queue,
const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
const unsigned char *digest,
apr_pool_t *pool);
/**
* Bump all items in @a queue to @a new_revnum after a commit succeeds.
* @a rev_date and @a rev_author are the (server-side) date and author
* of the new revision; one or both may be @c NULL.
*
* @a adm_access must be associated with all affected directories, and
* must hold a write lock in each one.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_process_committed_queue(svn_wc_committed_queue_t *queue,
svn_wc_adm_access_t *adm_access,
svn_revnum_t new_revnum,
const char *rev_date,
const char *rev_author,
apr_pool_t *pool);
/**
* @note this function has improper expectations around the operation and
* execution of other parts of the Subversion WC library. The resulting
* coupling makes this interface near-impossible to support. Documentation
* has been removed, as a result.
*
* @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
* for backwards compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_process_committed4(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
svn_revnum_t new_revnum,
const char *rev_date,
const char *rev_author,
apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
const unsigned char *digest,
apr_pool_t *pool);
/** @see svn_wc_process_committed4()
*
* @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
* for backwards compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_process_committed3(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
svn_revnum_t new_revnum,
const char *rev_date,
const char *rev_author,
apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
const unsigned char *digest,
apr_pool_t *pool);
/** @see svn_wc_process_committed4()
*
* @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
* for backwards compatibility with the 1.3 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_process_committed2(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
svn_revnum_t new_revnum,
const char *rev_date,
const char *rev_author,
apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
apr_pool_t *pool);
/** @see svn_wc_process_committed4()
*
* @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
* for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_process_committed(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t recurse,
svn_revnum_t new_revnum,
const char *rev_date,
const char *rev_author,
apr_array_header_t *wcprop_changes,
apr_pool_t *pool);
/**
* Do a depth-first crawl in a working copy, beginning at @a path.
*
* Communicate the `state' of the working copy's revisions and depths
* to @a reporter/@a report_baton. Obviously, if @a path is a file
* instead of a directory, this depth-first crawl will be a short one.
*
* No locks are or logs are created, nor are any animals harmed in the
* process. No cleanup is necessary. @a adm_access must be an access
* baton for the @a path hierarchy, it does not require a write lock.
*
* After all revisions are reported, @a reporter->finish_report() is
* called, which immediately causes the RA layer to update the working
* copy. Thus the return value may very well reflect the result of
* the update!
*
* If @a depth is @c svn_depth_empty, then report state only for
* @a path itself. If @c svn_depth_files, do the same and include
* immediate file children of @a path. If @c svn_depth_immediates,
* then behave as if for @c svn_depth_files but also report the
* property states of immediate subdirectories. If @a depth is
* @c svn_depth_infinity, then report state fully recursively. All
* descents are only as deep as @a path's own depth permits, of
* course. If @a depth is @c svn_depth_unknown, then just use
* @c svn_depth_infinity, which in practice means depth of @a path.
*
* Iff @a honor_depth_exclude is TRUE, the crawler will report paths
* whose ambient depth is @c svn_depth_exclude as being excluded, and
* thus prevent the server from pushing update data for those paths;
* therefore, don't set this flag if you wish to pull in excluded paths.
* Note that @c svn_depth_exclude on the target @a path is never
* honored, even if @a honor_depth_exclude is TRUE, because we need to
* be able to explicitly pull in a target. For example, if this is
* the working copy...
*
* svn co greek_tree_repos wc_dir
* svn up --set-depth exclude wc_dir/A/B/E # now A/B/E is excluded
*
* ...then 'svn up wc_dir/A/B' would report E as excluded (assuming
* @a honor_depth_exclude is TRUE), but 'svn up wc_dir/A/B/E' would
* not, because the latter is trying to explicitly pull in E. In
* general, we never report the update target as excluded.
*
* Iff @a depth_compatibility_trick is TRUE, then set the @c start_empty
* flag on @a reporter->set_path() and @a reporter->link_path() calls
* as necessary to trick a pre-1.5 (i.e., depth-unaware) server into
* sending back all the items the client might need to upgrade a
* working copy from a shallower depth to a deeper one.
*
* If @a restore_files is TRUE, then unexpectedly missing working files
* will be restored from the administrative directory's cache. For each
* file restored, the @a notify_func function will be called with the
* @a notify_baton and the path of the restored file. @a notify_func may
* be @c NULL if this notification is not required. If @a
* use_commit_times is TRUE, then set restored files' timestamps to
* their last-commit-times.
*
* If @a traversal_info is non-NULL, then record pre-update traversal
* state in it. (Caller should obtain @a traversal_info from
* svn_wc_init_traversal_info().)
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_crawl_revisions4(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_ra_reporter3_t *reporter,
void *report_baton,
svn_boolean_t restore_files,
svn_depth_t depth,
svn_boolean_t honor_depth_exclude,
svn_boolean_t depth_compatibility_trick,
svn_boolean_t use_commit_times,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Similar to svn_wc_crawl_revisions4, but with @a honor_depth_exclude always
* set to false.
*
* @deprecated Provided for compatibility with the 1.5 API.
*/
svn_error_t *
svn_wc_crawl_revisions3(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_ra_reporter3_t *reporter,
void *report_baton,
svn_boolean_t restore_files,
svn_depth_t depth,
svn_boolean_t depth_compatibility_trick,
svn_boolean_t use_commit_times,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Similar to svn_wc_crawl_revisions3, but taking svn_ra_reporter2_t
* instead of svn_ra_reporter3_t, and therefore only able to report @c
* svn_depth_infinity for depths; and taking @a recurse instead of @a
* depth; and with @a depth_compatibility_trick always false.
*
* @deprecated Provided for compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_crawl_revisions2(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_ra_reporter2_t *reporter,
void *report_baton,
svn_boolean_t restore_files,
svn_boolean_t recurse,
svn_boolean_t use_commit_times,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/**
* Similar to svn_wc_crawl_revisions2(), but takes an svn_wc_notify_func_t
* and a @c svn_reporter_t instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_crawl_revisions(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_ra_reporter_t *reporter,
void *report_baton,
svn_boolean_t restore_files,
svn_boolean_t recurse,
svn_boolean_t use_commit_times,
svn_wc_notify_func_t notify_func,
void *notify_baton,
svn_wc_traversal_info_t *traversal_info,
apr_pool_t *pool);
/* Updates. */
/** Set @a *wc_root to @c TRUE if @a path represents a "working copy root",
* @c FALSE otherwise. Here, @a path is a "working copy root" if its parent
* directory is not a WC or if its parent directory's repository URL is not
* the parent of its own repository URL. Thus, a switched subtree is
* considered to be a working copy root. Also, a deleted tree-conflict
* victim is considered a "working copy root" because it has no URL.
*
* If @a path is not found, return the error @c SVN_ERR_ENTRY_NOT_FOUND.
*
* Use @a pool for any intermediate allocations.
*
* @note Due to the way in which "WC-root-ness" is calculated, passing
* a @a path of `.' to this function will always return @c TRUE.
*/
svn_error_t *
svn_wc_is_wc_root(svn_boolean_t *wc_root,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Conditionally split @a path into an @a anchor and @a target for the
* purpose of updating and committing.
*
* @a anchor is the directory at which the update or commit editor
* should be rooted.
*
* @a target is the actual subject (relative to the @a anchor) of the
* update/commit, or "" if the @a anchor itself is the subject.
*
* Allocate @a anchor and @a target in @a pool.
*/
svn_error_t *
svn_wc_get_actual_target(const char *path,
const char **anchor,
const char **target,
apr_pool_t *pool);
/* Update and update-like functionality. */
/**
* Set @a *editor and @a *edit_baton to an editor and baton for updating a
* working copy.
*
* If @a ti is non-NULL, record traversal info in @a ti, for use by
* post-traversal accessors such as svn_wc_edited_externals().
*
* @a anchor is an access baton, with a write lock, for the local path to the
* working copy which will be used as the root of our editor. Further
* locks will be acquired if the update creates new directories. All
* locks, both those in @a anchor and newly acquired ones, will be released
* when the editor driver calls @c close_edit.
*
* @a target is the entry in @a anchor that will actually be updated, or
* the empty string if all of @a anchor should be updated.
*
* The editor invokes @a notify_func with @a notify_baton as the update
* progresses, if @a notify_func is non-NULL.
*
* If @a cancel_func is non-NULL, the editor will invoke @a cancel_func with
* @a cancel_baton as the update progresses to see if it should continue.
*
* If @a conflict_func is non-NULL, then invoke it with @a
* conflict_baton whenever a conflict is encountered, giving the
* callback a chance to resolve the conflict before the editor takes
* more drastic measures (such as marking a file conflicted, or
* bailing out of the update).
*
* If @a fetch_func is non-NULL, then use it (with @a fetch_baton) as
* a fallback for retrieving repository files whenever 'copyfrom' args
* are sent into editor->add_file().
*
* If @a diff3_cmd is non-NULL, then use it as the diff3 command for
* any merging; otherwise, use the built-in merge code.
*
* @a preserved_exts is an array of filename patterns which, when
* matched against the extensions of versioned files, determine for
* which such files any related generated conflict files will preserve
* the original file's extension as their own. If a file's extension
* does not match any of the patterns in @a preserved_exts (which is
* certainly the case if @a preserved_exts is @c NULL or empty),
* generated conflict files will carry Subversion's custom extensions.
*
* @a target_revision is a pointer to a revision location which, after
* successful completion of the drive of this editor, will be
* populated with the revision to which the working copy was updated.
*
* If @a use_commit_times is TRUE, then all edited/added files will
* have their working timestamp set to the last-committed-time. If
* FALSE, the working files will be touched with the 'now' time.
*
* If @a allow_unver_obstructions is TRUE, then allow unversioned
* obstructions when adding a path.
*
* If @a depth is @c svn_depth_infinity, update fully recursively.
* Else if it is @c svn_depth_immediates, update the uppermost
* directory, its file entries, and the presence or absence of
* subdirectories (but do not descend into the subdirectories).
* Else if it is @c svn_depth_files, update the uppermost directory
* and its immediate file entries, but not subdirectories.
* Else if it is @c svn_depth_empty, update exactly the uppermost
* target, and don't touch its entries.
*
* If @a depth_is_sticky is set and @a depth is not @c
* svn_depth_unknown, then in addition to updating PATHS, also set
* their sticky ambient depth value to @a depth.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_get_update_editor3(svn_revnum_t *target_revision,
svn_wc_adm_access_t *anchor,
const char *target,
svn_boolean_t use_commit_times,
svn_depth_t depth,
svn_boolean_t depth_is_sticky,
svn_boolean_t allow_unver_obstructions,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
svn_wc_get_file_t fetch_func,
void *fetch_baton,
const char *diff3_cmd,
apr_array_header_t *preserved_exts,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_update_editor3() but with the @a
* allow_unver_obstructions parameter always set to FALSE, @a
* conflict_func and baton set to NULL, @a fetch_func and baton set to
* NULL, @a preserved_exts set to NULL, @a depth_is_sticky set to
* FALSE, and @a depth set according to @a recurse: if @a recurse is
* TRUE, pass @c svn_depth_infinity, if FALSE, pass @c
* svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_update_editor2(svn_revnum_t *target_revision,
svn_wc_adm_access_t *anchor,
const char *target,
svn_boolean_t use_commit_times,
svn_boolean_t recurse,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const char *diff3_cmd,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_update_editor2(), but takes an svn_wc_notify_func_t
* instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_update_editor(svn_revnum_t *target_revision,
svn_wc_adm_access_t *anchor,
const char *target,
svn_boolean_t use_commit_times,
svn_boolean_t recurse,
svn_wc_notify_func_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const char *diff3_cmd,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
/**
* A variant of svn_wc_get_update_editor().
*
* Set @a *editor and @a *edit_baton to an editor and baton for "switching"
* a working copy to a new @a switch_url. (Right now, this URL must be
* within the same repository that the working copy already comes
* from.) @a switch_url must not be @c NULL.
*
* If @a ti is non-NULL, record traversal info in @a ti, for use by
* post-traversal accessors such as svn_wc_edited_externals().
*
* @a anchor is an access baton, with a write lock, for the local path to the
* working copy which will be used as the root of our editor. Further
* locks will be acquired if the switch creates new directories. All
* locks, both those in @a anchor and newly acquired ones, will be released
* when the editor driver calls @c close_edit.
*
* @a target is the entry in @a anchor that will actually be updated, or
* empty if all of @a anchor should be updated.
*
* The editor invokes @a notify_func with @a notify_baton as the switch
* progresses, if @a notify_func is non-NULL.
*
* If @a cancel_func is non-NULL, it will be called with @a cancel_baton as
* the switch progresses to determine if it should continue.
*
* If @a conflict_func is non-NULL, then invoke it with @a
* conflict_baton whenever a conflict is encountered, giving the
* callback a chance to resolve the conflict before the editor takes
* more drastic measures (such as marking a file conflicted, or
* bailing out of the switch).
*
* If @a diff3_cmd is non-NULL, then use it as the diff3 command for
* any merging; otherwise, use the built-in merge code.
*
* @a preserved_exts is an array of filename patterns which, when
* matched against the extensions of versioned files, determine for
* which such files any related generated conflict files will preserve
* the original file's extension as their own. If a file's extension
* does not match any of the patterns in @a preserved_exts (which is
* certainly the case if @a preserved_exts is @c NULL or empty),
* generated conflict files will carry Subversion's custom extensions.
*
* @a target_revision is a pointer to a revision location which, after
* successful completion of the drive of this editor, will be
* populated with the revision to which the working copy was updated.
*
* If @a use_commit_times is TRUE, then all edited/added files will
* have their working timestamp set to the last-committed-time. If
* FALSE, the working files will be touched with the 'now' time.
*
* @a depth and @a depth_is_sticky behave as for svn_wc_get_update_editor3().
*
* If @a allow_unver_obstructions is TRUE, then allow unversioned
* obstructions when adding a path.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_get_switch_editor3(svn_revnum_t *target_revision,
svn_wc_adm_access_t *anchor,
const char *target,
const char *switch_url,
svn_boolean_t use_commit_times,
svn_depth_t depth,
svn_boolean_t depth_is_sticky,
svn_boolean_t allow_unver_obstructions,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
const char *diff3_cmd,
apr_array_header_t *preserved_exts,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_switch_editor3() but with the
* @a allow_unver_obstructions parameter always set to FALSE,
* @a preserved_exts set to NULL, @a conflict_func and baton set to NULL,
* @a depth_is_sticky set to FALSE, and @a depth set according to @a
* recurse: if @a recurse is TRUE, pass @c svn_depth_infinity, if
* FALSE, pass @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_switch_editor2(svn_revnum_t *target_revision,
svn_wc_adm_access_t *anchor,
const char *target,
const char *switch_url,
svn_boolean_t use_commit_times,
svn_boolean_t recurse,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const char *diff3_cmd,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_switch_editor2(), but takes an
* @c svn_wc_notify_func_t instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_switch_editor(svn_revnum_t *target_revision,
svn_wc_adm_access_t *anchor,
const char *target,
const char *switch_url,
svn_boolean_t use_commit_times,
svn_boolean_t recurse,
svn_wc_notify_func_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const char *diff3_cmd,
const svn_delta_editor_t **editor,
void **edit_baton,
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
/* A word about the implementation of working copy property storage:
*
* Since properties are key/val pairs, you'd think we store them in
* some sort of Berkeley DB-ish format, and even store pending changes
* to them that way too.
*
* However, we already have libsvn_subr/hashdump.c working, and it
* uses a human-readable format. That will be very handy when we're
* debugging, and presumably we will not be dealing with any huge
* properties or property lists initially. Therefore, we will
* continue to use hashdump as the internal mechanism for storing and
* reading from property lists, but note that the interface here is
* _not_ dependent on that. We can swap in a DB-based implementation
* at any time and users of this library will never know the
* difference.
*/
/** Set @a *props to a hash table mapping <tt>char *</tt> names onto
* <tt>svn_string_t *</tt> values for all the regular properties of
* @a path. Allocate the table, names, and values in @a pool. If
* the node has no properties, or does not exist in the working copy,
* then an empty hash is returned. @a adm_access is an access baton
* set that contains @a path.
*/
svn_error_t *
svn_wc_prop_list(apr_hash_t **props,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Set @a *value to the value of property @a name for @a path, allocating
* @a *value in @a pool. If no such prop, set @a *value to @c NULL.
* @a name may be a regular or wc property; if it is an entry property,
* return the error @c SVN_ERR_BAD_PROP_KIND. @a adm_access is an access
* baton set that contains @a path.
*/
svn_error_t *
svn_wc_prop_get(const svn_string_t **value,
const char *name,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/**
* Set property @a name to @a value for @a path, or if @a value is
* NULL, remove property @a name from @a path. @a adm_access is an
* access baton with a write lock for @a path.
*
* If @a skip_checks is TRUE, do no validity checking. But if @a
* skip_checks is FALSE, and @a name is not a valid property for @a
* path, return an error, either @c SVN_ERR_ILLEGAL_TARGET (if the
* property is not appropriate for @a path), or @c
* SVN_ERR_BAD_MIME_TYPE (if @a name is "svn:mime-type", but @a value
* is not a valid mime-type).
*
* @a name may be a wc property or a regular property; but if it is an
* entry property, return the error @c SVN_ERR_BAD_PROP_KIND, even if
* @a skip_checks is TRUE.
*
* For each file or directory operated on, @a notify_func will be called
* with its path and the @a notify_baton. @a notify_func may be @c NULL
* if you are not interested in this information.
*
* Use @a pool for temporary allocation.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_prop_set3(const char *name,
const svn_string_t *value,
const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t skip_checks,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Like svn_wc_prop_set3(), but without the notification callbacks.
*
* @since New in 1.2.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_prop_set2(const char *name,
const svn_string_t *value,
const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t skip_checks,
apr_pool_t *pool);
/**
* Like svn_wc_prop_set2(), but with @a skip_checks always FALSE.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_prop_set(const char *name,
const svn_string_t *value,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Return TRUE iff @a name is a 'normal' property name. 'Normal' is
* defined as a user-visible and user-tweakable property that shows up
* when you fetch a proplist.
*
* The function currently parses the namespace like so:
*
* - 'svn:wc:' ==> a wcprop, stored/accessed separately via different API.
*
* - 'svn:entry:' ==> an "entry" prop, shunted into the 'entries' file.
*
* If these patterns aren't found, then the property is assumed to be
* Normal.
*/
svn_boolean_t
svn_wc_is_normal_prop(const char *name);
/** Return TRUE iff @a name is a 'wc' property name. */
svn_boolean_t
svn_wc_is_wc_prop(const char *name);
/** Return TRUE iff @a name is a 'entry' property name. */
svn_boolean_t
svn_wc_is_entry_prop(const char *name);
/** Callback type used by @c svn_wc_canonicalize_svn_prop.
*
* If @a mime_type is non-null, it sets @a *mime_type to the value of
* @c SVN_PROP_MIME_TYPE for the path passed to @c
* svn_wc_canonicalize_svn_prop (allocated from @a pool). If @a
* stream is non-null, it writes the contents of the file to @a
* stream.
*
* (Currently, this is used if you are attempting to set the @c
* SVN_PROP_EOL_STYLE property, to make sure that the value matches
* the mime type and contents.)
*/
typedef svn_error_t *(*svn_wc_canonicalize_svn_prop_get_file_t)
(const svn_string_t **mime_type,
svn_stream_t *stream,
void *baton,
apr_pool_t *pool);
/** Canonicalize the value of an svn:* property @a propname with
* value @a propval.
*
* If the property is not appropriate for a node of kind @a kind, or
* is otherwise invalid, throw an error. Otherwise, set @a *propval_p
* to a canonicalized version of the property value. If @a
* skip_some_checks is TRUE, only some validity checks are taken.
*
* Some validity checks require access to the contents and MIME type
* of the target if it is a file; they will call @a prop_getter with @a
* getter_baton, which then needs to set the MIME type and print the
* contents of the file to the given stream.
*
* @a path should be the path of the file in question; it is only used
* for error messages.
*
* ### This is not actually related to the WC, but it does need to call
* ### svn_wc_parse_externals_description2.
*/
svn_error_t *
svn_wc_canonicalize_svn_prop(const svn_string_t **propval_p,
const char *propname,
const svn_string_t *propval,
const char *path,
svn_node_kind_t kind,
svn_boolean_t skip_some_checks,
svn_wc_canonicalize_svn_prop_get_file_t prop_getter,
void *getter_baton,
apr_pool_t *pool);
/* Diffs */
/**
* Return an @a editor/@a edit_baton for diffing a working copy against the
* repository.
*
* @a anchor/@a target represent the base of the hierarchy to be compared.
*
* @a callbacks/@a callback_baton is the callback table to use when two
* files are to be compared.
*
* If @a depth is @c svn_depth_empty, just diff exactly @a target or
* @a anchor if @a target is empty. If @c svn_depth_files then do the same
* and for top-level file entries as well (if any). If
* @c svn_depth_immediates, do the same as @c svn_depth_files but also diff
* top-level subdirectories at @c svn_depth_empty. If @c svn_depth_infinity,
* then diff fully recursively. In the latter case, @a anchor should be part
* of an access baton set for the @a target hierarchy.
*
* @a ignore_ancestry determines whether paths that have discontinuous node
* ancestry are treated as delete/add or as simple modifications. If
* @a ignore_ancestry is @c FALSE, then any discontinuous node ancestry will
* result in the diff given as a full delete followed by an add.
*
* If @a use_text_base is TRUE, then compare the repository against
* the working copy's text-base files, rather than the working files.
*
* Normally, the difference from repository->working_copy is shown.
* If @a reverse_order is TRUE, then show working_copy->repository diffs.
*
* If @a cancel_func is non-NULL, it will be used along with @a cancel_baton
* to periodically check if the client has canceled the operation.
*
* @a changelists is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose differences are
* reported; that is, don't generate diffs about any item unless
* it's a member of one of those changelists. If @a changelists is
* empty (or altogether @c NULL), no changelist filtering occurs.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_get_diff_editor5(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks3_t *callbacks,
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const apr_array_header_t *changelists,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_diff_editor5(), but with an
* @c svn_wc_diff_callbacks2_t instead of @c svn_wc_diff_callbacks3_t.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_diff_editor4(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks2_t *callbacks,
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const apr_array_header_t *changelists,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_diff_editor4(), but with @a changelists
* passed as @c NULL, and @a depth set to @c svn_depth_infinity if @a
* recurse is TRUE, or @c svn_depth_files if @a recurse is FALSE.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
* @since New in 1.2.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_diff_editor3(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks2_t *callbacks,
void *callback_baton,
svn_boolean_t recurse,
svn_boolean_t ignore_ancestry,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_diff_editor3(), but with an
* @c svn_wc_diff_callbacks_t instead of @c svn_wc_diff_callbacks2_t.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_diff_editor2(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks_t *callbacks,
void *callback_baton,
svn_boolean_t recurse,
svn_boolean_t ignore_ancestry,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_get_diff_editor2(), but with @a ignore_ancestry
* always set to @c FALSE.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_diff_editor(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks_t *callbacks,
void *callback_baton,
svn_boolean_t recurse,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
svn_cancel_func_t cancel_func,
void *cancel_baton,
const svn_delta_editor_t **editor,
void **edit_baton,
apr_pool_t *pool);
/**
* Compare working copy against the text-base.
*
* @a anchor/@a target represent the base of the hierarchy to be compared.
*
* @a callbacks/@a callback_baton is the callback table to use when two
* files are to be compared.
*
* If @a depth is @c svn_depth_empty, just diff exactly @a target or
* @a anchor if @a target is empty. If @c svn_depth_files then do the same
* and for top-level file entries as well (if any). If
* @c svn_depth_immediates, do the same as @c svn_depth_files but also diff
* top-level subdirectories at @c svn_depth_empty. If @c svn_depth_infinity,
* then diff fully recursively. In the latter case, @a anchor should be part
* of an access baton set for the @a target hierarchy.
*
* @a ignore_ancestry determines whether paths that have discontinuous node
* ancestry are treated as delete/add or as simple modifications. If
* @a ignore_ancestry is @c FALSE, then any discontinuous node ancestry will
* result in the diff given as a full delete followed by an add.
*
* @a changelists is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items whose differences are
* reported; that is, don't generate diffs about any item unless
* it's a member of one of those changelists. If @a changelists is
* empty (or altogether @c NULL), no changelist filtering occurs.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_diff5(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks3_t *callbacks,
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
const apr_array_header_t *changelists,
apr_pool_t *pool);
/**
* Similar to svn_wc_diff5(), but with a @c svn_wc_diff_callbacks2_t argument
* instead of @c svn_wc_diff_callbacks3_t.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_diff4(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks2_t *callbacks,
void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
const apr_array_header_t *changelists,
apr_pool_t *pool);
/**
* Similar to svn_wc_diff4(), but with @a changelists passed @c NULL,
* and @a depth set to @c svn_depth_infinity if @a recurse is TRUE, or
* @c svn_depth_files if @a recurse is FALSE.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_diff3(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks2_t *callbacks,
void *callback_baton,
svn_boolean_t recurse,
svn_boolean_t ignore_ancestry,
apr_pool_t *pool);
/**
* Similar to svn_wc_diff3(), but with a @c svn_wc_diff_callbacks_t argument
* instead of @c svn_wc_diff_callbacks2_t.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_diff2(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks_t *callbacks,
void *callback_baton,
svn_boolean_t recurse,
svn_boolean_t ignore_ancestry,
apr_pool_t *pool);
/**
* Similar to svn_wc_diff2(), but with @a ignore_ancestry always set
* to @c FALSE.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_diff(svn_wc_adm_access_t *anchor,
const char *target,
const svn_wc_diff_callbacks_t *callbacks,
void *callback_baton,
svn_boolean_t recurse,
apr_pool_t *pool);
/** Given a @a path to a file or directory under version control, discover
* any local changes made to properties and/or the set of 'pristine'
* properties. @a adm_access is an access baton set for @a path.
*
* If @a propchanges is non-@c NULL, return these changes as an array of
* @c svn_prop_t structures stored in @a *propchanges. The structures and
* array will be allocated in @a pool. If there are no local property
* modifications on @a path, then set @a *propchanges to @c NULL.
*
* If @a original_props is non-@c NULL, then set @a *original_props to
* hashtable (<tt>const char *name</tt> -> <tt>const svn_string_t *value</tt>)
* that represents the 'pristine' property list of @a path. This hashtable is
* allocated in @a pool, and can be used to compare old and new values of
* properties.
*/
svn_error_t *
svn_wc_get_prop_diffs(apr_array_header_t **propchanges,
apr_hash_t **original_props,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** The outcome of a merge carried out (or tried as a dry-run) by
* svn_wc_merge()
*/
typedef enum svn_wc_merge_outcome_t
{
/** The working copy is (or would be) unchanged. The changes to be
* merged were already present in the working copy
*/
svn_wc_merge_unchanged,
/** The working copy has been (or would be) changed. */
svn_wc_merge_merged,
/** The working copy has been (or would be) changed, but there was (or
* would be) a conflict
*/
svn_wc_merge_conflict,
/** No merge was performed, probably because the target file was
* either absent or not under version control.
*/
svn_wc_merge_no_merge
} svn_wc_merge_outcome_t;
/** Given paths to three fulltexts, merge the differences between @a left
* and @a right into @a merge_target. (It may help to know that @a left,
* @a right, and @a merge_target correspond to "OLDER", "YOURS", and "MINE",
* respectively, in the diff3 documentation.) Use @a pool for any
* temporary allocation.
*
* @a adm_access is an access baton with a write lock for the directory
* containing @a merge_target.
*
* This function assumes that @a left and @a right are in repository-normal
* form (linefeeds, with keywords contracted); if necessary,
* @a merge_target is temporarily converted to this form to receive the
* changes, then translated back again.
*
* If @a merge_target is absent, or present but not under version
* control, then set @a *merge_outcome to @c svn_wc_merge_no_merge and
* return success without merging anything. (The reasoning is that if
* the file is not versioned, then it is probably unrelated to the
* changes being considered, so they should not be merged into it.)
*
* @a dry_run determines whether the working copy is modified. When it
* is @c FALSE the merge will cause @a merge_target to be modified, when it
* is @c TRUE the merge will be carried out to determine the result but
* @a merge_target will not be modified.
*
* If @a diff3_cmd is non-NULL, then use it as the diff3 command for
* any merging; otherwise, use the built-in merge code. If @a
* merge_options is non-NULL, either pass its elements to @a diff3_cmd or
* parse it and use as options to the internal merge code (see
* svn_diff_file_options_parse()). @a merge_options must contain
* <tt>const char *</tt> elements.
*
* The outcome of the merge is returned in @a *merge_outcome. If there
* is a conflict and @a dry_run is @c FALSE, then attempt to call @a
* conflict_func with @a conflict_baton (if non-NULL). If the
* conflict callback cannot resolve the conflict, then:
*
* * Put conflict markers around the conflicting regions in
* @a merge_target, labeled with @a left_label, @a right_label, and
* @a target_label. (If any of these labels are @c NULL, default
* values will be used.)
*
* * Copy @a left, @a right, and the original @a merge_target to unique
* names in the same directory as @a merge_target, ending with the
* suffixes ".LEFT_LABEL", ".RIGHT_LABEL", and ".TARGET_LABEL"
* respectively.
*
* * Mark the entry for @a merge_target as "conflicted", and track the
* above mentioned backup files in the entry as well.
*
* Binary case:
*
* If @a merge_target is a binary file, then no merging is attempted,
* the merge is deemed to be a conflict. If @a dry_run is @c FALSE the
* working @a merge_target is untouched, and copies of @a left and
* @a right are created next to it using @a left_label and @a right_label.
* @a merge_target's entry is marked as "conflicted", and begins
* tracking the two backup files. If @a dry_run is @c TRUE no files are
* changed. The outcome of the merge is returned in @a *merge_outcome.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome,
const char *left,
const char *right,
const char *merge_target,
svn_wc_adm_access_t *adm_access,
const char *left_label,
const char *right_label,
const char *target_label,
svn_boolean_t dry_run,
const char *diff3_cmd,
const apr_array_header_t *merge_options,
const apr_array_header_t *prop_diff,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
apr_pool_t *pool);
/** Similar to svn_wc_merge3(), but with @a prop_diff, @a
* conflict_func, @a conflict_baton set to NULL.
*
* @deprecated Provided for backwards compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome,
const char *left,
const char *right,
const char *merge_target,
svn_wc_adm_access_t *adm_access,
const char *left_label,
const char *right_label,
const char *target_label,
svn_boolean_t dry_run,
const char *diff3_cmd,
const apr_array_header_t *merge_options,
apr_pool_t *pool);
/** Similar to svn_wc_merge2(), but with @a merge_options set to NULL.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_merge(const char *left,
const char *right,
const char *merge_target,
svn_wc_adm_access_t *adm_access,
const char *left_label,
const char *right_label,
const char *target_label,
svn_boolean_t dry_run,
enum svn_wc_merge_outcome_t *merge_outcome,
const char *diff3_cmd,
apr_pool_t *pool);
/** Given a @a path under version control, merge an array of @a
* propchanges into the path's existing properties. @a propchanges is
* an array of @c svn_prop_t objects, and @a baseprops is a hash
* representing the original set of properties that @a propchanges is
* working against. @a adm_access is an access baton for the directory
* containing @a path.
*
* If @a base_merge is @c FALSE only the working properties will be changed,
* if it is @c TRUE both the base and working properties will be changed.
*
* If @a state is non-NULL, set @a *state to the state of the properties
* after the merge.
*
* If conflicts are found when merging working properties, they are
* described in a temporary .prej file (or appended to an already-existing
* .prej file), and the entry is marked "conflicted". Base properties
* are changed unconditionally, if @a base_merge is @c TRUE, they never result
* in a conflict.
*
* If @a path is not under version control, return the error
* SVN_ERR_UNVERSIONED_RESOURCE and don't touch anyone's properties.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_merge_props2(svn_wc_notify_state_t *state,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_hash_t *baseprops,
const apr_array_header_t *propchanges,
svn_boolean_t base_merge,
svn_boolean_t dry_run,
svn_wc_conflict_resolver_func_t conflict_func,
void *conflict_baton,
apr_pool_t *pool);
/**
* Same as svn_wc_merge_props2(), but with a @a conflict_func (and
* baton) of NULL.
*
* @deprecated Provided for backward compatibility with the 1.3 API.
*
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_merge_props(svn_wc_notify_state_t *state,
const char *path,
svn_wc_adm_access_t *adm_access,
apr_hash_t *baseprops,
const apr_array_header_t *propchanges,
svn_boolean_t base_merge,
svn_boolean_t dry_run,
apr_pool_t *pool);
/**
* Similar to svn_wc_merge_props(), but no baseprops are given.
* Instead, it's assumed that the incoming propchanges are based
* against the working copy's own baseprops. While this assumption is
* correct for 'svn update', it's incorrect for 'svn merge', and can
* cause flawed behavior. (See issue #2035.)
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_merge_prop_diffs(svn_wc_notify_state_t *state,
const char *path,
svn_wc_adm_access_t *adm_access,
const apr_array_header_t *propchanges,
svn_boolean_t base_merge,
svn_boolean_t dry_run,
apr_pool_t *pool);
/** Given a @a path to a wc file, return a stream to the @a contents of
* the pristine copy of the file. This is needed so clients can do
* diffs. If the WC has no text-base, return a @c NULL instead of a
* stream.
*
* @since New in 1.6.
*/
svn_error_t *
svn_wc_get_pristine_contents(svn_stream_t **contents,
const char *path,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/** Returns a path to the pristine copy of @a path. Should use
* svn_wc_get_pristine_contents() instead.
*
* @deprecated Provided for backwards compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_get_pristine_copy_path(const char *path,
const char **pristine_path,
apr_pool_t *pool);
/**
* Recurse from @a path, cleaning up unfinished log business. Perform
* necessary allocations in @a pool. Any working copy locks under @a path
* will be taken over and then cleared by this function. If @a diff3_cmd
* is non-NULL, then use it as the diff3 command for any merging; otherwise,
* use the built-in merge code.
*
* WARNING: there is no mechanism that will protect locks that are still
* being used.
*
* If @a cancel_func is non-NULL, invoke it with @a cancel_baton at
* various points during the operation. If it returns an error
* (typically @c SVN_ERR_CANCELLED), return that error immediately.
*
* @since New in 1.2.
*/
svn_error_t *
svn_wc_cleanup2(const char *path,
const char *diff3_cmd,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_cleanup2(). @a optional_adm_access is an historic
* relic and not used, it may be NULL.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_cleanup(const char *path,
svn_wc_adm_access_t *optional_adm_access,
const char *diff3_cmd,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/** Relocation validation callback typedef.
*
* Called for each relocated file/directory. @a uuid, if non-NULL, contains
* the expected repository UUID, @a url contains the tentative URL.
*
* @a baton is a closure object; it should be provided by the
* implementation, and passed by the caller.
*
* If @a root is TRUE, then the implementation should make sure that @a url
* is the repository root. Else, it can be an URL inside the repository.
* @a pool may be used for temporary allocations.
*
* @since New in 1.5.
*/
typedef svn_error_t *(*svn_wc_relocation_validator3_t)(void *baton,
const char *uuid,
const char *url,
const char *root_url,
apr_pool_t *pool);
/** Similar to @c svn_wc_relocation_validator3_t, but without
* the @a root_url arguments.
*
* @deprecated Provided for backwards compatibility with the 1.4 API.
*/
typedef svn_error_t *(*svn_wc_relocation_validator2_t)(void *baton,
const char *uuid,
const char *url,
svn_boolean_t root,
apr_pool_t *pool);
/** Similar to @c svn_wc_relocation_validator2_t, but without
* the @a root and @a pool arguments. @a uuid will not be NULL in this version
* of the function.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
*/
typedef svn_error_t *(*svn_wc_relocation_validator_t)(void *baton,
const char *uuid,
const char *url);
/** Change repository references at @a path that begin with @a from
* to begin with @a to instead. Perform necessary allocations in @a pool.
* If @a recurse is TRUE, do so. @a validator (and its baton,
* @a validator_baton), will be called for each newly generated URL.
*
* @a adm_access is an access baton for the directory containing
* @a path.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_relocate3(const char *path,
svn_wc_adm_access_t *adm_access,
const char *from,
const char *to,
svn_boolean_t recurse,
svn_wc_relocation_validator3_t validator,
void *validator_baton,
apr_pool_t *pool);
/** Similar to svn_wc_relocate3(), but uses @c svn_wc_relocation_validator2_t.
*
* @deprecated Provided for backwards compatibility with the 1.4 API. */
SVN_DEPRECATED
svn_error_t *
svn_wc_relocate2(const char *path,
svn_wc_adm_access_t *adm_access,
const char *from,
const char *to,
svn_boolean_t recurse,
svn_wc_relocation_validator2_t validator,
void *validator_baton,
apr_pool_t *pool);
/** Similar to svn_wc_relocate2(), but uses @c svn_wc_relocation_validator_t.
*
* @deprecated Provided for backwards compatibility with the 1.3 API. */
SVN_DEPRECATED
svn_error_t *
svn_wc_relocate(const char *path,
svn_wc_adm_access_t *adm_access,
const char *from,
const char *to,
svn_boolean_t recurse,
svn_wc_relocation_validator_t validator,
void *validator_baton,
apr_pool_t *pool);
/**
* Revert changes to @a path. Perform necessary allocations in @a pool.
*
* @a parent_access is an access baton for the directory containing @a
* path, unless @a path is a working copy root (as determined by @c
* svn_wc_is_wc_root), in which case @a parent_access refers to @a
* path itself.
*
* If @a depth is @c svn_depth_empty, revert just @a path (if a
* directory, then revert just the properties on that directory).
* Else if @c svn_depth_files, revert @a path and any files
* directly under @a path if it is directory. Else if
* @c svn_depth_immediates, revert all of the preceding plus
* properties on immediate subdirectories; else if @c svn_depth_infinity,
* revert path and everything under it fully recursively.
*
* @a changelists is an array of <tt>const char *</tt> changelist
* names, used as a restrictive filter on items reverted; that is,
* don't revert any item unless it's a member of one of those
* changelists. If @a changelists is empty (or altogether @c NULL),
* no changelist filtering occurs.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton at
* various points during the reversion process. If it returns an
* error (typically @c SVN_ERR_CANCELLED), return that error
* immediately.
*
* If @a use_commit_times is TRUE, then all reverted working-files
* will have their timestamp set to the last-committed-time. If
* FALSE, the reverted working-files will be touched with the 'now' time.
*
* For each item reverted, @a notify_func will be called with @a notify_baton
* and the path of the reverted item. @a notify_func may be @c NULL if this
* notification is not needed.
*
* If @a path is not under version control, return the error
* SVN_ERR_UNVERSIONED_RESOURCE.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_revert3(const char *path,
svn_wc_adm_access_t *parent_access,
svn_depth_t depth,
svn_boolean_t use_commit_times,
const apr_array_header_t *changelists,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_revert3(), but with @a changelists passed as @c
* NULL, and @a depth set according to @a recursive: if @a recursive
* is TRUE, @a depth is @c svn_depth_infinity; if FALSE, @a depth is
* @c svn_depth_empty.
*
* @note Most APIs map @a recurse==FALSE to @a depth==svn_depth_files;
* revert is deliberately different.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_revert2(const char *path,
svn_wc_adm_access_t *parent_access,
svn_boolean_t recursive,
svn_boolean_t use_commit_times,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/**
* Similar to svn_wc_revert2(), but takes an @c svn_wc_notify_func_t instead.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_revert(const char *path,
svn_wc_adm_access_t *parent_access,
svn_boolean_t recursive,
svn_boolean_t use_commit_times,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/* Tmp files */
/** Create a unique temporary file in administrative tmp/ area of
* directory @a path. Return a handle in @a *fp and the path
* in @a *new_name. Either @a fp or @a new_name can be NULL.
*
* The flags will be <tt>APR_WRITE | APR_CREATE | APR_EXCL</tt> and
* optionally @c APR_DELONCLOSE (if the @a delete_when argument is
* set to @c svn_io_file_del_on_close).
*
* This means that as soon as @a fp is closed, the tmp file will vanish.
*
* @since New in 1.4
*/
svn_error_t *
svn_wc_create_tmp_file2(apr_file_t **fp,
const char **new_name,
const char *path,
svn_io_file_del_t delete_when,
apr_pool_t *pool);
/** Same as svn_wc_create_tmp_file2(), but with @a new_name set to @c NULL,
* and without the ability to delete the file on pool cleanup.
*
* @deprecated For compatibility with 1.3 API
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_create_tmp_file(apr_file_t **fp,
const char *path,
svn_boolean_t delete_on_close,
apr_pool_t *pool);
/* EOL conversion and keyword expansion. */
/** Set @a xlated_path to a translated copy of @a src
* or to @a src itself if no translation is necessary.
* That is, if @a versioned_file's properties indicate newline conversion or
* keyword expansion, point @a *xlated_path to a copy of @a src
* whose newlines and keywords are converted using the translation
* as requested by @a flags.
*
* When translating to the normal form, inconsistent eol styles will be
* repaired when appropriate for the given setting. When translating
* from normal form, no EOL repair is performed (consistency is assumed).
* This behaviour can be overridden by specifying
* @c SVN_WC_TRANSLATE_FORCE_EOL_REPAIR.
*
* The caller can explicitly request a new file to be returned by setting the
* @c SVN_WC_TRANSLATE_FORCE_COPY flag in @a flags.
*
* This function is generally used to get a file that can be compared
* meaningfully against @a versioned_file's text base, if
* @c SVN_WC_TRANSLATE_TO_NF is specified, against @a versioned_file itself
* if @c SVN_WC_TRANSLATE_FROM_NF is specified.
*
* Output files are created in the temp file area belonging to
* @a versioned_file. By default they will be deleted at pool cleanup.
*
* If @c SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP is specified, the default
* pool cleanup handler to remove @a *xlated_path is not registered.
*
* If an error is returned, the effect on @a *xlated_path is undefined.
*
* @since New in 1.4
*/
svn_error_t *
svn_wc_translated_file2(const char **xlated_path,
const char *src,
const char *versioned_file,
svn_wc_adm_access_t *adm_access,
apr_uint32_t flags,
apr_pool_t *pool);
/** Same as svn_wc_translated_file2, but will never clean up
* temporary files.
*
* @deprecated Provided for compatibility with the 1.3 API
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_translated_file(const char **xlated_p,
const char *vfile,
svn_wc_adm_access_t *adm_access,
svn_boolean_t force_repair,
apr_pool_t *pool);
/** Returns a @a stream allocated in @a pool with access to the given
* @a path taking the file properties from @a versioned_file using
* @a adm_access.
*
* When translation from normal form is requested
* (@c SVN_WC_TRANSLATE_FROM_NF is specified in @a flags), @a path
* is used as target path and stream read operations are not supported.
* Conversely, if translation to normal form is requested
* (@c SVN_WC_TRANSLATE_TO_NF is specified in @a flags), @a path is
* used as source path and stream write operations are not supported.
*
* The @a flags are the same constants as those used for
* svn_wc_translated_file().
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_translated_stream(svn_stream_t **stream,
const char *path,
const char *versioned_file,
svn_wc_adm_access_t *adm_access,
apr_uint32_t flags,
apr_pool_t *pool);
/* Text/Prop Deltas Using an Editor */
/** Send the local modifications for versioned file @a path (with
* matching @a file_baton) through @a editor, then close @a file_baton
* afterwards. Use @a pool for any temporary allocation and
* @a adm_access as an access baton for @a path.
*
* This process creates a copy of @a path with keywords and eol
* untranslated. If @a tempfile is non-NULL, set @a *tempfile to the
* path to this copy. Do not clean up the copy; caller can do that.
* If @a digest is non-NULL, put the MD5 checksum of the
* temporary file into @a digest, which must point to @c APR_MD5_DIGESTSIZE
* bytes of storage. (The purpose of handing back the tmp copy is that
* it is usually about to become the new text base anyway, but the
* installation of the new text base is outside the scope of this
* function.)
*
* If @a fulltext, send the untranslated copy of @a path through @a editor
* as full-text; else send it as svndiff against the current text base.
*
* If sending a diff, and the recorded checksum for @a path's text-base
* does not match the current actual checksum, then remove the tmp
* copy (and set @a *tempfile to NULL if appropriate), and return the
* error @c SVN_ERR_WC_CORRUPT_TEXT_BASE.
*
* @note This is intended for use with both infix and postfix
* text-delta styled editor drivers.
*
* @since New in 1.4.
*/
svn_error_t *
svn_wc_transmit_text_deltas2(const char **tempfile,
unsigned char digest[],
const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t fulltext,
const svn_delta_editor_t *editor,
void *file_baton,
apr_pool_t *pool);
/** Similar to svn_wc_transmit_text_deltas2(), but with @a digest set to NULL.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_transmit_text_deltas(const char *path,
svn_wc_adm_access_t *adm_access,
svn_boolean_t fulltext,
const svn_delta_editor_t *editor,
void *file_baton,
const char **tempfile,
apr_pool_t *pool);
/** Given a @a path with its accompanying @a entry, transmit all local
* property modifications using the appropriate @a editor method (in
* conjunction with @a baton). @a adm_access is an access baton set
* that contains @a path. Use @a pool for all allocations.
*
* If a temporary file remains after this function is finished, the
* path to that file is returned in @a *tempfile (so the caller can
* clean this up if it wishes to do so).
*
* @note Starting version 1.5, no tempfile will ever be returned
* anymore. If @a *tempfile is passed, its value is set to @c NULL.
*/
svn_error_t *
svn_wc_transmit_prop_deltas(const char *path,
svn_wc_adm_access_t *adm_access,
const svn_wc_entry_t *entry,
const svn_delta_editor_t *editor,
void *baton,
const char **tempfile,
apr_pool_t *pool);
/** Get the run-time configured list of ignore patterns from the
* @c svn_config_t's in the @a config hash, and store them in @a *patterns.
* Allocate @a *patterns and its contents in @a pool.
*/
svn_error_t *
svn_wc_get_default_ignores(apr_array_header_t **patterns,
apr_hash_t *config,
apr_pool_t *pool);
/** Get the list of ignore patterns from the @c svn_config_t's in the
* @a config hash and the local ignore patterns from the directory
* in @a adm_access, and store them in @a *patterns.
* Allocate @a *patterns and its contents in @a pool.
*
* @since New in 1.3.
*/
svn_error_t *
svn_wc_get_ignores(apr_array_header_t **patterns,
apr_hash_t *config,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Return TRUE iff @a str matches any of the elements of @a list, a
* list of zero or more ignore patterns.
*
* @since New in 1.5.
*/
svn_boolean_t
svn_wc_match_ignore_list(const char *str,
apr_array_header_t *list,
apr_pool_t *pool);
/** Add @a lock to the working copy for @a path. @a adm_access must contain
* a write lock for @a path. If @a path is read-only, due to locking
* properties, make it writable. Perform temporary allocations in @a
* pool. */
svn_error_t *
svn_wc_add_lock(const char *path,
const svn_lock_t *lock,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** Remove any lock from @a path. @a adm_access must contain a
* write-lock for @a path. If @a path has a lock and the locking
* so specifies, make the file read-only. Don't return an error if @a
* path didn't have a lock. Perform temporary allocations in @a pool. */
svn_error_t *
svn_wc_remove_lock(const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
/** A structure to report a summary of a working copy, including the
* mix of revisions found within it, whether any parts are switched or
* locally modified, and whether it is a sparse checkout.
*
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type.
*
* @since New in 1.4
*/
typedef struct svn_wc_revision_status_t
{
svn_revnum_t min_rev; /**< Lowest revision found */
svn_revnum_t max_rev; /**< Highest revision found */
svn_boolean_t switched; /**< Is anything switched? */
svn_boolean_t modified; /**< Is anything modified? */
/** Whether any WC paths are at a depth other than @c svn_depth_infinity.
* @since New in 1.5.
*/
svn_boolean_t sparse_checkout;
} svn_wc_revision_status_t;
/** Set @a *result_p to point to a new @c svn_wc_revision_status_t structure
* containing a summary of the revision range and status of the working copy
* at @a wc_path (not including "externals").
*
* Set @a (*result_p)->min_rev and @a (*result_p)->max_rev respectively to the
* lowest and highest revision numbers in the working copy. If @a committed
* is TRUE, summarize the last-changed revisions, else the base revisions.
*
* Set @a (*result_p)->switched to indicate whether any item in the WC is
* switched relative to its parent. If @a trail_url is non-NULL, use it to
* determine if @a wc_path itself is switched. It should be any trailing
* portion of @a wc_path's expected URL, long enough to include any parts
* that the caller considers might be changed by a switch. If it does not
* match the end of @a wc_path's actual URL, then report a "switched"
* status.
*
* Set @a (*result_p)->modified to indicate whether any item is locally
* modified.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
* if the client has cancelled the operation.
*
* Allocate *result_p in @a pool.
*
* @since New in 1.4
*/
svn_error_t *
svn_wc_revision_status(svn_wc_revision_status_t **result_p,
const char *wc_path,
const char *trail_url,
svn_boolean_t committed,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/**
* Set @a path's entry's 'changelist' attribute to @a changelist iff
* @a changelist is not @c NULL; otherwise, remove any current
* changelist assignment from @a path. @a changelist may not be the
* empty string. @a adm_access is an access baton set that contains
* @a path.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton to
* determine if the client has cancelled the operation.
*
* If @a notify_func is not @c NULL, call it with @a notify_baton to
* report the change (using notification types @c
* svn_wc_notify_changelist_set and @c svn_wc_notify_changelist_clear).
*
* @note For now, directories are NOT allowed to be associated with
* changelists; there is confusion about whether they should behave
* as depth-0 or depth-infinity objects. If @a path is a directory,
* return @c SVN_ERR_UNSUPPORTED_FEATURE.
*
* @note This metadata is purely a client-side "bookkeeping"
* convenience, and is entirely managed by the working copy.
*
* @since New in 1.5.
*/
svn_error_t *
svn_wc_set_changelist(const char *path,
const char *changelist,
svn_wc_adm_access_t *adm_access,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *pool);
/** Crop @a target according to @a depth.
*
* Remove any item that exceeds the boundary of @a depth (relative to
* @a target) from revision control. Leave modified items behind
* (unversioned), while removing unmodified ones completely.
*
* If @a target starts out with a shallower depth than @a depth, do not
* upgrade it to @a depth (that would not be cropping); however, do
* check children and crop them appropriately according to @a depth.
*
* Returns immediately with no error if @a target is not a directory,
* or if @a depth is not restrictive (e.g., @c svn_depth_infinity).
*
* @a anchor is an access baton, with a tree lock, for the local path to the
* working copy which will be used as the root of this operation. If
* @a target is not empty, it represents an entry in the @a anchor path;
* otherwise, the @a anchor path is the target. @a target may not be
* @c NULL.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton at
* various points to determine if the client has cancelled the operation.
*
* If @a notify_func is not @c NULL, call it with @a notify_baton to
* report changes as they are made.
*
* @note: svn_depth_exclude currently does nothing; passing it results
* in immediate success with no side effects.
*
* @since New in 1.6
*/
svn_error_t *
svn_wc_crop_tree(svn_wc_adm_access_t *anchor,
const char *target,
svn_depth_t depth,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
/** @} */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* SVN_WC_H */
|