+2

.gitattributes

View file Reviewed

··· 1 1 api/tangled/** linguist-generated -diff 2 2 api/tangled/*_ext.go -linguist-generated diff 3 3 flake.lock -diff 4 4 + Cargo.lock -diff 5 5 + gitmirror/proto/gen/** linguist-generated -diff

+1449 -29

Cargo.lock

View file Reviewed

··· 149 149 ] 150 150 151 151 [[package]] 152 152 + name = "arrayvec" 153 153 + version = "0.7.7" 154 154 + source = "registry+https://github.com/rust-lang/crates.io-index" 155 155 + checksum = "f02882884d3e1bc524fb12c79f107f6ad0e1cfd498c536ffb494301740995dfe" 156 156 + 157 157 + [[package]] 152 158 name = "assert-json-diff" 153 159 version = "2.0.2" 154 160 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 311 317 312 318 [[package]] 313 319 name = "bitflags" 320 320 + version = "1.3.2" 321 321 + source = "registry+https://github.com/rust-lang/crates.io-index" 322 322 + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" 323 323 + 324 324 + [[package]] 325 325 + name = "bitflags" 314 326 version = "2.11.1" 315 327 source = "registry+https://github.com/rust-lang/crates.io-index" 316 328 checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" ··· 331 343 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" 332 344 dependencies = [ 333 345 "generic-array", 346 346 + ] 347 347 + 348 348 + [[package]] 349 349 + name = "block-buffer" 350 350 + version = "0.12.1" 351 351 + source = "registry+https://github.com/rust-lang/crates.io-index" 352 352 + checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" 353 353 + dependencies = [ 354 354 + "hybrid-array", 334 355 ] 335 356 336 357 [[package]] ··· 648 669 ] 649 670 650 671 [[package]] 672 672 + name = "bstr" 673 673 + version = "1.12.3" 674 674 + source = "registry+https://github.com/rust-lang/crates.io-index" 675 675 + checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" 676 676 + dependencies = [ 677 677 + "memchr", 678 678 + "regex-automata", 679 679 + "serde_core", 680 680 + ] 681 681 + 682 682 + [[package]] 651 683 name = "bumpalo" 652 684 version = "3.20.3" 653 685 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 667 699 dependencies = [ 668 700 "serde", 669 701 ] 702 702 + 703 703 + [[package]] 704 704 + name = "bytesize" 705 705 + version = "2.4.0" 706 706 + source = "registry+https://github.com/rust-lang/crates.io-index" 707 707 + checksum = "49e78e506b9d7633710dab98996f22f95f3d0f488e8f1aa162830556ed9fc14d" 670 708 671 709 [[package]] 672 710 name = "cast" ··· 824 862 version = "1.1.0" 825 863 source = "registry+https://github.com/rust-lang/crates.io-index" 826 864 checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" 865 865 + 866 866 + [[package]] 867 867 + name = "clru" 868 868 + version = "0.6.3" 869 869 + source = "registry+https://github.com/rust-lang/crates.io-index" 870 870 + checksum = "197fd99cb113a8d5d9b6376f3aa817f32c1078f2343b714fff7d2ca44fdf67d5" 871 871 + dependencies = [ 872 872 + "hashbrown 0.16.1", 873 873 + ] 827 874 828 875 [[package]] 829 876 name = "cobs" ··· 938 985 ] 939 986 940 987 [[package]] 988 988 + name = "cpufeatures" 989 989 + version = "0.3.0" 990 990 + source = "registry+https://github.com/rust-lang/crates.io-index" 991 991 + checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" 992 992 + dependencies = [ 993 993 + "libc", 994 994 + ] 995 995 + 996 996 + [[package]] 941 997 name = "crc32fast" 942 998 version = "1.5.0" 943 999 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1048 1104 ] 1049 1105 1050 1106 [[package]] 1107 1107 + name = "crypto-common" 1108 1108 + version = "0.2.2" 1109 1109 + source = "registry+https://github.com/rust-lang/crates.io-index" 1110 1110 + checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" 1111 1111 + dependencies = [ 1112 1112 + "hybrid-array", 1113 1113 + ] 1114 1114 + 1115 1115 + [[package]] 1051 1116 name = "darling" 1052 1117 version = "0.23.0" 1053 1118 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1146 1211 checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" 1147 1212 1148 1213 [[package]] 1214 1214 + name = "defmt" 1215 1215 + version = "1.1.0" 1216 1216 + source = "registry+https://github.com/rust-lang/crates.io-index" 1217 1217 + checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" 1218 1218 + dependencies = [ 1219 1219 + "bitflags 1.3.2", 1220 1220 + "defmt-macros", 1221 1221 + ] 1222 1222 + 1223 1223 + [[package]] 1224 1224 + name = "defmt-macros" 1225 1225 + version = "1.1.0" 1226 1226 + source = "registry+https://github.com/rust-lang/crates.io-index" 1227 1227 + checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" 1228 1228 + dependencies = [ 1229 1229 + "defmt-parser", 1230 1230 + "proc-macro-error2", 1231 1231 + "proc-macro2", 1232 1232 + "quote", 1233 1233 + "syn", 1234 1234 + ] 1235 1235 + 1236 1236 + [[package]] 1237 1237 + name = "defmt-parser" 1238 1238 + version = "1.0.0" 1239 1239 + source = "registry+https://github.com/rust-lang/crates.io-index" 1240 1240 + checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" 1241 1241 + dependencies = [ 1242 1242 + "thiserror 2.0.18", 1243 1243 + ] 1244 1244 + 1245 1245 + [[package]] 1149 1246 name = "der" 1150 1247 version = "0.7.10" 1151 1248 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1199 1296 source = "registry+https://github.com/rust-lang/crates.io-index" 1200 1297 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" 1201 1298 dependencies = [ 1202 1202 - "block-buffer", 1299 1299 + "block-buffer 0.10.4", 1203 1300 "const-oid", 1204 1204 - "crypto-common", 1301 1301 + "crypto-common 0.1.6", 1205 1302 "subtle", 1303 1303 + ] 1304 1304 + 1305 1305 + [[package]] 1306 1306 + name = "digest" 1307 1307 + version = "0.11.3" 1308 1308 + source = "registry+https://github.com/rust-lang/crates.io-index" 1309 1309 + checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" 1310 1310 + dependencies = [ 1311 1311 + "block-buffer 0.12.1", 1312 1312 + "crypto-common 0.2.2", 1206 1313 ] 1207 1314 1208 1315 [[package]] ··· 1223 1330 checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc" 1224 1331 1225 1332 [[package]] 1333 1333 + name = "dunce" 1334 1334 + version = "1.0.5" 1335 1335 + source = "registry+https://github.com/rust-lang/crates.io-index" 1336 1336 + checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" 1337 1337 + 1338 1338 + [[package]] 1226 1339 name = "ecdsa" 1227 1340 version = "0.16.9" 1228 1341 source = "registry+https://github.com/rust-lang/crates.io-index" 1229 1342 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" 1230 1343 dependencies = [ 1231 1344 "der", 1232 1232 - "digest", 1345 1345 + "digest 0.10.7", 1233 1346 "elliptic-curve", 1234 1347 "rfc6979", 1235 1348 "signature", ··· 1250 1363 dependencies = [ 1251 1364 "base16ct", 1252 1365 "crypto-bigint", 1253 1253 - "digest", 1366 1366 + "digest 0.10.7", 1254 1367 "ff", 1255 1368 "generic-array", 1256 1369 "group", ··· 1317 1430 checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471" 1318 1431 1319 1432 [[package]] 1433 1433 + name = "faster-hex" 1434 1434 + version = "0.10.0" 1435 1435 + source = "registry+https://github.com/rust-lang/crates.io-index" 1436 1436 + checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73" 1437 1437 + dependencies = [ 1438 1438 + "heapless 0.8.0", 1439 1439 + "serde", 1440 1440 + ] 1441 1441 + 1442 1442 + [[package]] 1320 1443 name = "fastrand" 1321 1444 version = "2.4.1" 1322 1445 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1333 1456 ] 1334 1457 1335 1458 [[package]] 1459 1459 + name = "filetime" 1460 1460 + version = "0.2.29" 1461 1461 + source = "registry+https://github.com/rust-lang/crates.io-index" 1462 1462 + checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" 1463 1463 + dependencies = [ 1464 1464 + "cfg-if", 1465 1465 + "libc", 1466 1466 + ] 1467 1467 + 1468 1468 + [[package]] 1336 1469 name = "find-msvc-tools" 1337 1470 version = "0.1.9" 1338 1471 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1583 1716 ] 1584 1717 1585 1718 [[package]] 1719 1719 + name = "gitmirror" 1720 1720 + version = "0.1.0" 1721 1721 + dependencies = [ 1722 1722 + "anyhow", 1723 1723 + "clap", 1724 1724 + "gix", 1725 1725 + "line-numbers", 1726 1726 + "prost", 1727 1727 + "prost-types", 1728 1728 + "rustc-hash", 1729 1729 + "tempfile", 1730 1730 + "tokio", 1731 1731 + "tokio-stream", 1732 1732 + "tonic", 1733 1733 + "tonic-prost", 1734 1734 + "tonic-prost-build", 1735 1735 + "tracing", 1736 1736 + "tracing-subscriber", 1737 1737 + ] 1738 1738 + 1739 1739 + [[package]] 1740 1740 + name = "gix" 1741 1741 + version = "0.84.0" 1742 1742 + source = "registry+https://github.com/rust-lang/crates.io-index" 1743 1743 + checksum = "ae54ae0ebd1a5a3c3f8d95dd3b5ca6e63f4fed9bfd585e13801a97d7bde8f9ce" 1744 1744 + dependencies = [ 1745 1745 + "gix-actor", 1746 1746 + "gix-archive", 1747 1747 + "gix-attributes", 1748 1748 + "gix-blame", 1749 1749 + "gix-command", 1750 1750 + "gix-commitgraph", 1751 1751 + "gix-config", 1752 1752 + "gix-credentials", 1753 1753 + "gix-date", 1754 1754 + "gix-diff", 1755 1755 + "gix-dir", 1756 1756 + "gix-discover", 1757 1757 + "gix-error", 1758 1758 + "gix-features", 1759 1759 + "gix-filter", 1760 1760 + "gix-fs", 1761 1761 + "gix-glob", 1762 1762 + "gix-hash", 1763 1763 + "gix-hashtable", 1764 1764 + "gix-ignore", 1765 1765 + "gix-index", 1766 1766 + "gix-lock", 1767 1767 + "gix-mailmap", 1768 1768 + "gix-merge", 1769 1769 + "gix-negotiate", 1770 1770 + "gix-object", 1771 1771 + "gix-odb", 1772 1772 + "gix-pack", 1773 1773 + "gix-path", 1774 1774 + "gix-pathspec", 1775 1775 + "gix-prompt", 1776 1776 + "gix-protocol", 1777 1777 + "gix-ref", 1778 1778 + "gix-refspec", 1779 1779 + "gix-revision", 1780 1780 + "gix-revwalk", 1781 1781 + "gix-sec", 1782 1782 + "gix-shallow", 1783 1783 + "gix-status", 1784 1784 + "gix-submodule", 1785 1785 + "gix-tempfile", 1786 1786 + "gix-trace", 1787 1787 + "gix-traverse", 1788 1788 + "gix-url", 1789 1789 + "gix-utils", 1790 1790 + "gix-validate", 1791 1791 + "gix-worktree", 1792 1792 + "gix-worktree-state", 1793 1793 + "gix-worktree-stream", 1794 1794 + "nonempty", 1795 1795 + "parking_lot", 1796 1796 + "regex", 1797 1797 + "signal-hook", 1798 1798 + "smallvec", 1799 1799 + "thiserror 2.0.18", 1800 1800 + ] 1801 1801 + 1802 1802 + [[package]] 1803 1803 + name = "gix-actor" 1804 1804 + version = "0.41.1" 1805 1805 + source = "registry+https://github.com/rust-lang/crates.io-index" 1806 1806 + checksum = "8bc998b8f746dda8565450d08a63b792ced9165d8c27a1ed3f02799ec6a7820f" 1807 1807 + dependencies = [ 1808 1808 + "bstr", 1809 1809 + "gix-date", 1810 1810 + "gix-error", 1811 1811 + ] 1812 1812 + 1813 1813 + [[package]] 1814 1814 + name = "gix-archive" 1815 1815 + version = "0.33.0" 1816 1816 + source = "registry+https://github.com/rust-lang/crates.io-index" 1817 1817 + checksum = "16909cacc78936ab96f6c3be08379d0a2e88bfa3a7527972d2ed75c7517ef31e" 1818 1818 + dependencies = [ 1819 1819 + "bstr", 1820 1820 + "gix-date", 1821 1821 + "gix-error", 1822 1822 + "gix-object", 1823 1823 + "gix-worktree-stream", 1824 1824 + ] 1825 1825 + 1826 1826 + [[package]] 1827 1827 + name = "gix-attributes" 1828 1828 + version = "0.33.2" 1829 1829 + source = "registry+https://github.com/rust-lang/crates.io-index" 1830 1830 + checksum = "39b40888d0ed415c0744a6cdc61eebf0304c9d26ab726725b718443c322e5ba4" 1831 1831 + dependencies = [ 1832 1832 + "bstr", 1833 1833 + "gix-glob", 1834 1834 + "gix-path", 1835 1835 + "gix-quote", 1836 1836 + "gix-trace", 1837 1837 + "kstring", 1838 1838 + "smallvec", 1839 1839 + "thiserror 2.0.18", 1840 1840 + "unicode-bom", 1841 1841 + ] 1842 1842 + 1843 1843 + [[package]] 1844 1844 + name = "gix-bitmap" 1845 1845 + version = "0.3.2" 1846 1846 + source = "registry+https://github.com/rust-lang/crates.io-index" 1847 1847 + checksum = "52ebef0c26ad305747649e727bbcd56a7b7910754eb7cea88f6dff6f93c51283" 1848 1848 + dependencies = [ 1849 1849 + "gix-error", 1850 1850 + ] 1851 1851 + 1852 1852 + [[package]] 1853 1853 + name = "gix-blame" 1854 1854 + version = "0.14.0" 1855 1855 + source = "registry+https://github.com/rust-lang/crates.io-index" 1856 1856 + checksum = "4d39a0c14af94c2edaa5eefe06d5ef2cdea55316ae9a9321314288e3f55fa4c0" 1857 1857 + dependencies = [ 1858 1858 + "gix-commitgraph", 1859 1859 + "gix-date", 1860 1860 + "gix-diff", 1861 1861 + "gix-error", 1862 1862 + "gix-hash", 1863 1863 + "gix-object", 1864 1864 + "gix-revwalk", 1865 1865 + "gix-trace", 1866 1866 + "gix-traverse", 1867 1867 + "gix-worktree", 1868 1868 + "smallvec", 1869 1869 + "thiserror 2.0.18", 1870 1870 + ] 1871 1871 + 1872 1872 + [[package]] 1873 1873 + name = "gix-chunk" 1874 1874 + version = "0.7.2" 1875 1875 + source = "registry+https://github.com/rust-lang/crates.io-index" 1876 1876 + checksum = "9faee47943b638e58ddd5e275a4906ad3e4b6c8584f1d41bd18ab9032ec52afb" 1877 1877 + dependencies = [ 1878 1878 + "gix-error", 1879 1879 + ] 1880 1880 + 1881 1881 + [[package]] 1882 1882 + name = "gix-command" 1883 1883 + version = "0.9.1" 1884 1884 + source = "registry+https://github.com/rust-lang/crates.io-index" 1885 1885 + checksum = "00706d4fef135ef4b01680d5218c6ee40cda8baf697b864296cbc887d19118f6" 1886 1886 + dependencies = [ 1887 1887 + "bstr", 1888 1888 + "gix-path", 1889 1889 + "gix-quote", 1890 1890 + "gix-trace", 1891 1891 + "shell-words", 1892 1892 + ] 1893 1893 + 1894 1894 + [[package]] 1895 1895 + name = "gix-commitgraph" 1896 1896 + version = "0.37.1" 1897 1897 + source = "registry+https://github.com/rust-lang/crates.io-index" 1898 1898 + checksum = "7f675d0df484a7f6a47e64bd6f311af489d947c0323b0564f36d14f3d7762abb" 1899 1899 + dependencies = [ 1900 1900 + "bstr", 1901 1901 + "gix-chunk", 1902 1902 + "gix-error", 1903 1903 + "gix-hash", 1904 1904 + "memmap2", 1905 1905 + "nonempty", 1906 1906 + ] 1907 1907 + 1908 1908 + [[package]] 1909 1909 + name = "gix-config" 1910 1910 + version = "0.57.0" 1911 1911 + source = "registry+https://github.com/rust-lang/crates.io-index" 1912 1912 + checksum = "4f2372d4b49ca28431e7d150cab9d25edc1890f0184bd57eb0e917c7799e63de" 1913 1913 + dependencies = [ 1914 1914 + "bstr", 1915 1915 + "gix-config-value", 1916 1916 + "gix-features", 1917 1917 + "gix-glob", 1918 1918 + "gix-path", 1919 1919 + "gix-ref", 1920 1920 + "gix-sec", 1921 1921 + "smallvec", 1922 1922 + "thiserror 2.0.18", 1923 1923 + "unicode-bom", 1924 1924 + ] 1925 1925 + 1926 1926 + [[package]] 1927 1927 + name = "gix-config-value" 1928 1928 + version = "0.18.1" 1929 1929 + source = "registry+https://github.com/rust-lang/crates.io-index" 1930 1930 + checksum = "ed42168329552f6c2e5df09665c104199d45d84bedb53683738a49b57fe1baab" 1931 1931 + dependencies = [ 1932 1932 + "bitflags 2.11.1", 1933 1933 + "bstr", 1934 1934 + "gix-path", 1935 1935 + "libc", 1936 1936 + "thiserror 2.0.18", 1937 1937 + ] 1938 1938 + 1939 1939 + [[package]] 1940 1940 + name = "gix-credentials" 1941 1941 + version = "0.38.1" 1942 1942 + source = "registry+https://github.com/rust-lang/crates.io-index" 1943 1943 + checksum = "f40cd22f0dd71988be12d6e78b1709de2370e1957c5f107ff31e56caeba3745d" 1944 1944 + dependencies = [ 1945 1945 + "bstr", 1946 1946 + "gix-command", 1947 1947 + "gix-config-value", 1948 1948 + "gix-date", 1949 1949 + "gix-path", 1950 1950 + "gix-prompt", 1951 1951 + "gix-sec", 1952 1952 + "gix-trace", 1953 1953 + "gix-url", 1954 1954 + "thiserror 2.0.18", 1955 1955 + ] 1956 1956 + 1957 1957 + [[package]] 1958 1958 + name = "gix-date" 1959 1959 + version = "0.15.5" 1960 1960 + source = "registry+https://github.com/rust-lang/crates.io-index" 1961 1961 + checksum = "3d63f9e28b59ddeb1a1eb9e5cf986a9222b5d484947445edbc20473939cc7fd0" 1962 1962 + dependencies = [ 1963 1963 + "bstr", 1964 1964 + "gix-error", 1965 1965 + "itoa", 1966 1966 + "jiff", 1967 1967 + ] 1968 1968 + 1969 1969 + [[package]] 1970 1970 + name = "gix-diff" 1971 1971 + version = "0.64.0" 1972 1972 + source = "registry+https://github.com/rust-lang/crates.io-index" 1973 1973 + checksum = "3b6d9528f32d94cef2edf39a1ac01fe5a0fc44ddbb18d9e44099936047c3302b" 1974 1974 + dependencies = [ 1975 1975 + "bstr", 1976 1976 + "gix-attributes", 1977 1977 + "gix-command", 1978 1978 + "gix-filter", 1979 1979 + "gix-fs", 1980 1980 + "gix-hash", 1981 1981 + "gix-imara-diff", 1982 1982 + "gix-index", 1983 1983 + "gix-object", 1984 1984 + "gix-path", 1985 1985 + "gix-pathspec", 1986 1986 + "gix-tempfile", 1987 1987 + "gix-trace", 1988 1988 + "gix-traverse", 1989 1989 + "gix-worktree", 1990 1990 + "thiserror 2.0.18", 1991 1991 + ] 1992 1992 + 1993 1993 + [[package]] 1994 1994 + name = "gix-dir" 1995 1995 + version = "0.26.0" 1996 1996 + source = "registry+https://github.com/rust-lang/crates.io-index" 1997 1997 + checksum = "21bb2a53a6fd917ec499ed0bfb5b6887de7a15bd79197dcea7c987938749a9f1" 1998 1998 + dependencies = [ 1999 1999 + "bstr", 2000 2000 + "gix-discover", 2001 2001 + "gix-fs", 2002 2002 + "gix-ignore", 2003 2003 + "gix-index", 2004 2004 + "gix-object", 2005 2005 + "gix-path", 2006 2006 + "gix-pathspec", 2007 2007 + "gix-trace", 2008 2008 + "gix-utils", 2009 2009 + "gix-worktree", 2010 2010 + "thiserror 2.0.18", 2011 2011 + ] 2012 2012 + 2013 2013 + [[package]] 2014 2014 + name = "gix-discover" 2015 2015 + version = "0.52.0" 2016 2016 + source = "registry+https://github.com/rust-lang/crates.io-index" 2017 2017 + checksum = "77bacdd12b7879d2178a80c58c2f319995e4654e1a7a23e3181e5c8a12b824f7" 2018 2018 + dependencies = [ 2019 2019 + "bstr", 2020 2020 + "dunce", 2021 2021 + "gix-fs", 2022 2022 + "gix-path", 2023 2023 + "gix-ref", 2024 2024 + "gix-sec", 2025 2025 + "thiserror 2.0.18", 2026 2026 + ] 2027 2027 + 2028 2028 + [[package]] 2029 2029 + name = "gix-error" 2030 2030 + version = "0.2.4" 2031 2031 + source = "registry+https://github.com/rust-lang/crates.io-index" 2032 2032 + checksum = "e57831e199be480af90dcd7e459abed8a174c09ec9a6e2cc8f7ca6c54598b06b" 2033 2033 + dependencies = [ 2034 2034 + "bstr", 2035 2035 + ] 2036 2036 + 2037 2037 + [[package]] 2038 2038 + name = "gix-features" 2039 2039 + version = "0.48.1" 2040 2040 + source = "registry+https://github.com/rust-lang/crates.io-index" 2041 2041 + checksum = "1849ae154d38bc403185be14fa871e38e3c93ee606875d94e207fdb9fba52dbc" 2042 2042 + dependencies = [ 2043 2043 + "bytes", 2044 2044 + "bytesize", 2045 2045 + "crc32fast", 2046 2046 + "crossbeam-channel", 2047 2047 + "gix-path", 2048 2048 + "gix-trace", 2049 2049 + "gix-utils", 2050 2050 + "libc", 2051 2051 + "once_cell", 2052 2052 + "parking_lot", 2053 2053 + "prodash", 2054 2054 + "thiserror 2.0.18", 2055 2055 + "walkdir", 2056 2056 + "zlib-rs", 2057 2057 + ] 2058 2058 + 2059 2059 + [[package]] 2060 2060 + name = "gix-filter" 2061 2061 + version = "0.31.0" 2062 2062 + source = "registry+https://github.com/rust-lang/crates.io-index" 2063 2063 + checksum = "ecf74b7d16f6694ce4a3049074c41be0c7987105743674f1671807bd6dce09fa" 2064 2064 + dependencies = [ 2065 2065 + "bstr", 2066 2066 + "encoding_rs", 2067 2067 + "gix-attributes", 2068 2068 + "gix-command", 2069 2069 + "gix-hash", 2070 2070 + "gix-object", 2071 2071 + "gix-packetline", 2072 2072 + "gix-path", 2073 2073 + "gix-quote", 2074 2074 + "gix-trace", 2075 2075 + "gix-utils", 2076 2076 + "smallvec", 2077 2077 + "thiserror 2.0.18", 2078 2078 + ] 2079 2079 + 2080 2080 + [[package]] 2081 2081 + name = "gix-fs" 2082 2082 + version = "0.21.2" 2083 2083 + source = "registry+https://github.com/rust-lang/crates.io-index" 2084 2084 + checksum = "6cdff46db8798e47e2f727d84b9379aac5add3dd3d9d0b07bb4d7d5d640771fe" 2085 2085 + dependencies = [ 2086 2086 + "bstr", 2087 2087 + "fastrand", 2088 2088 + "gix-features", 2089 2089 + "gix-path", 2090 2090 + "gix-utils", 2091 2091 + "thiserror 2.0.18", 2092 2092 + ] 2093 2093 + 2094 2094 + [[package]] 2095 2095 + name = "gix-glob" 2096 2096 + version = "0.26.1" 2097 2097 + source = "registry+https://github.com/rust-lang/crates.io-index" 2098 2098 + checksum = "d1fcb8ef5b16bcf874abe9b68d8abb3c0493c876d367ab824151f30a0f3f3756" 2099 2099 + dependencies = [ 2100 2100 + "bitflags 2.11.1", 2101 2101 + "bstr", 2102 2102 + "gix-features", 2103 2103 + "gix-path", 2104 2104 + ] 2105 2105 + 2106 2106 + [[package]] 2107 2107 + name = "gix-hash" 2108 2108 + version = "0.25.1" 2109 2109 + source = "registry+https://github.com/rust-lang/crates.io-index" 2110 2110 + checksum = "cb0926d3819c837750b4e03c7754901e73f68b8c9b690753a6372a1bed4eedce" 2111 2111 + dependencies = [ 2112 2112 + "faster-hex", 2113 2113 + "gix-features", 2114 2114 + "sha1-checked", 2115 2115 + "sha2 0.11.0", 2116 2116 + "thiserror 2.0.18", 2117 2117 + ] 2118 2118 + 2119 2119 + [[package]] 2120 2120 + name = "gix-hashtable" 2121 2121 + version = "0.15.2" 2122 2122 + source = "registry+https://github.com/rust-lang/crates.io-index" 2123 2123 + checksum = "7e261d54091f0d1c729bc83f54548c071bdec60a697de1e58e88bdfd7a99d24e" 2124 2124 + dependencies = [ 2125 2125 + "gix-hash", 2126 2126 + "hashbrown 0.17.1", 2127 2127 + "parking_lot", 2128 2128 + ] 2129 2129 + 2130 2130 + [[package]] 2131 2131 + name = "gix-ignore" 2132 2132 + version = "0.21.1" 2133 2133 + source = "registry+https://github.com/rust-lang/crates.io-index" 2134 2134 + checksum = "d491bab9bf2c9f341dc754f425c31d5d3f63aca615312167b82e1deeaca97d8d" 2135 2135 + dependencies = [ 2136 2136 + "bstr", 2137 2137 + "gix-glob", 2138 2138 + "gix-path", 2139 2139 + "gix-trace", 2140 2140 + "unicode-bom", 2141 2141 + ] 2142 2142 + 2143 2143 + [[package]] 2144 2144 + name = "gix-imara-diff" 2145 2145 + version = "0.2.3" 2146 2146 + source = "registry+https://github.com/rust-lang/crates.io-index" 2147 2147 + checksum = "b305d85504de270ad3525d726a6b69cc59ee7b2269b014387651107ab9f0755b" 2148 2148 + dependencies = [ 2149 2149 + "bstr", 2150 2150 + "hashbrown 0.17.1", 2151 2151 + ] 2152 2152 + 2153 2153 + [[package]] 2154 2154 + name = "gix-index" 2155 2155 + version = "0.52.0" 2156 2156 + source = "registry+https://github.com/rust-lang/crates.io-index" 2157 2157 + checksum = "4e6b28cc592dc753adb58302bb14a64e412ee591a3bec77aa4df87bff74fa80d" 2158 2158 + dependencies = [ 2159 2159 + "bitflags 2.11.1", 2160 2160 + "bstr", 2161 2161 + "filetime", 2162 2162 + "fnv", 2163 2163 + "gix-bitmap", 2164 2164 + "gix-features", 2165 2165 + "gix-fs", 2166 2166 + "gix-hash", 2167 2167 + "gix-lock", 2168 2168 + "gix-object", 2169 2169 + "gix-traverse", 2170 2170 + "gix-utils", 2171 2171 + "gix-validate", 2172 2172 + "hashbrown 0.17.1", 2173 2173 + "itoa", 2174 2174 + "libc", 2175 2175 + "memmap2", 2176 2176 + "rustix", 2177 2177 + "smallvec", 2178 2178 + "thiserror 2.0.18", 2179 2179 + ] 2180 2180 + 2181 2181 + [[package]] 2182 2182 + name = "gix-lock" 2183 2183 + version = "23.0.1" 2184 2184 + source = "registry+https://github.com/rust-lang/crates.io-index" 2185 2185 + checksum = "65c9dedd9e90b0d47624d2ed241d394e09294118364e87b9b7e5f1fe755f3c2c" 2186 2186 + dependencies = [ 2187 2187 + "gix-tempfile", 2188 2188 + "gix-utils", 2189 2189 + "thiserror 2.0.18", 2190 2190 + ] 2191 2191 + 2192 2192 + [[package]] 2193 2193 + name = "gix-mailmap" 2194 2194 + version = "0.33.1" 2195 2195 + source = "registry+https://github.com/rust-lang/crates.io-index" 2196 2196 + checksum = "195fd20808055824531be2fd0d34136d900e5fbca3ffb0a3c07e8beeefb9c828" 2197 2197 + dependencies = [ 2198 2198 + "bstr", 2199 2199 + "gix-actor", 2200 2200 + "gix-date", 2201 2201 + "gix-error", 2202 2202 + ] 2203 2203 + 2204 2204 + [[package]] 2205 2205 + name = "gix-merge" 2206 2206 + version = "0.17.0" 2207 2207 + source = "registry+https://github.com/rust-lang/crates.io-index" 2208 2208 + checksum = "7543e1eceb25fbbd1a29459c794148d8bafc1c77555eb386617a2d99b5371971" 2209 2209 + dependencies = [ 2210 2210 + "bstr", 2211 2211 + "gix-command", 2212 2212 + "gix-diff", 2213 2213 + "gix-filter", 2214 2214 + "gix-fs", 2215 2215 + "gix-hash", 2216 2216 + "gix-imara-diff", 2217 2217 + "gix-index", 2218 2218 + "gix-object", 2219 2219 + "gix-path", 2220 2220 + "gix-quote", 2221 2221 + "gix-revision", 2222 2222 + "gix-revwalk", 2223 2223 + "gix-tempfile", 2224 2224 + "gix-trace", 2225 2225 + "gix-worktree", 2226 2226 + "nonempty", 2227 2227 + "thiserror 2.0.18", 2228 2228 + ] 2229 2229 + 2230 2230 + [[package]] 2231 2231 + name = "gix-negotiate" 2232 2232 + version = "0.32.0" 2233 2233 + source = "registry+https://github.com/rust-lang/crates.io-index" 2234 2234 + checksum = "890c936a215bae25818c076cb881cb2e54d2c66ba947ba58b8dd47cff921bf55" 2235 2235 + dependencies = [ 2236 2236 + "bitflags 2.11.1", 2237 2237 + "gix-commitgraph", 2238 2238 + "gix-date", 2239 2239 + "gix-hash", 2240 2240 + "gix-object", 2241 2241 + "gix-revwalk", 2242 2242 + ] 2243 2243 + 2244 2244 + [[package]] 2245 2245 + name = "gix-object" 2246 2246 + version = "0.61.0" 2247 2247 + source = "registry+https://github.com/rust-lang/crates.io-index" 2248 2248 + checksum = "d5cd857e29429c7213bdef3f5aef83f8cc124774fe8ae0d27b1607d218d6d525" 2249 2249 + dependencies = [ 2250 2250 + "bstr", 2251 2251 + "gix-actor", 2252 2252 + "gix-date", 2253 2253 + "gix-features", 2254 2254 + "gix-hash", 2255 2255 + "gix-hashtable", 2256 2256 + "gix-utils", 2257 2257 + "gix-validate", 2258 2258 + "itoa", 2259 2259 + "smallvec", 2260 2260 + "thiserror 2.0.18", 2261 2261 + ] 2262 2262 + 2263 2263 + [[package]] 2264 2264 + name = "gix-odb" 2265 2265 + version = "0.81.0" 2266 2266 + source = "registry+https://github.com/rust-lang/crates.io-index" 2267 2267 + checksum = "7d004c32858b1556f2d7874405edb3c97dc78fc09beaa87d57bb077ee2858a7d" 2268 2268 + dependencies = [ 2269 2269 + "arc-swap", 2270 2270 + "gix-features", 2271 2271 + "gix-fs", 2272 2272 + "gix-hash", 2273 2273 + "gix-hashtable", 2274 2274 + "gix-object", 2275 2275 + "gix-pack", 2276 2276 + "gix-path", 2277 2277 + "gix-quote", 2278 2278 + "memmap2", 2279 2279 + "parking_lot", 2280 2280 + "tempfile", 2281 2281 + "thiserror 2.0.18", 2282 2282 + ] 2283 2283 + 2284 2284 + [[package]] 2285 2285 + name = "gix-pack" 2286 2286 + version = "0.71.0" 2287 2287 + source = "registry+https://github.com/rust-lang/crates.io-index" 2288 2288 + checksum = "e43626f2a27d1033674ec1a196b845614231e6bbd949d5e21c133045ff56b174" 2289 2289 + dependencies = [ 2290 2290 + "clru", 2291 2291 + "gix-chunk", 2292 2292 + "gix-error", 2293 2293 + "gix-features", 2294 2294 + "gix-hash", 2295 2295 + "gix-hashtable", 2296 2296 + "gix-object", 2297 2297 + "gix-path", 2298 2298 + "memmap2", 2299 2299 + "smallvec", 2300 2300 + "thiserror 2.0.18", 2301 2301 + "uluru", 2302 2302 + ] 2303 2303 + 2304 2304 + [[package]] 2305 2305 + name = "gix-packetline" 2306 2306 + version = "0.21.5" 2307 2307 + source = "registry+https://github.com/rust-lang/crates.io-index" 2308 2308 + checksum = "b217dd0ee0c4021ecf169a4a519b1b4f80d15e3f3765f3dc466223dc0ac891d7" 2309 2309 + dependencies = [ 2310 2310 + "bstr", 2311 2311 + "faster-hex", 2312 2312 + "gix-trace", 2313 2313 + "thiserror 2.0.18", 2314 2314 + ] 2315 2315 + 2316 2316 + [[package]] 2317 2317 + name = "gix-path" 2318 2318 + version = "0.12.1" 2319 2319 + source = "registry+https://github.com/rust-lang/crates.io-index" 2320 2320 + checksum = "afa6ac14cd14939ea94a496ce7460daa6511c09f5b84757e9cfc6f9c8d0f93a6" 2321 2321 + dependencies = [ 2322 2322 + "bstr", 2323 2323 + "gix-trace", 2324 2324 + "gix-validate", 2325 2325 + "thiserror 2.0.18", 2326 2326 + ] 2327 2327 + 2328 2328 + [[package]] 2329 2329 + name = "gix-pathspec" 2330 2330 + version = "0.18.1" 2331 2331 + source = "registry+https://github.com/rust-lang/crates.io-index" 2332 2332 + checksum = "3050783b41ee11511e1e8fb35623df81806194f4030395f14f48ea37c2798c9f" 2333 2333 + dependencies = [ 2334 2334 + "bitflags 2.11.1", 2335 2335 + "bstr", 2336 2336 + "gix-attributes", 2337 2337 + "gix-config-value", 2338 2338 + "gix-glob", 2339 2339 + "gix-path", 2340 2340 + "thiserror 2.0.18", 2341 2341 + ] 2342 2342 + 2343 2343 + [[package]] 2344 2344 + name = "gix-prompt" 2345 2345 + version = "0.15.1" 2346 2346 + source = "registry+https://github.com/rust-lang/crates.io-index" 2347 2347 + checksum = "3ee604d7746080ae7e1023bf47204bcc2c5f307bfbe2306a3c90b1bfd1a2c6d8" 2348 2348 + dependencies = [ 2349 2349 + "gix-command", 2350 2350 + "gix-config-value", 2351 2351 + "parking_lot", 2352 2352 + "rustix", 2353 2353 + "thiserror 2.0.18", 2354 2354 + ] 2355 2355 + 2356 2356 + [[package]] 2357 2357 + name = "gix-protocol" 2358 2358 + version = "0.62.0" 2359 2359 + source = "registry+https://github.com/rust-lang/crates.io-index" 2360 2360 + checksum = "51dea3acb390707ab868f1f9584f18449eb95d869deffae96768e47d303595ee" 2361 2361 + dependencies = [ 2362 2362 + "bstr", 2363 2363 + "gix-date", 2364 2364 + "gix-features", 2365 2365 + "gix-hash", 2366 2366 + "gix-ref", 2367 2367 + "gix-shallow", 2368 2368 + "gix-transport", 2369 2369 + "gix-utils", 2370 2370 + "maybe-async", 2371 2371 + "nonempty", 2372 2372 + "thiserror 2.0.18", 2373 2373 + ] 2374 2374 + 2375 2375 + [[package]] 2376 2376 + name = "gix-quote" 2377 2377 + version = "0.7.2" 2378 2378 + source = "registry+https://github.com/rust-lang/crates.io-index" 2379 2379 + checksum = "a6e541fc33cc2b783b7979040d445a0c86a2eca747c8faea4ca84230d06ae6ef" 2380 2380 + dependencies = [ 2381 2381 + "bstr", 2382 2382 + "gix-error", 2383 2383 + "gix-utils", 2384 2384 + ] 2385 2385 + 2386 2386 + [[package]] 2387 2387 + name = "gix-ref" 2388 2388 + version = "0.64.0" 2389 2389 + source = "registry+https://github.com/rust-lang/crates.io-index" 2390 2390 + checksum = "4c04f64c37eb7e6feb73c7060f8dc6f381cc5de5d53249bfd450bc48a86b2e8b" 2391 2391 + dependencies = [ 2392 2392 + "gix-actor", 2393 2393 + "gix-features", 2394 2394 + "gix-fs", 2395 2395 + "gix-hash", 2396 2396 + "gix-lock", 2397 2397 + "gix-object", 2398 2398 + "gix-path", 2399 2399 + "gix-tempfile", 2400 2400 + "gix-utils", 2401 2401 + "gix-validate", 2402 2402 + "memmap2", 2403 2403 + "thiserror 2.0.18", 2404 2404 + ] 2405 2405 + 2406 2406 + [[package]] 2407 2407 + name = "gix-refspec" 2408 2408 + version = "0.42.0" 2409 2409 + source = "registry+https://github.com/rust-lang/crates.io-index" 2410 2410 + checksum = "b216ae06ec74b5f24ad0142026a997fb0a935b7410eaf9c1616fc3f0e6c5a6d3" 2411 2411 + dependencies = [ 2412 2412 + "bstr", 2413 2413 + "gix-error", 2414 2414 + "gix-glob", 2415 2415 + "gix-hash", 2416 2416 + "gix-revision", 2417 2417 + "gix-validate", 2418 2418 + "smallvec", 2419 2419 + "thiserror 2.0.18", 2420 2420 + ] 2421 2421 + 2422 2422 + [[package]] 2423 2423 + name = "gix-revision" 2424 2424 + version = "0.46.0" 2425 2425 + source = "registry+https://github.com/rust-lang/crates.io-index" 2426 2426 + checksum = "0b47c88884dd3c1a19a39da19d10211fcdea2809aadc86869b6e824a1774340f" 2427 2427 + dependencies = [ 2428 2428 + "bitflags 2.11.1", 2429 2429 + "bstr", 2430 2430 + "gix-commitgraph", 2431 2431 + "gix-date", 2432 2432 + "gix-error", 2433 2433 + "gix-hash", 2434 2434 + "gix-hashtable", 2435 2435 + "gix-object", 2436 2436 + "gix-revwalk", 2437 2437 + "gix-trace", 2438 2438 + "nonempty", 2439 2439 + ] 2440 2440 + 2441 2441 + [[package]] 2442 2442 + name = "gix-revwalk" 2443 2443 + version = "0.32.0" 2444 2444 + source = "registry+https://github.com/rust-lang/crates.io-index" 2445 2445 + checksum = "85f5756abffe0917827aac683b13684ed99875bc398fa1f9b8f479b0681ef9e6" 2446 2446 + dependencies = [ 2447 2447 + "gix-commitgraph", 2448 2448 + "gix-date", 2449 2449 + "gix-error", 2450 2450 + "gix-hash", 2451 2451 + "gix-hashtable", 2452 2452 + "gix-object", 2453 2453 + "smallvec", 2454 2454 + "thiserror 2.0.18", 2455 2455 + ] 2456 2456 + 2457 2457 + [[package]] 2458 2458 + name = "gix-sec" 2459 2459 + version = "0.14.1" 2460 2460 + source = "registry+https://github.com/rust-lang/crates.io-index" 2461 2461 + checksum = "ab8519976e4c7e486270740a5400369f37940779b80bd1377d94cfa1125d01b3" 2462 2462 + dependencies = [ 2463 2463 + "bitflags 2.11.1", 2464 2464 + "gix-path", 2465 2465 + "libc", 2466 2466 + "windows-sys 0.61.2", 2467 2467 + ] 2468 2468 + 2469 2469 + [[package]] 2470 2470 + name = "gix-shallow" 2471 2471 + version = "0.12.1" 2472 2472 + source = "registry+https://github.com/rust-lang/crates.io-index" 2473 2473 + checksum = "a292fc2fe548c5dfa575479d16b445b0ddf1dd2f56f1fec6aed386f82553cd97" 2474 2474 + dependencies = [ 2475 2475 + "bstr", 2476 2476 + "gix-hash", 2477 2477 + "gix-lock", 2478 2478 + "nonempty", 2479 2479 + "thiserror 2.0.18", 2480 2480 + ] 2481 2481 + 2482 2482 + [[package]] 2483 2483 + name = "gix-status" 2484 2484 + version = "0.31.0" 2485 2485 + source = "registry+https://github.com/rust-lang/crates.io-index" 2486 2486 + checksum = "22042e385d28a34275e029d98f4970285045be14b9073658ca897923f2ed8700" 2487 2487 + dependencies = [ 2488 2488 + "bstr", 2489 2489 + "filetime", 2490 2490 + "gix-diff", 2491 2491 + "gix-dir", 2492 2492 + "gix-features", 2493 2493 + "gix-filter", 2494 2494 + "gix-fs", 2495 2495 + "gix-hash", 2496 2496 + "gix-index", 2497 2497 + "gix-object", 2498 2498 + "gix-path", 2499 2499 + "gix-pathspec", 2500 2500 + "gix-worktree", 2501 2501 + "portable-atomic", 2502 2502 + "thiserror 2.0.18", 2503 2503 + ] 2504 2504 + 2505 2505 + [[package]] 2506 2506 + name = "gix-submodule" 2507 2507 + version = "0.31.0" 2508 2508 + source = "registry+https://github.com/rust-lang/crates.io-index" 2509 2509 + checksum = "3059890ef054066c22a94bfc6a3eaba0d806aedcd630a0bc9e5783fd88884781" 2510 2510 + dependencies = [ 2511 2511 + "bstr", 2512 2512 + "gix-config", 2513 2513 + "gix-path", 2514 2514 + "gix-pathspec", 2515 2515 + "gix-refspec", 2516 2516 + "gix-url", 2517 2517 + "thiserror 2.0.18", 2518 2518 + ] 2519 2519 + 2520 2520 + [[package]] 2521 2521 + name = "gix-tempfile" 2522 2522 + version = "23.0.2" 2523 2523 + source = "registry+https://github.com/rust-lang/crates.io-index" 2524 2524 + checksum = "6ef60812443484e67bf84e444cc71b4c78ae62deb822221774a4fa0c57fdb17f" 2525 2525 + dependencies = [ 2526 2526 + "dashmap", 2527 2527 + "gix-fs", 2528 2528 + "libc", 2529 2529 + "parking_lot", 2530 2530 + "signal-hook", 2531 2531 + "signal-hook-registry", 2532 2532 + "tempfile", 2533 2533 + ] 2534 2534 + 2535 2535 + [[package]] 2536 2536 + name = "gix-trace" 2537 2537 + version = "0.1.20" 2538 2538 + source = "registry+https://github.com/rust-lang/crates.io-index" 2539 2539 + checksum = "44dc45eae785c0eb14173e0f152e6e224dcf4d45b6a6999a3aed22af541ad678" 2540 2540 + 2541 2541 + [[package]] 2542 2542 + name = "gix-transport" 2543 2543 + version = "0.57.2" 2544 2544 + source = "registry+https://github.com/rust-lang/crates.io-index" 2545 2545 + checksum = "186874f7ad1fb2f9a2f2aa9c2dabc7f9dd087bef74c1a0eee2b4a9cf0248fcb3" 2546 2546 + dependencies = [ 2547 2547 + "bstr", 2548 2548 + "gix-command", 2549 2549 + "gix-features", 2550 2550 + "gix-packetline", 2551 2551 + "gix-quote", 2552 2552 + "gix-sec", 2553 2553 + "gix-url", 2554 2554 + "thiserror 2.0.18", 2555 2555 + ] 2556 2556 + 2557 2557 + [[package]] 2558 2558 + name = "gix-traverse" 2559 2559 + version = "0.58.0" 2560 2560 + source = "registry+https://github.com/rust-lang/crates.io-index" 2561 2561 + checksum = "e8de590ecc86a3b2870665f2288324fa9f7f8672c7fc2d4e020fdd81cd1f7aed" 2562 2562 + dependencies = [ 2563 2563 + "bitflags 2.11.1", 2564 2564 + "gix-commitgraph", 2565 2565 + "gix-date", 2566 2566 + "gix-hash", 2567 2567 + "gix-hashtable", 2568 2568 + "gix-object", 2569 2569 + "gix-revwalk", 2570 2570 + "smallvec", 2571 2571 + "thiserror 2.0.18", 2572 2572 + ] 2573 2573 + 2574 2574 + [[package]] 2575 2575 + name = "gix-url" 2576 2576 + version = "0.36.1" 2577 2577 + source = "registry+https://github.com/rust-lang/crates.io-index" 2578 2578 + checksum = "65bb01ec69d55e82ccb7a19e264501ead4e6aac38463a8cebfdd81e22bb67ab2" 2579 2579 + dependencies = [ 2580 2580 + "bstr", 2581 2581 + "gix-path", 2582 2582 + "percent-encoding", 2583 2583 + "thiserror 2.0.18", 2584 2584 + ] 2585 2585 + 2586 2586 + [[package]] 2587 2587 + name = "gix-utils" 2588 2588 + version = "0.3.3" 2589 2589 + source = "registry+https://github.com/rust-lang/crates.io-index" 2590 2590 + checksum = "66c50966184123caf580ffa64e28031a878597f1c7fceb8fe19566c38eb1b771" 2591 2591 + dependencies = [ 2592 2592 + "bstr", 2593 2593 + "fastrand", 2594 2594 + "unicode-normalization", 2595 2595 + ] 2596 2596 + 2597 2597 + [[package]] 2598 2598 + name = "gix-validate" 2599 2599 + version = "0.11.2" 2600 2600 + source = "registry+https://github.com/rust-lang/crates.io-index" 2601 2601 + checksum = "7bc6fc771c4063ba7cd2f47b91fb6076251c6a823b64b7fe7b8874b0fe4afae3" 2602 2602 + dependencies = [ 2603 2603 + "bstr", 2604 2604 + ] 2605 2605 + 2606 2606 + [[package]] 2607 2607 + name = "gix-worktree" 2608 2608 + version = "0.53.0" 2609 2609 + source = "registry+https://github.com/rust-lang/crates.io-index" 2610 2610 + checksum = "cef414ed275e8407cd5d53d301e83be19700b0dd3f859d2434417b58f454a2d1" 2611 2611 + dependencies = [ 2612 2612 + "bstr", 2613 2613 + "gix-attributes", 2614 2614 + "gix-fs", 2615 2615 + "gix-glob", 2616 2616 + "gix-hash", 2617 2617 + "gix-ignore", 2618 2618 + "gix-index", 2619 2619 + "gix-object", 2620 2620 + "gix-path", 2621 2621 + "gix-validate", 2622 2622 + ] 2623 2623 + 2624 2624 + [[package]] 2625 2625 + name = "gix-worktree-state" 2626 2626 + version = "0.31.0" 2627 2627 + source = "registry+https://github.com/rust-lang/crates.io-index" 2628 2628 + checksum = "4bffae8b3ca258fdd50370cd51f06deb4c76a3b43db3868bc28dde45ffa77d69" 2629 2629 + dependencies = [ 2630 2630 + "bstr", 2631 2631 + "gix-features", 2632 2632 + "gix-filter", 2633 2633 + "gix-fs", 2634 2634 + "gix-index", 2635 2635 + "gix-object", 2636 2636 + "gix-path", 2637 2637 + "gix-worktree", 2638 2638 + "io-close", 2639 2639 + "thiserror 2.0.18", 2640 2640 + ] 2641 2641 + 2642 2642 + [[package]] 2643 2643 + name = "gix-worktree-stream" 2644 2644 + version = "0.33.0" 2645 2645 + source = "registry+https://github.com/rust-lang/crates.io-index" 2646 2646 + checksum = "d25e9ed30100c63f7590bc581c225e53f731a53e06aa79a245739c07f7dcc557" 2647 2647 + dependencies = [ 2648 2648 + "gix-attributes", 2649 2649 + "gix-error", 2650 2650 + "gix-features", 2651 2651 + "gix-filter", 2652 2652 + "gix-fs", 2653 2653 + "gix-hash", 2654 2654 + "gix-object", 2655 2655 + "gix-path", 2656 2656 + "gix-traverse", 2657 2657 + "parking_lot", 2658 2658 + ] 2659 2659 + 2660 2660 + [[package]] 1586 2661 name = "group" 1587 2662 version = "0.13.0" 1588 2663 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1633 2708 ] 1634 2709 1635 2710 [[package]] 2711 2711 + name = "hash32" 2712 2712 + version = "0.3.1" 2713 2713 + source = "registry+https://github.com/rust-lang/crates.io-index" 2714 2714 + checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" 2715 2715 + dependencies = [ 2716 2716 + "byteorder", 2717 2717 + ] 2718 2718 + 2719 2719 + [[package]] 1636 2720 name = "hashbrown" 1637 2721 version = "0.14.5" 1638 2722 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1669 2753 version = "0.17.1" 1670 2754 source = "registry+https://github.com/rust-lang/crates.io-index" 1671 2755 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" 2756 2756 + dependencies = [ 2757 2757 + "allocator-api2", 2758 2758 + "equivalent", 2759 2759 + "foldhash 0.2.0", 2760 2760 + ] 1672 2761 1673 2762 [[package]] 1674 2763 name = "heapless" ··· 1677 2766 checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" 1678 2767 dependencies = [ 1679 2768 "atomic-polyfill", 1680 1680 - "hash32", 2769 2769 + "hash32 0.2.1", 1681 2770 "rustc_version", 1682 2771 "serde", 1683 2772 "spin 0.9.8", 2773 2773 + "stable_deref_trait", 2774 2774 + ] 2775 2775 + 2776 2776 + [[package]] 2777 2777 + name = "heapless" 2778 2778 + version = "0.8.0" 2779 2779 + source = "registry+https://github.com/rust-lang/crates.io-index" 2780 2780 + checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" 2781 2781 + dependencies = [ 2782 2782 + "hash32 0.3.1", 1684 2783 "stable_deref_trait", 1685 2784 ] 1686 2785 ··· 1714 2813 source = "registry+https://github.com/rust-lang/crates.io-index" 1715 2814 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" 1716 2815 dependencies = [ 1717 1717 - "digest", 2816 2816 + "digest 0.10.7", 1718 2817 ] 1719 2818 1720 2819 [[package]] ··· 1769 2868 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" 1770 2869 1771 2870 [[package]] 2871 2871 + name = "human_format" 2872 2872 + version = "1.2.1" 2873 2873 + source = "registry+https://github.com/rust-lang/crates.io-index" 2874 2874 + checksum = "eaec953f16e5bcf6b8a3cb3aa959b17e5577dbd2693e94554c462c08be22624b" 2875 2875 + 2876 2876 + [[package]] 2877 2877 + name = "hybrid-array" 2878 2878 + version = "0.4.12" 2879 2879 + source = "registry+https://github.com/rust-lang/crates.io-index" 2880 2880 + checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" 2881 2881 + dependencies = [ 2882 2882 + "typenum", 2883 2883 + ] 2884 2884 + 2885 2885 + [[package]] 1772 2886 name = "hyper" 1773 2887 version = "1.10.0" 1774 2888 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1807 2921 ] 1808 2922 1809 2923 [[package]] 2924 2924 + name = "hyper-timeout" 2925 2925 + version = "0.5.2" 2926 2926 + source = "registry+https://github.com/rust-lang/crates.io-index" 2927 2927 + checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" 2928 2928 + dependencies = [ 2929 2929 + "hyper", 2930 2930 + "hyper-util", 2931 2931 + "pin-project-lite", 2932 2932 + "tokio", 2933 2933 + "tower-service", 2934 2934 + ] 2935 2935 + 2936 2936 + [[package]] 1810 2937 name = "hyper-util" 1811 2938 version = "0.1.20" 1812 2939 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1992 3119 ] 1993 3120 1994 3121 [[package]] 3122 3122 + name = "io-close" 3123 3123 + version = "0.3.7" 3124 3124 + source = "registry+https://github.com/rust-lang/crates.io-index" 3125 3125 + checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" 3126 3126 + dependencies = [ 3127 3127 + "libc", 3128 3128 + "winapi", 3129 3129 + ] 3130 3130 + 3131 3131 + [[package]] 1995 3132 name = "ipld-core" 1996 3133 version = "0.4.3" 1997 3134 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2126 3263 "serde_path_to_error", 2127 3264 "serde_repr", 2128 3265 "serde_with", 2129 2129 - "sha2", 3266 3266 + "sha2 0.10.9", 2130 3267 "syn", 2131 3268 "thiserror 2.0.18", 2132 3269 "unicode-segmentation", 2133 3270 ] 2134 3271 2135 3272 [[package]] 3273 3273 + name = "jiff" 3274 3274 + version = "0.2.29" 3275 3275 + source = "registry+https://github.com/rust-lang/crates.io-index" 3276 3276 + checksum = "34f877a98676d2fb664698d74cc6a51ce6c484ce8c770f05d0108ec9090aeb46" 3277 3277 + dependencies = [ 3278 3278 + "defmt", 3279 3279 + "jiff-static", 3280 3280 + "jiff-tzdb-platform", 3281 3281 + "log", 3282 3282 + "portable-atomic", 3283 3283 + "portable-atomic-util", 3284 3284 + "serde_core", 3285 3285 + "windows-link", 3286 3286 + ] 3287 3287 + 3288 3288 + [[package]] 3289 3289 + name = "jiff-static" 3290 3290 + version = "0.2.29" 3291 3291 + source = "registry+https://github.com/rust-lang/crates.io-index" 3292 3292 + checksum = "0666b5ab5ecaca213fc2a85b8c0083d9004e84ee2d5f9a7e0017aaf50986f25f" 3293 3293 + dependencies = [ 3294 3294 + "proc-macro2", 3295 3295 + "quote", 3296 3296 + "syn", 3297 3297 + ] 3298 3298 + 3299 3299 + [[package]] 3300 3300 + name = "jiff-tzdb" 3301 3301 + version = "0.1.6" 3302 3302 + source = "registry+https://github.com/rust-lang/crates.io-index" 3303 3303 + checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" 3304 3304 + 3305 3305 + [[package]] 3306 3306 + name = "jiff-tzdb-platform" 3307 3307 + version = "0.1.3" 3308 3308 + source = "registry+https://github.com/rust-lang/crates.io-index" 3309 3309 + checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" 3310 3310 + dependencies = [ 3311 3311 + "jiff-tzdb", 3312 3312 + ] 3313 3313 + 3314 3314 + [[package]] 2136 3315 name = "jobserver" 2137 3316 version = "0.1.34" 2138 3317 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2163 3342 "cfg-if", 2164 3343 "ecdsa", 2165 3344 "elliptic-curve", 2166 2166 - "sha2", 3345 3345 + "sha2 0.10.9", 3346 3346 + ] 3347 3347 + 3348 3348 + [[package]] 3349 3349 + name = "kstring" 3350 3350 + version = "2.0.2" 3351 3351 + source = "registry+https://github.com/rust-lang/crates.io-index" 3352 3352 + checksum = "558bf9508a558512042d3095138b1f7b8fe90c5467d94f9f1da28b3731c5dbd1" 3353 3353 + dependencies = [ 3354 3354 + "static_assertions", 2167 3355 ] 2168 3356 2169 3357 [[package]] ··· 2199 3387 version = "0.2.186" 2200 3388 source = "registry+https://github.com/rust-lang/crates.io-index" 2201 3389 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" 3390 3390 + 3391 3391 + [[package]] 3392 3392 + name = "line-numbers" 3393 3393 + version = "0.4.0" 3394 3394 + source = "registry+https://github.com/rust-lang/crates.io-index" 3395 3395 + checksum = "24ab6409a2f9ffae158ae823a012a7d7d68386663a14bedc260ca66eacf65c2c" 2202 3396 2203 3397 [[package]] 2204 3398 name = "linux-raw-sys" ··· 2301 3495 checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" 2302 3496 2303 3497 [[package]] 3498 3498 + name = "maybe-async" 3499 3499 + version = "0.2.11" 3500 3500 + source = "registry+https://github.com/rust-lang/crates.io-index" 3501 3501 + checksum = "746873a384ad60adc5db74471dfaba74bd278afbdcfd81db93fafcdfc8b5ca0c" 3502 3502 + dependencies = [ 3503 3503 + "proc-macro2", 3504 3504 + "quote", 3505 3505 + "syn", 3506 3506 + ] 3507 3507 + 3508 3508 + [[package]] 2304 3509 name = "measure_time" 2305 3510 version = "0.9.0" 2306 3511 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2464 3669 source = "registry+https://github.com/rust-lang/crates.io-index" 2465 3670 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" 2466 3671 dependencies = [ 2467 2467 - "bitflags", 3672 3672 + "bitflags 2.11.1", 2468 3673 "cfg-if", 2469 3674 "cfg_aliases", 2470 3675 "libc", ··· 2482 3687 ] 2483 3688 2484 3689 [[package]] 3690 3690 + name = "nonempty" 3691 3691 + version = "0.12.0" 3692 3692 + source = "registry+https://github.com/rust-lang/crates.io-index" 3693 3693 + checksum = "9737e026353e5cd0736f98eddae28665118eb6f6600902a7f50db585621fecb6" 3694 3694 + 3695 3695 + [[package]] 2485 3696 name = "nu-ansi-term" 2486 3697 version = "0.50.3" 2487 3698 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2614 3825 "ecdsa", 2615 3826 "elliptic-curve", 2616 3827 "primeorder", 2617 2617 - "sha2", 3828 3828 + "sha2 0.10.9", 2618 3829 ] 2619 3830 2620 3831 [[package]] ··· 2779 3990 checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" 2780 3991 2781 3992 [[package]] 3993 3993 + name = "portable-atomic-util" 3994 3994 + version = "0.2.7" 3995 3995 + source = "registry+https://github.com/rust-lang/crates.io-index" 3996 3996 + checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" 3997 3997 + dependencies = [ 3998 3998 + "portable-atomic", 3999 3999 + ] 4000 4000 + 4001 4001 + [[package]] 2782 4002 name = "postcard" 2783 4003 version = "1.1.3" 2784 4004 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2787 4007 "cobs", 2788 4008 "embedded-io 0.4.0", 2789 4009 "embedded-io 0.6.1", 2790 2790 - "heapless", 4010 4010 + "heapless 0.7.17", 2791 4011 "serde", 2792 4012 ] 2793 4013 ··· 2835 4055 ] 2836 4056 2837 4057 [[package]] 4058 4058 + name = "proc-macro-error-attr2" 4059 4059 + version = "2.0.0" 4060 4060 + source = "registry+https://github.com/rust-lang/crates.io-index" 4061 4061 + checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" 4062 4062 + dependencies = [ 4063 4063 + "proc-macro2", 4064 4064 + "quote", 4065 4065 + ] 4066 4066 + 4067 4067 + [[package]] 4068 4068 + name = "proc-macro-error2" 4069 4069 + version = "2.0.1" 4070 4070 + source = "registry+https://github.com/rust-lang/crates.io-index" 4071 4071 + checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" 4072 4072 + dependencies = [ 4073 4073 + "proc-macro-error-attr2", 4074 4074 + "proc-macro2", 4075 4075 + "quote", 4076 4076 + "syn", 4077 4077 + ] 4078 4078 + 4079 4079 + [[package]] 2838 4080 name = "proc-macro2" 2839 4081 version = "1.0.106" 2840 4082 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2857 4099 ] 2858 4100 2859 4101 [[package]] 4102 4102 + name = "prodash" 4103 4103 + version = "31.0.0" 4104 4104 + source = "registry+https://github.com/rust-lang/crates.io-index" 4105 4105 + checksum = "962200e2d7d551451297d9fdce85138374019ada198e30ea9ede38034e27604c" 4106 4106 + dependencies = [ 4107 4107 + "bytesize", 4108 4108 + "human_format", 4109 4109 + "parking_lot", 4110 4110 + ] 4111 4111 + 4112 4112 + [[package]] 2860 4113 name = "prost" 2861 2861 - version = "0.14.3" 4114 4114 + version = "0.14.4" 2862 4115 source = "registry+https://github.com/rust-lang/crates.io-index" 2863 2863 - checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" 4116 4116 + checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" 2864 4117 dependencies = [ 2865 4118 "bytes", 2866 4119 "prost-derive", ··· 2880 4133 "prettyplease", 2881 4134 "prost", 2882 4135 "prost-types", 4136 4136 + "pulldown-cmark", 4137 4137 + "pulldown-cmark-to-cmark", 2883 4138 "regex", 2884 4139 "syn", 2885 4140 "tempfile", ··· 2887 4142 2888 4143 [[package]] 2889 4144 name = "prost-derive" 2890 2890 - version = "0.14.3" 4145 4145 + version = "0.14.4" 2891 4146 source = "registry+https://github.com/rust-lang/crates.io-index" 2892 2892 - checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" 4147 4147 + checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" 2893 4148 dependencies = [ 2894 4149 "anyhow", 2895 4150 "itertools 0.14.0", ··· 2967 4222 2968 4223 [[package]] 2969 4224 name = "prost-types" 2970 2970 - version = "0.14.3" 4225 4225 + version = "0.14.4" 2971 4226 source = "registry+https://github.com/rust-lang/crates.io-index" 2972 2972 - checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7" 4227 4227 + checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a" 2973 4228 dependencies = [ 2974 4229 "prost", 2975 4230 ] 2976 4231 2977 4232 [[package]] 4233 4233 + name = "pulldown-cmark" 4234 4234 + version = "0.13.4" 4235 4235 + source = "registry+https://github.com/rust-lang/crates.io-index" 4236 4236 + checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e" 4237 4237 + dependencies = [ 4238 4238 + "bitflags 2.11.1", 4239 4239 + "memchr", 4240 4240 + "unicase", 4241 4241 + ] 4242 4242 + 4243 4243 + [[package]] 4244 4244 + name = "pulldown-cmark-to-cmark" 4245 4245 + version = "22.0.0" 4246 4246 + source = "registry+https://github.com/rust-lang/crates.io-index" 4247 4247 + checksum = "50793def1b900256624a709439404384204a5dc3a6ec580281bfaac35e882e90" 4248 4248 + dependencies = [ 4249 4249 + "pulldown-cmark", 4250 4250 + ] 4251 4251 + 4252 4252 + [[package]] 2978 4253 name = "quick_cache" 2979 4254 version = "0.6.22" 2980 4255 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3147 4422 source = "registry+https://github.com/rust-lang/crates.io-index" 3148 4423 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" 3149 4424 dependencies = [ 3150 3150 - "bitflags", 4425 4425 + "bitflags 2.11.1", 3151 4426 ] 3152 4427 3153 4428 [[package]] ··· 3304 4579 source = "registry+https://github.com/rust-lang/crates.io-index" 3305 4580 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" 3306 4581 dependencies = [ 3307 3307 - "bitflags", 4582 4582 + "bitflags 2.11.1", 3308 4583 "errno", 3309 4584 "libc", 3310 4585 "linux-raw-sys", ··· 3445 4720 source = "registry+https://github.com/rust-lang/crates.io-index" 3446 4721 checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" 3447 4722 dependencies = [ 3448 3448 - "bitflags", 4723 4723 + "bitflags 2.11.1", 3449 4724 "core-foundation 0.10.1", 3450 4725 "core-foundation-sys", 3451 4726 "libc", ··· 3639 4914 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" 3640 4915 dependencies = [ 3641 4916 "cfg-if", 3642 3642 - "cpufeatures", 3643 3643 - "digest", 4917 4917 + "cpufeatures 0.2.17", 4918 4918 + "digest 0.10.7", 4919 4919 + ] 4920 4920 + 4921 4921 + [[package]] 4922 4922 + name = "sha1-checked" 4923 4923 + version = "0.10.0" 4924 4924 + source = "registry+https://github.com/rust-lang/crates.io-index" 4925 4925 + checksum = "89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423" 4926 4926 + dependencies = [ 4927 4927 + "digest 0.10.7", 4928 4928 + "sha1", 3644 4929 ] 3645 4930 3646 4931 [[package]] ··· 3650 4935 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" 3651 4936 dependencies = [ 3652 4937 "cfg-if", 3653 3653 - "cpufeatures", 3654 3654 - "digest", 4938 4938 + "cpufeatures 0.2.17", 4939 4939 + "digest 0.10.7", 4940 4940 + ] 4941 4941 + 4942 4942 + [[package]] 4943 4943 + name = "sha2" 4944 4944 + version = "0.11.0" 4945 4945 + source = "registry+https://github.com/rust-lang/crates.io-index" 4946 4946 + checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" 4947 4947 + dependencies = [ 4948 4948 + "cfg-if", 4949 4949 + "cpufeatures 0.3.0", 4950 4950 + "digest 0.11.3", 3655 4951 ] 3656 4952 3657 4953 [[package]] ··· 3662 4958 dependencies = [ 3663 4959 "lazy_static", 3664 4960 ] 4961 4961 + 4962 4962 + [[package]] 4963 4963 + name = "shell-words" 4964 4964 + version = "1.1.1" 4965 4965 + source = "registry+https://github.com/rust-lang/crates.io-index" 4966 4966 + checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77" 3665 4967 3666 4968 [[package]] 3667 4969 name = "shlex" ··· 3690 4992 ] 3691 4993 3692 4994 [[package]] 4995 4995 + name = "signal-hook" 4996 4996 + version = "0.4.4" 4997 4997 + source = "registry+https://github.com/rust-lang/crates.io-index" 4998 4998 + checksum = "b2a0c28ca5908dbdbcd52e6fdaa00358ab88637f8ab33e1f188dd510eb44b53d" 4999 4999 + dependencies = [ 5000 5000 + "libc", 5001 5001 + "signal-hook-registry", 5002 5002 + ] 5003 5003 + 5004 5004 + [[package]] 3693 5005 name = "signal-hook-registry" 3694 5006 version = "1.4.8" 3695 5007 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3705 5017 source = "registry+https://github.com/rust-lang/crates.io-index" 3706 5018 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" 3707 5019 dependencies = [ 3708 3708 - "digest", 5020 5020 + "digest 0.10.7", 3709 5021 "rand_core 0.6.4", 3710 5022 ] 3711 5023 ··· 3848 5160 source = "registry+https://github.com/rust-lang/crates.io-index" 3849 5161 checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" 3850 5162 dependencies = [ 3851 3851 - "bitflags", 5163 5163 + "bitflags 2.11.1", 3852 5164 "core-foundation 0.9.4", 3853 5165 "system-configuration-sys", 3854 5166 ] ··· 4216 5528 "futures-core", 4217 5529 "pin-project-lite", 4218 5530 "tokio", 5531 5531 + "tokio-util", 4219 5532 ] 4220 5533 4221 5534 [[package]] ··· 4336 5649 checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" 4337 5650 4338 5651 [[package]] 5652 5652 + name = "tonic" 5653 5653 + version = "0.14.6" 5654 5654 + source = "registry+https://github.com/rust-lang/crates.io-index" 5655 5655 + checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" 5656 5656 + dependencies = [ 5657 5657 + "async-trait", 5658 5658 + "axum", 5659 5659 + "base64", 5660 5660 + "bytes", 5661 5661 + "h2", 5662 5662 + "http", 5663 5663 + "http-body", 5664 5664 + "http-body-util", 5665 5665 + "hyper", 5666 5666 + "hyper-timeout", 5667 5667 + "hyper-util", 5668 5668 + "percent-encoding", 5669 5669 + "pin-project", 5670 5670 + "socket2", 5671 5671 + "sync_wrapper", 5672 5672 + "tokio", 5673 5673 + "tokio-stream", 5674 5674 + "tower", 5675 5675 + "tower-layer", 5676 5676 + "tower-service", 5677 5677 + "tracing", 5678 5678 + ] 5679 5679 + 5680 5680 + [[package]] 5681 5681 + name = "tonic-build" 5682 5682 + version = "0.14.6" 5683 5683 + source = "registry+https://github.com/rust-lang/crates.io-index" 5684 5684 + checksum = "c68f61875ac5293cf72e6c8cf0158086428c82c37229e98c840878f1706b0322" 5685 5685 + dependencies = [ 5686 5686 + "prettyplease", 5687 5687 + "proc-macro2", 5688 5688 + "quote", 5689 5689 + "syn", 5690 5690 + ] 5691 5691 + 5692 5692 + [[package]] 5693 5693 + name = "tonic-prost" 5694 5694 + version = "0.14.6" 5695 5695 + source = "registry+https://github.com/rust-lang/crates.io-index" 5696 5696 + checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" 5697 5697 + dependencies = [ 5698 5698 + "bytes", 5699 5699 + "prost", 5700 5700 + "tonic", 5701 5701 + ] 5702 5702 + 5703 5703 + [[package]] 5704 5704 + name = "tonic-prost-build" 5705 5705 + version = "0.14.6" 5706 5706 + source = "registry+https://github.com/rust-lang/crates.io-index" 5707 5707 + checksum = "654e5643eff75d7f8c99197ce1440ed19a3474eada74c12bbac488b2cafdae27" 5708 5708 + dependencies = [ 5709 5709 + "prettyplease", 5710 5710 + "proc-macro2", 5711 5711 + "prost-build", 5712 5712 + "prost-types", 5713 5713 + "quote", 5714 5714 + "syn", 5715 5715 + "tempfile", 5716 5716 + "tonic-build", 5717 5717 + ] 5718 5718 + 5719 5719 + [[package]] 4339 5720 name = "tower" 4340 5721 version = "0.5.3" 4341 5722 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4343 5724 dependencies = [ 4344 5725 "futures-core", 4345 5726 "futures-util", 5727 5727 + "indexmap", 4346 5728 "pin-project-lite", 5729 5729 + "slab", 4347 5730 "sync_wrapper", 4348 5731 "tokio", 5732 5732 + "tokio-util", 4349 5733 "tower-layer", 4350 5734 "tower-service", 4351 5735 "tracing", ··· 4358 5742 checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" 4359 5743 dependencies = [ 4360 5744 "async-compression", 4361 4361 - "bitflags", 5745 5745 + "bitflags 2.11.1", 4362 5746 "bytes", 4363 5747 "futures-core", 4364 5748 "futures-util", ··· 4560 5944 ] 4561 5945 4562 5946 [[package]] 5947 5947 + name = "uluru" 5948 5948 + version = "3.1.0" 5949 5949 + source = "registry+https://github.com/rust-lang/crates.io-index" 5950 5950 + checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" 5951 5951 + dependencies = [ 5952 5952 + "arrayvec", 5953 5953 + ] 5954 5954 + 5955 5955 + [[package]] 5956 5956 + name = "unicase" 5957 5957 + version = "2.9.0" 5958 5958 + source = "registry+https://github.com/rust-lang/crates.io-index" 5959 5959 + checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" 5960 5960 + 5961 5961 + [[package]] 5962 5962 + name = "unicode-bom" 5963 5963 + version = "2.0.3" 5964 5964 + source = "registry+https://github.com/rust-lang/crates.io-index" 5965 5965 + checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" 5966 5966 + 5967 5967 + [[package]] 4563 5968 name = "unicode-ident" 4564 5969 version = "1.0.24" 4565 5970 source = "registry+https://github.com/rust-lang/crates.io-index" 4566 5971 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" 4567 5972 4568 5973 [[package]] 5974 5974 + name = "unicode-normalization" 5975 5975 + version = "0.1.25" 5976 5976 + source = "registry+https://github.com/rust-lang/crates.io-index" 5977 5977 + checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" 5978 5978 + dependencies = [ 5979 5979 + "tinyvec", 5980 5980 + ] 5981 5981 + 5982 5982 + [[package]] 4569 5983 name = "unicode-segmentation" 4570 5984 version = "1.13.2" 4571 5985 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4805 6219 source = "registry+https://github.com/rust-lang/crates.io-index" 4806 6220 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" 4807 6221 dependencies = [ 4808 4808 - "bitflags", 6222 6222 + "bitflags 2.11.1", 4809 6223 "hashbrown 0.15.5", 4810 6224 "indexmap", 4811 6225 "semver", ··· 5214 6628 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" 5215 6629 dependencies = [ 5216 6630 "anyhow", 5217 5217 - "bitflags", 6631 6631 + "bitflags 2.11.1", 5218 6632 "indexmap", 5219 6633 "log", 5220 6634 "serde", ··· 5358 6772 "quote", 5359 6773 "syn", 5360 6774 ] 6775 6775 + 6776 6776 + [[package]] 6777 6777 + name = "zlib-rs" 6778 6778 + version = "0.6.4" 6779 6779 + source = "registry+https://github.com/rust-lang/crates.io-index" 6780 6780 + checksum = "977347db8caa080403f6b6b7c1cda9479a8e869316f7e13a59b19076a40f94e3" 5361 6781 5362 6782 [[package]] 5363 6783 name = "zmij"

+6 -1

Cargo.toml

View file Reviewed

··· 1 1 [workspace] 2 2 resolver = "2" 3 3 - members = ["bobbin/crates/*", "shuttle"] 3 3 + members = ["bobbin/crates/*", "shuttle", "gitmirror"] 4 4 exclude = ["sites"] 5 5 6 6 [workspace.package] ··· 84 84 85 85 tracing = "0.1" 86 86 tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json"] } 87 87 + 88 88 + tonic = "0.14" 89 89 + tonic-prost = "0.14" 90 90 + tonic-prost-build = "0.14" 91 91 + prost = "0.14" 87 92 88 93 thiserror = "2" 89 94

+15

docker-compose.yml

View file Reviewed

··· 284 284 condition: service_started 285 285 networks: [tngl] 286 286 287 287 + gitmirror: 288 288 + build: 289 289 + context: . 290 290 + dockerfile: localinfra/gitmirror.Dockerfile 291 291 + restart: unless-stopped 292 292 + environment: 293 293 + RUST_LOG: gitmirror=debug 294 294 + GITMIRROR_ADDR: 0.0.0.0:9000 295 295 + GITMIRROR_REPO_BASE: /data/repos 296 296 + volumes: 297 297 + - knotmirror-data:/data 298 298 + - ./localinfra/certs/root.crt:/usr/local/share/ca-certificates/caddy.crt:ro 299 299 + networks: [tngl] 300 300 + 287 301 zoekt-webserver: 288 302 build: 289 303 context: https://tangled.org/boltless.me/zoekt.git#tngl ··· 397 411 - spindle.tngl.boltless.dev 398 412 - tngl.boltless.dev 399 413 - mirror.tngl.boltless.dev 414 414 + - gitmirror.tngl.boltless.dev 400 415 - zoekt.tngl.boltless.dev 401 416 - pdsls.tngl.boltless.dev 402 417

+3

flake.nix

View file Reviewed

··· 362 362 pkgs.protoc-gen-prost-crate 363 363 pkgs.protoc-gen-prost-serde 364 364 pkgs.protoc-gen-go 365 365 + pkgs.protoc-gen-go-grpc 365 366 (fenix.packages.${system}.combine [ 366 367 fenix.packages.${system}.stable.cargo 367 368 fenix.packages.${system}.stable.rustc ··· 476 477 cd "$rootDir" 477 478 echo ">>> regenerating protobuf files.." 478 479 buf generate 480 480 + echo ">>> regenerating gitmirror go stubs..." 481 481 + buf generate gitmirror --template gitmirror/buf.gen.yaml 479 482 echo ">>> generating file descriptor set for shuttle..." 480 483 buf build -o shuttle/src/gen/file_descriptor_set.bin 481 484 echo ">>> done"

+28

gitmirror/Cargo.toml

View file Reviewed

··· 1 1 + [package] 2 2 + name = "gitmirror" 3 3 + version = "0.1.0" 4 4 + edition.workspace = true 5 5 + license.workspace = true 6 6 + rust-version.workspace = true 7 7 + 8 8 + [dependencies] 9 9 + anyhow = { workspace = true } 10 10 + clap = { workspace = true } 11 11 + tonic = { workspace = true } 12 12 + tonic-prost = { workspace = true } 13 13 + prost = { workspace = true } 14 14 + tokio = { workspace = true, features = ["net", "rt-multi-thread", "sync"] } 15 15 + tokio-stream = { workspace = true, features = ["sync"] } 16 16 + tracing = "0.1" 17 17 + tracing-subscriber = { version = "0.3", features = ["env-filter"] } 18 18 + line-numbers = "0.4.0" 19 19 + rustc-hash = "2.1.2" 20 20 + gix = { version = "0.84", features = ["parallel", "blob-diff", "merge", "sha1", "sha256", "revision", "tree-editor"] } 21 21 + prost-types = "0.14.4" 22 22 + tempfile = "3" 23 23 + 24 24 + [build-dependencies] 25 25 + tonic-prost-build = { workspace = true } 26 26 + 27 27 + [lints] 28 28 + workspace = true

+4

gitmirror/README.md

View file Reviewed

··· 1 1 + # Gitmirror 2 2 + 3 3 + gitmirror is alternative name of Knotmirror v2. It is designed to be run under the AppView as git syncing service. 4 4 + Because it's internal sync service like tap or hydrant, it uses grpc over xrpc.

+12

gitmirror/buf.gen.yaml

View file Reviewed

··· 1 1 + version: v2 2 2 + plugins: 3 3 + - local: protoc-gen-go 4 4 + out: . 5 5 + opt: 6 6 + - paths=import 7 7 + - module=tangled.org/core 8 8 + - local: protoc-gen-go-grpc 9 9 + out: . 10 10 + opt: 11 11 + - paths=import 12 12 + - module=tangled.org/core

+3

gitmirror/buf.yaml

View file Reviewed

··· 1 1 + version: v2 2 2 + modules: 3 3 + - path: proto

+4

gitmirror/build.rs

View file Reviewed

··· 1 1 + fn main() -> Result<(), Box<dyn std::error::Error>> { 2 2 + tonic_prost_build::compile_protos("proto/gitmirror/v1/gitmirror.proto")?; 3 3 + Ok(()) 4 4 + }

+42

gitmirror/example/client.go

View file Reviewed

··· 1 1 + //go:build ignore 2 2 + 3 3 + // Example: how appview will call gitmirror's GitMirrorService. 4 4 + // 5 5 + // This file is build-ignored so it never breaks `go build ./...`. It is a 6 6 + // copy-ready reference for wiring the client into appview once the Go stubs 7 7 + // are generated (see gitmirror/buf.gen.yaml). 8 8 + package main 9 9 + 10 10 + import ( 11 11 + "context" 12 12 + "log" 13 13 + "time" 14 14 + 15 15 + "google.golang.org/grpc" 16 16 + "google.golang.org/grpc/credentials/insecure" 17 17 + 18 18 + gitmirrorv1 "tangled.org/core/gitmirror/proto/gen" 19 19 + ) 20 20 + 21 21 + func main() { 22 22 + conn, err := grpc.NewClient("127.0.0.1:9000", 23 23 + grpc.WithTransportCredentials(insecure.NewCredentials())) 24 24 + if err != nil { 25 25 + log.Fatal(err) 26 26 + } 27 27 + defer conn.Close() 28 28 + 29 29 + client := gitmirrorv1.NewGitMirrorServiceClient(conn) 30 30 + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) 31 31 + defer cancel() 32 32 + 33 33 + // appview converts its syntax.DID to a string via did.String(). 34 34 + resp, err := client.Commits(ctx, &gitmirrorv1.CommitsRequest{ 35 35 + Repo: "did:plc:example", 36 36 + Options: &gitmirrorv1.CommitsOptions{}, 37 37 + }) 38 38 + if err != nil { 39 39 + log.Fatal(err) 40 40 + } 41 41 + log.Println(resp.GetCommits()) 42 42 + }

+1470

gitmirror/proto/gen/gitmirror.pb.go

View file Reviewed

··· 1 1 + // Code generated by protoc-gen-go. DO NOT EDIT. 2 2 + // versions: 3 3 + // protoc-gen-go v1.36.11 4 4 + // protoc (unknown) 5 5 + // source: gitmirror/v1/gitmirror.proto 6 6 + 7 7 + package gitmirrorv1 8 8 + 9 9 + import ( 10 10 + protoreflect "google.golang.org/protobuf/reflect/protoreflect" 11 11 + protoimpl "google.golang.org/protobuf/runtime/protoimpl" 12 12 + timestamppb "google.golang.org/protobuf/types/known/timestamppb" 13 13 + reflect "reflect" 14 14 + sync "sync" 15 15 + unsafe "unsafe" 16 16 + ) 17 17 + 18 18 + const ( 19 19 + // Verify that this generated code is sufficiently up-to-date. 20 20 + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) 21 21 + // Verify that runtime/protoimpl is sufficiently up-to-date. 22 22 + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) 23 23 + ) 24 24 + 25 25 + type DiffRequest_ComparisonType int32 26 26 + 27 27 + const ( 28 28 + DiffRequest_COMPARISON_TYPE_UNSPECIFIED DiffRequest_ComparisonType = 0 29 29 + // Corresponds to the BASE..HEAD syntax that only returns any commits that 30 30 + // are in HEAD but not in BASE. 31 31 + DiffRequest_COMPARISON_TYPE_ONLY_IN_HEAD DiffRequest_ComparisonType = 1 32 32 + // Corresponds to the BASE...HEAD syntax that returns any commits that are 33 33 + // not in both BASE and HEAD. 34 34 + DiffRequest_COMPARISON_TYPE_INTERSECTION DiffRequest_ComparisonType = 2 35 35 + ) 36 36 + 37 37 + // Enum value maps for DiffRequest_ComparisonType. 38 38 + var ( 39 39 + DiffRequest_ComparisonType_name = map[int32]string{ 40 40 + 0: "COMPARISON_TYPE_UNSPECIFIED", 41 41 + 1: "COMPARISON_TYPE_ONLY_IN_HEAD", 42 42 + 2: "COMPARISON_TYPE_INTERSECTION", 43 43 + } 44 44 + DiffRequest_ComparisonType_value = map[string]int32{ 45 45 + "COMPARISON_TYPE_UNSPECIFIED": 0, 46 46 + "COMPARISON_TYPE_ONLY_IN_HEAD": 1, 47 47 + "COMPARISON_TYPE_INTERSECTION": 2, 48 48 + } 49 49 + ) 50 50 + 51 51 + func (x DiffRequest_ComparisonType) Enum() *DiffRequest_ComparisonType { 52 52 + p := new(DiffRequest_ComparisonType) 53 53 + *p = x 54 54 + return p 55 55 + } 56 56 + 57 57 + func (x DiffRequest_ComparisonType) String() string { 58 58 + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) 59 59 + } 60 60 + 61 61 + func (DiffRequest_ComparisonType) Descriptor() protoreflect.EnumDescriptor { 62 62 + return file_gitmirror_v1_gitmirror_proto_enumTypes[0].Descriptor() 63 63 + } 64 64 + 65 65 + func (DiffRequest_ComparisonType) Type() protoreflect.EnumType { 66 66 + return &file_gitmirror_v1_gitmirror_proto_enumTypes[0] 67 67 + } 68 68 + 69 69 + func (x DiffRequest_ComparisonType) Number() protoreflect.EnumNumber { 70 70 + return protoreflect.EnumNumber(x) 71 71 + } 72 72 + 73 73 + // Deprecated: Use DiffRequest_ComparisonType.Descriptor instead. 74 74 + func (DiffRequest_ComparisonType) EnumDescriptor() ([]byte, []int) { 75 75 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{10, 0} 76 76 + } 77 77 + 78 78 + type ResolveRevRequest struct { 79 79 + state protoimpl.MessageState `protogen:"open.v1"` 80 80 + // repo carries the DID as a string. 81 81 + Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` 82 82 + // rev is a SIMPLE revspec: a branch name, tag name, or short/full commit oid. 83 83 + // HEAD and revspec navigation (HEAD~2, foo^, ref@{...}, a..b, path:file) are rejected. 84 84 + Rev []byte `protobuf:"bytes,2,opt,name=rev,proto3" json:"rev,omitempty"` 85 85 + unknownFields protoimpl.UnknownFields 86 86 + sizeCache protoimpl.SizeCache 87 87 + } 88 88 + 89 89 + func (x *ResolveRevRequest) Reset() { 90 90 + *x = ResolveRevRequest{} 91 91 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[0] 92 92 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 93 93 + ms.StoreMessageInfo(mi) 94 94 + } 95 95 + 96 96 + func (x *ResolveRevRequest) String() string { 97 97 + return protoimpl.X.MessageStringOf(x) 98 98 + } 99 99 + 100 100 + func (*ResolveRevRequest) ProtoMessage() {} 101 101 + 102 102 + func (x *ResolveRevRequest) ProtoReflect() protoreflect.Message { 103 103 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[0] 104 104 + if x != nil { 105 105 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 106 106 + if ms.LoadMessageInfo() == nil { 107 107 + ms.StoreMessageInfo(mi) 108 108 + } 109 109 + return ms 110 110 + } 111 111 + return mi.MessageOf(x) 112 112 + } 113 113 + 114 114 + // Deprecated: Use ResolveRevRequest.ProtoReflect.Descriptor instead. 115 115 + func (*ResolveRevRequest) Descriptor() ([]byte, []int) { 116 116 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{0} 117 117 + } 118 118 + 119 119 + func (x *ResolveRevRequest) GetRepo() string { 120 120 + if x != nil { 121 121 + return x.Repo 122 122 + } 123 123 + return "" 124 124 + } 125 125 + 126 126 + func (x *ResolveRevRequest) GetRev() []byte { 127 127 + if x != nil { 128 128 + return x.Rev 129 129 + } 130 130 + return nil 131 131 + } 132 132 + 133 133 + type ResolveRevResponse struct { 134 134 + state protoimpl.MessageState `protogen:"open.v1"` 135 135 + // commit is the resolved commit object id, hex-encoded. 136 136 + Commit string `protobuf:"bytes,1,opt,name=commit,proto3" json:"commit,omitempty"` 137 137 + unknownFields protoimpl.UnknownFields 138 138 + sizeCache protoimpl.SizeCache 139 139 + } 140 140 + 141 141 + func (x *ResolveRevResponse) Reset() { 142 142 + *x = ResolveRevResponse{} 143 143 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[1] 144 144 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 145 145 + ms.StoreMessageInfo(mi) 146 146 + } 147 147 + 148 148 + func (x *ResolveRevResponse) String() string { 149 149 + return protoimpl.X.MessageStringOf(x) 150 150 + } 151 151 + 152 152 + func (*ResolveRevResponse) ProtoMessage() {} 153 153 + 154 154 + func (x *ResolveRevResponse) ProtoReflect() protoreflect.Message { 155 155 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[1] 156 156 + if x != nil { 157 157 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 158 158 + if ms.LoadMessageInfo() == nil { 159 159 + ms.StoreMessageInfo(mi) 160 160 + } 161 161 + return ms 162 162 + } 163 163 + return mi.MessageOf(x) 164 164 + } 165 165 + 166 166 + // Deprecated: Use ResolveRevResponse.ProtoReflect.Descriptor instead. 167 167 + func (*ResolveRevResponse) Descriptor() ([]byte, []int) { 168 168 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{1} 169 169 + } 170 170 + 171 171 + func (x *ResolveRevResponse) GetCommit() string { 172 172 + if x != nil { 173 173 + return x.Commit 174 174 + } 175 175 + return "" 176 176 + } 177 177 + 178 178 + // A commit in a specific repo, addressed by the repo's DID. 179 179 + type RepoCommit struct { 180 180 + state protoimpl.MessageState `protogen:"open.v1"` 181 181 + // repo carries the DID as a string. 182 182 + Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` 183 183 + // commit is a full commit object id, hex-encoded (NOT a revspec/branch/tag). 184 184 + Commit []byte `protobuf:"bytes,2,opt,name=commit,proto3" json:"commit,omitempty"` 185 185 + unknownFields protoimpl.UnknownFields 186 186 + sizeCache protoimpl.SizeCache 187 187 + } 188 188 + 189 189 + func (x *RepoCommit) Reset() { 190 190 + *x = RepoCommit{} 191 191 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[2] 192 192 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 193 193 + ms.StoreMessageInfo(mi) 194 194 + } 195 195 + 196 196 + func (x *RepoCommit) String() string { 197 197 + return protoimpl.X.MessageStringOf(x) 198 198 + } 199 199 + 200 200 + func (*RepoCommit) ProtoMessage() {} 201 201 + 202 202 + func (x *RepoCommit) ProtoReflect() protoreflect.Message { 203 203 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[2] 204 204 + if x != nil { 205 205 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 206 206 + if ms.LoadMessageInfo() == nil { 207 207 + ms.StoreMessageInfo(mi) 208 208 + } 209 209 + return ms 210 210 + } 211 211 + return mi.MessageOf(x) 212 212 + } 213 213 + 214 214 + // Deprecated: Use RepoCommit.ProtoReflect.Descriptor instead. 215 215 + func (*RepoCommit) Descriptor() ([]byte, []int) { 216 216 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{2} 217 217 + } 218 218 + 219 219 + func (x *RepoCommit) GetRepo() string { 220 220 + if x != nil { 221 221 + return x.Repo 222 222 + } 223 223 + return "" 224 224 + } 225 225 + 226 226 + func (x *RepoCommit) GetCommit() []byte { 227 227 + if x != nil { 228 228 + return x.Commit 229 229 + } 230 230 + return nil 231 231 + } 232 232 + 233 233 + type MergeCheckRequest struct { 234 234 + state protoimpl.MessageState `protogen:"open.v1"` 235 235 + // Branch/commit being merged into (the "ours" side of the 3-way merge). 236 236 + Target *RepoCommit `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"` 237 237 + // PR head being merged (the "theirs" side of the 3-way merge). 238 238 + Source *RepoCommit `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"` 239 239 + unknownFields protoimpl.UnknownFields 240 240 + sizeCache protoimpl.SizeCache 241 241 + } 242 242 + 243 243 + func (x *MergeCheckRequest) Reset() { 244 244 + *x = MergeCheckRequest{} 245 245 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[3] 246 246 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 247 247 + ms.StoreMessageInfo(mi) 248 248 + } 249 249 + 250 250 + func (x *MergeCheckRequest) String() string { 251 251 + return protoimpl.X.MessageStringOf(x) 252 252 + } 253 253 + 254 254 + func (*MergeCheckRequest) ProtoMessage() {} 255 255 + 256 256 + func (x *MergeCheckRequest) ProtoReflect() protoreflect.Message { 257 257 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[3] 258 258 + if x != nil { 259 259 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 260 260 + if ms.LoadMessageInfo() == nil { 261 261 + ms.StoreMessageInfo(mi) 262 262 + } 263 263 + return ms 264 264 + } 265 265 + return mi.MessageOf(x) 266 266 + } 267 267 + 268 268 + // Deprecated: Use MergeCheckRequest.ProtoReflect.Descriptor instead. 269 269 + func (*MergeCheckRequest) Descriptor() ([]byte, []int) { 270 270 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{3} 271 271 + } 272 272 + 273 273 + func (x *MergeCheckRequest) GetTarget() *RepoCommit { 274 274 + if x != nil { 275 275 + return x.Target 276 276 + } 277 277 + return nil 278 278 + } 279 279 + 280 280 + func (x *MergeCheckRequest) GetSource() *RepoCommit { 281 281 + if x != nil { 282 282 + return x.Source 283 283 + } 284 284 + return nil 285 285 + } 286 286 + 287 287 + type MergeCheckResponse struct { 288 288 + state protoimpl.MessageState `protogen:"open.v1"` 289 289 + // Whether the 3-way merge has unresolved conflicts. 290 290 + IsConflicted bool `protobuf:"varint,1,opt,name=is_conflicted,json=isConflicted,proto3" json:"is_conflicted,omitempty"` 291 291 + // One entry per conflicted file. 292 292 + Conflicts []*MergeConflict `protobuf:"bytes,2,rep,name=conflicts,proto3" json:"conflicts,omitempty"` 293 293 + // Optional human-readable summary of the merge check. 294 294 + Message *string `protobuf:"bytes,3,opt,name=message,proto3,oneof" json:"message,omitempty"` 295 295 + unknownFields protoimpl.UnknownFields 296 296 + sizeCache protoimpl.SizeCache 297 297 + } 298 298 + 299 299 + func (x *MergeCheckResponse) Reset() { 300 300 + *x = MergeCheckResponse{} 301 301 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[4] 302 302 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 303 303 + ms.StoreMessageInfo(mi) 304 304 + } 305 305 + 306 306 + func (x *MergeCheckResponse) String() string { 307 307 + return protoimpl.X.MessageStringOf(x) 308 308 + } 309 309 + 310 310 + func (*MergeCheckResponse) ProtoMessage() {} 311 311 + 312 312 + func (x *MergeCheckResponse) ProtoReflect() protoreflect.Message { 313 313 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[4] 314 314 + if x != nil { 315 315 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 316 316 + if ms.LoadMessageInfo() == nil { 317 317 + ms.StoreMessageInfo(mi) 318 318 + } 319 319 + return ms 320 320 + } 321 321 + return mi.MessageOf(x) 322 322 + } 323 323 + 324 324 + // Deprecated: Use MergeCheckResponse.ProtoReflect.Descriptor instead. 325 325 + func (*MergeCheckResponse) Descriptor() ([]byte, []int) { 326 326 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{4} 327 327 + } 328 328 + 329 329 + func (x *MergeCheckResponse) GetIsConflicted() bool { 330 330 + if x != nil { 331 331 + return x.IsConflicted 332 332 + } 333 333 + return false 334 334 + } 335 335 + 336 336 + func (x *MergeCheckResponse) GetConflicts() []*MergeConflict { 337 337 + if x != nil { 338 338 + return x.Conflicts 339 339 + } 340 340 + return nil 341 341 + } 342 342 + 343 343 + func (x *MergeCheckResponse) GetMessage() string { 344 344 + if x != nil && x.Message != nil { 345 345 + return *x.Message 346 346 + } 347 347 + return "" 348 348 + } 349 349 + 350 350 + type MergeConflict struct { 351 351 + state protoimpl.MessageState `protogen:"open.v1"` 352 352 + Filename string `protobuf:"bytes,1,opt,name=filename,proto3" json:"filename,omitempty"` 353 353 + Reason string `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason,omitempty"` 354 354 + unknownFields protoimpl.UnknownFields 355 355 + sizeCache protoimpl.SizeCache 356 356 + } 357 357 + 358 358 + func (x *MergeConflict) Reset() { 359 359 + *x = MergeConflict{} 360 360 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[5] 361 361 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 362 362 + ms.StoreMessageInfo(mi) 363 363 + } 364 364 + 365 365 + func (x *MergeConflict) String() string { 366 366 + return protoimpl.X.MessageStringOf(x) 367 367 + } 368 368 + 369 369 + func (*MergeConflict) ProtoMessage() {} 370 370 + 371 371 + func (x *MergeConflict) ProtoReflect() protoreflect.Message { 372 372 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[5] 373 373 + if x != nil { 374 374 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 375 375 + if ms.LoadMessageInfo() == nil { 376 376 + ms.StoreMessageInfo(mi) 377 377 + } 378 378 + return ms 379 379 + } 380 380 + return mi.MessageOf(x) 381 381 + } 382 382 + 383 383 + // Deprecated: Use MergeConflict.ProtoReflect.Descriptor instead. 384 384 + func (*MergeConflict) Descriptor() ([]byte, []int) { 385 385 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{5} 386 386 + } 387 387 + 388 388 + func (x *MergeConflict) GetFilename() string { 389 389 + if x != nil { 390 390 + return x.Filename 391 391 + } 392 392 + return "" 393 393 + } 394 394 + 395 395 + func (x *MergeConflict) GetReason() string { 396 396 + if x != nil { 397 397 + return x.Reason 398 398 + } 399 399 + return "" 400 400 + } 401 401 + 402 402 + type CommitLogRequest struct { 403 403 + state protoimpl.MessageState `protogen:"open.v1"` 404 404 + // repo DID 405 405 + Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` 406 406 + // Ranges to include in the git log (revspec, "A..B", "A...B", etc.). 407 407 + // At least one range, or all_refs must be specified. 408 408 + Ranges [][]byte `protobuf:"bytes,2,rep,name=ranges,proto3" json:"ranges,omitempty"` 409 409 + // If true, all refs are searched for commits. 410 410 + // Must not be true when ranges are given. 411 411 + AllRefs bool `protobuf:"varint,3,opt,name=all_refs,json=allRefs,proto3" json:"all_refs,omitempty"` 412 412 + // After is an optional parameter to specify the earliest commit to consider. 413 413 + After *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=after,proto3" json:"after,omitempty"` 414 414 + // Before is an optional parameter to specify the latest commit to consider. 415 415 + Before *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=before,proto3" json:"before,omitempty"` 416 416 + // MaxCommits is an optional parameter to specify the maximum number of commits 417 417 + // to return. If max_commits is 0, all commits that match the criteria will be 418 418 + // returned. 419 419 + MaxCommits uint32 `protobuf:"varint,6,opt,name=max_commits,json=maxCommits,proto3" json:"max_commits,omitempty"` 420 420 + // Skip is an optional parameter to specify the number of commits to skip. 421 421 + // This can be used to implement a poor mans pagination. 422 422 + Skip uint32 `protobuf:"varint,7,opt,name=skip,proto3" json:"skip,omitempty"` 423 423 + unknownFields protoimpl.UnknownFields 424 424 + sizeCache protoimpl.SizeCache 425 425 + } 426 426 + 427 427 + func (x *CommitLogRequest) Reset() { 428 428 + *x = CommitLogRequest{} 429 429 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[6] 430 430 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 431 431 + ms.StoreMessageInfo(mi) 432 432 + } 433 433 + 434 434 + func (x *CommitLogRequest) String() string { 435 435 + return protoimpl.X.MessageStringOf(x) 436 436 + } 437 437 + 438 438 + func (*CommitLogRequest) ProtoMessage() {} 439 439 + 440 440 + func (x *CommitLogRequest) ProtoReflect() protoreflect.Message { 441 441 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[6] 442 442 + if x != nil { 443 443 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 444 444 + if ms.LoadMessageInfo() == nil { 445 445 + ms.StoreMessageInfo(mi) 446 446 + } 447 447 + return ms 448 448 + } 449 449 + return mi.MessageOf(x) 450 450 + } 451 451 + 452 452 + // Deprecated: Use CommitLogRequest.ProtoReflect.Descriptor instead. 453 453 + func (*CommitLogRequest) Descriptor() ([]byte, []int) { 454 454 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{6} 455 455 + } 456 456 + 457 457 + func (x *CommitLogRequest) GetRepo() string { 458 458 + if x != nil { 459 459 + return x.Repo 460 460 + } 461 461 + return "" 462 462 + } 463 463 + 464 464 + func (x *CommitLogRequest) GetRanges() [][]byte { 465 465 + if x != nil { 466 466 + return x.Ranges 467 467 + } 468 468 + return nil 469 469 + } 470 470 + 471 471 + func (x *CommitLogRequest) GetAllRefs() bool { 472 472 + if x != nil { 473 473 + return x.AllRefs 474 474 + } 475 475 + return false 476 476 + } 477 477 + 478 478 + func (x *CommitLogRequest) GetAfter() *timestamppb.Timestamp { 479 479 + if x != nil { 480 480 + return x.After 481 481 + } 482 482 + return nil 483 483 + } 484 484 + 485 485 + func (x *CommitLogRequest) GetBefore() *timestamppb.Timestamp { 486 486 + if x != nil { 487 487 + return x.Before 488 488 + } 489 489 + return nil 490 490 + } 491 491 + 492 492 + func (x *CommitLogRequest) GetMaxCommits() uint32 { 493 493 + if x != nil { 494 494 + return x.MaxCommits 495 495 + } 496 496 + return 0 497 497 + } 498 498 + 499 499 + func (x *CommitLogRequest) GetSkip() uint32 { 500 500 + if x != nil { 501 501 + return x.Skip 502 502 + } 503 503 + return 0 504 504 + } 505 505 + 506 506 + type CommitLogResponse struct { 507 507 + state protoimpl.MessageState `protogen:"open.v1"` 508 508 + Commits []*GitCommit `protobuf:"bytes,1,rep,name=commits,proto3" json:"commits,omitempty"` 509 509 + unknownFields protoimpl.UnknownFields 510 510 + sizeCache protoimpl.SizeCache 511 511 + } 512 512 + 513 513 + func (x *CommitLogResponse) Reset() { 514 514 + *x = CommitLogResponse{} 515 515 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[7] 516 516 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 517 517 + ms.StoreMessageInfo(mi) 518 518 + } 519 519 + 520 520 + func (x *CommitLogResponse) String() string { 521 521 + return protoimpl.X.MessageStringOf(x) 522 522 + } 523 523 + 524 524 + func (*CommitLogResponse) ProtoMessage() {} 525 525 + 526 526 + func (x *CommitLogResponse) ProtoReflect() protoreflect.Message { 527 527 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[7] 528 528 + if x != nil { 529 529 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 530 530 + if ms.LoadMessageInfo() == nil { 531 531 + ms.StoreMessageInfo(mi) 532 532 + } 533 533 + return ms 534 534 + } 535 535 + return mi.MessageOf(x) 536 536 + } 537 537 + 538 538 + // Deprecated: Use CommitLogResponse.ProtoReflect.Descriptor instead. 539 539 + func (*CommitLogResponse) Descriptor() ([]byte, []int) { 540 540 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{7} 541 541 + } 542 542 + 543 543 + func (x *CommitLogResponse) GetCommits() []*GitCommit { 544 544 + if x != nil { 545 545 + return x.Commits 546 546 + } 547 547 + return nil 548 548 + } 549 549 + 550 550 + type GetBlobRequest struct { 551 551 + state protoimpl.MessageState `protogen:"open.v1"` 552 552 + // repo carries the DID as a string. 553 553 + Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` 554 554 + // oid is the blob object id (hex). 555 555 + Oid string `protobuf:"bytes,2,opt,name=oid,proto3" json:"oid,omitempty"` 556 556 + unknownFields protoimpl.UnknownFields 557 557 + sizeCache protoimpl.SizeCache 558 558 + } 559 559 + 560 560 + func (x *GetBlobRequest) Reset() { 561 561 + *x = GetBlobRequest{} 562 562 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[8] 563 563 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 564 564 + ms.StoreMessageInfo(mi) 565 565 + } 566 566 + 567 567 + func (x *GetBlobRequest) String() string { 568 568 + return protoimpl.X.MessageStringOf(x) 569 569 + } 570 570 + 571 571 + func (*GetBlobRequest) ProtoMessage() {} 572 572 + 573 573 + func (x *GetBlobRequest) ProtoReflect() protoreflect.Message { 574 574 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[8] 575 575 + if x != nil { 576 576 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 577 577 + if ms.LoadMessageInfo() == nil { 578 578 + ms.StoreMessageInfo(mi) 579 579 + } 580 580 + return ms 581 581 + } 582 582 + return mi.MessageOf(x) 583 583 + } 584 584 + 585 585 + // Deprecated: Use GetBlobRequest.ProtoReflect.Descriptor instead. 586 586 + func (*GetBlobRequest) Descriptor() ([]byte, []int) { 587 587 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{8} 588 588 + } 589 589 + 590 590 + func (x *GetBlobRequest) GetRepo() string { 591 591 + if x != nil { 592 592 + return x.Repo 593 593 + } 594 594 + return "" 595 595 + } 596 596 + 597 597 + func (x *GetBlobRequest) GetOid() string { 598 598 + if x != nil { 599 599 + return x.Oid 600 600 + } 601 601 + return "" 602 602 + } 603 603 + 604 604 + type BlobChunk struct { 605 605 + state protoimpl.MessageState `protogen:"open.v1"` 606 606 + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` 607 607 + unknownFields protoimpl.UnknownFields 608 608 + sizeCache protoimpl.SizeCache 609 609 + } 610 610 + 611 611 + func (x *BlobChunk) Reset() { 612 612 + *x = BlobChunk{} 613 613 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[9] 614 614 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 615 615 + ms.StoreMessageInfo(mi) 616 616 + } 617 617 + 618 618 + func (x *BlobChunk) String() string { 619 619 + return protoimpl.X.MessageStringOf(x) 620 620 + } 621 621 + 622 622 + func (*BlobChunk) ProtoMessage() {} 623 623 + 624 624 + func (x *BlobChunk) ProtoReflect() protoreflect.Message { 625 625 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[9] 626 626 + if x != nil { 627 627 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 628 628 + if ms.LoadMessageInfo() == nil { 629 629 + ms.StoreMessageInfo(mi) 630 630 + } 631 631 + return ms 632 632 + } 633 633 + return mi.MessageOf(x) 634 634 + } 635 635 + 636 636 + // Deprecated: Use BlobChunk.ProtoReflect.Descriptor instead. 637 637 + func (*BlobChunk) Descriptor() ([]byte, []int) { 638 638 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{9} 639 639 + } 640 640 + 641 641 + func (x *BlobChunk) GetData() []byte { 642 642 + if x != nil { 643 643 + return x.Data 644 644 + } 645 645 + return nil 646 646 + } 647 647 + 648 648 + type DiffRequest struct { 649 649 + state protoimpl.MessageState `protogen:"open.v1"` 650 650 + Base *RepoCommit `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` 651 651 + Head *RepoCommit `protobuf:"bytes,2,opt,name=head,proto3" json:"head,omitempty"` 652 652 + ComparisonType DiffRequest_ComparisonType `protobuf:"varint,3,opt,name=comparison_type,json=comparisonType,proto3,enum=gitmirror.v1.DiffRequest_ComparisonType" json:"comparison_type,omitempty"` 653 653 + unknownFields protoimpl.UnknownFields 654 654 + sizeCache protoimpl.SizeCache 655 655 + } 656 656 + 657 657 + func (x *DiffRequest) Reset() { 658 658 + *x = DiffRequest{} 659 659 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[10] 660 660 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 661 661 + ms.StoreMessageInfo(mi) 662 662 + } 663 663 + 664 664 + func (x *DiffRequest) String() string { 665 665 + return protoimpl.X.MessageStringOf(x) 666 666 + } 667 667 + 668 668 + func (*DiffRequest) ProtoMessage() {} 669 669 + 670 670 + func (x *DiffRequest) ProtoReflect() protoreflect.Message { 671 671 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[10] 672 672 + if x != nil { 673 673 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 674 674 + if ms.LoadMessageInfo() == nil { 675 675 + ms.StoreMessageInfo(mi) 676 676 + } 677 677 + return ms 678 678 + } 679 679 + return mi.MessageOf(x) 680 680 + } 681 681 + 682 682 + // Deprecated: Use DiffRequest.ProtoReflect.Descriptor instead. 683 683 + func (*DiffRequest) Descriptor() ([]byte, []int) { 684 684 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{10} 685 685 + } 686 686 + 687 687 + func (x *DiffRequest) GetBase() *RepoCommit { 688 688 + if x != nil { 689 689 + return x.Base 690 690 + } 691 691 + return nil 692 692 + } 693 693 + 694 694 + func (x *DiffRequest) GetHead() *RepoCommit { 695 695 + if x != nil { 696 696 + return x.Head 697 697 + } 698 698 + return nil 699 699 + } 700 700 + 701 701 + func (x *DiffRequest) GetComparisonType() DiffRequest_ComparisonType { 702 702 + if x != nil { 703 703 + return x.ComparisonType 704 704 + } 705 705 + return DiffRequest_COMPARISON_TYPE_UNSPECIFIED 706 706 + } 707 707 + 708 708 + type InterdiffRequest struct { 709 709 + state protoimpl.MessageState `protogen:"open.v1"` 710 710 + // repo carries the DID as a string. 711 711 + Repo string `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` 712 712 + // Old patch range (from_base..from_head) and new patch range (to_base..to_head). 713 713 + FromBase []byte `protobuf:"bytes,2,opt,name=from_base,json=fromBase,proto3" json:"from_base,omitempty"` 714 714 + FromHead []byte `protobuf:"bytes,3,opt,name=from_head,json=fromHead,proto3" json:"from_head,omitempty"` 715 715 + ToBase []byte `protobuf:"bytes,4,opt,name=to_base,json=toBase,proto3" json:"to_base,omitempty"` 716 716 + ToHead []byte `protobuf:"bytes,5,opt,name=to_head,json=toHead,proto3" json:"to_head,omitempty"` 717 717 + unknownFields protoimpl.UnknownFields 718 718 + sizeCache protoimpl.SizeCache 719 719 + } 720 720 + 721 721 + func (x *InterdiffRequest) Reset() { 722 722 + *x = InterdiffRequest{} 723 723 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[11] 724 724 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 725 725 + ms.StoreMessageInfo(mi) 726 726 + } 727 727 + 728 728 + func (x *InterdiffRequest) String() string { 729 729 + return protoimpl.X.MessageStringOf(x) 730 730 + } 731 731 + 732 732 + func (*InterdiffRequest) ProtoMessage() {} 733 733 + 734 734 + func (x *InterdiffRequest) ProtoReflect() protoreflect.Message { 735 735 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[11] 736 736 + if x != nil { 737 737 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 738 738 + if ms.LoadMessageInfo() == nil { 739 739 + ms.StoreMessageInfo(mi) 740 740 + } 741 741 + return ms 742 742 + } 743 743 + return mi.MessageOf(x) 744 744 + } 745 745 + 746 746 + // Deprecated: Use InterdiffRequest.ProtoReflect.Descriptor instead. 747 747 + func (*InterdiffRequest) Descriptor() ([]byte, []int) { 748 748 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{11} 749 749 + } 750 750 + 751 751 + func (x *InterdiffRequest) GetRepo() string { 752 752 + if x != nil { 753 753 + return x.Repo 754 754 + } 755 755 + return "" 756 756 + } 757 757 + 758 758 + func (x *InterdiffRequest) GetFromBase() []byte { 759 759 + if x != nil { 760 760 + return x.FromBase 761 761 + } 762 762 + return nil 763 763 + } 764 764 + 765 765 + func (x *InterdiffRequest) GetFromHead() []byte { 766 766 + if x != nil { 767 767 + return x.FromHead 768 768 + } 769 769 + return nil 770 770 + } 771 771 + 772 772 + func (x *InterdiffRequest) GetToBase() []byte { 773 773 + if x != nil { 774 774 + return x.ToBase 775 775 + } 776 776 + return nil 777 777 + } 778 778 + 779 779 + func (x *InterdiffRequest) GetToHead() []byte { 780 780 + if x != nil { 781 781 + return x.ToHead 782 782 + } 783 783 + return nil 784 784 + } 785 785 + 786 786 + type FileContent struct { 787 787 + state protoimpl.MessageState `protogen:"open.v1"` 788 788 + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` 789 789 + Oid string `protobuf:"bytes,2,opt,name=oid,proto3" json:"oid,omitempty"` 790 790 + Size uint64 `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"` 791 791 + IsBinary bool `protobuf:"varint,4,opt,name=is_binary,json=isBinary,proto3" json:"is_binary,omitempty"` 792 792 + IsSubmodule bool `protobuf:"varint,5,opt,name=is_submodule,json=isSubmodule,proto3" json:"is_submodule,omitempty"` 793 793 + // Raw file bytes, inlined when the oid is not fetchable by the client 794 794 + // (e.g. interdiff) 795 795 + Content []byte `protobuf:"bytes,6,opt,name=content,proto3,oneof" json:"content,omitempty"` 796 796 + unknownFields protoimpl.UnknownFields 797 797 + sizeCache protoimpl.SizeCache 798 798 + } 799 799 + 800 800 + func (x *FileContent) Reset() { 801 801 + *x = FileContent{} 802 802 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[12] 803 803 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 804 804 + ms.StoreMessageInfo(mi) 805 805 + } 806 806 + 807 807 + func (x *FileContent) String() string { 808 808 + return protoimpl.X.MessageStringOf(x) 809 809 + } 810 810 + 811 811 + func (*FileContent) ProtoMessage() {} 812 812 + 813 813 + func (x *FileContent) ProtoReflect() protoreflect.Message { 814 814 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[12] 815 815 + if x != nil { 816 816 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 817 817 + if ms.LoadMessageInfo() == nil { 818 818 + ms.StoreMessageInfo(mi) 819 819 + } 820 820 + return ms 821 821 + } 822 822 + return mi.MessageOf(x) 823 823 + } 824 824 + 825 825 + // Deprecated: Use FileContent.ProtoReflect.Descriptor instead. 826 826 + func (*FileContent) Descriptor() ([]byte, []int) { 827 827 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{12} 828 828 + } 829 829 + 830 830 + func (x *FileContent) GetPath() string { 831 831 + if x != nil { 832 832 + return x.Path 833 833 + } 834 834 + return "" 835 835 + } 836 836 + 837 837 + func (x *FileContent) GetOid() string { 838 838 + if x != nil { 839 839 + return x.Oid 840 840 + } 841 841 + return "" 842 842 + } 843 843 + 844 844 + func (x *FileContent) GetSize() uint64 { 845 845 + if x != nil { 846 846 + return x.Size 847 847 + } 848 848 + return 0 849 849 + } 850 850 + 851 851 + func (x *FileContent) GetIsBinary() bool { 852 852 + if x != nil { 853 853 + return x.IsBinary 854 854 + } 855 855 + return false 856 856 + } 857 857 + 858 858 + func (x *FileContent) GetIsSubmodule() bool { 859 859 + if x != nil { 860 860 + return x.IsSubmodule 861 861 + } 862 862 + return false 863 863 + } 864 864 + 865 865 + func (x *FileContent) GetContent() []byte { 866 866 + if x != nil { 867 867 + return x.Content 868 868 + } 869 869 + return nil 870 870 + } 871 871 + 872 872 + // One aligned line pair; a side is absent (None) when unset. 873 873 + type LinePair struct { 874 874 + state protoimpl.MessageState `protogen:"open.v1"` 875 875 + Lhs *uint32 `protobuf:"varint,1,opt,name=lhs,proto3,oneof" json:"lhs,omitempty"` 876 876 + Rhs *uint32 `protobuf:"varint,2,opt,name=rhs,proto3,oneof" json:"rhs,omitempty"` 877 877 + unknownFields protoimpl.UnknownFields 878 878 + sizeCache protoimpl.SizeCache 879 879 + } 880 880 + 881 881 + func (x *LinePair) Reset() { 882 882 + *x = LinePair{} 883 883 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[13] 884 884 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 885 885 + ms.StoreMessageInfo(mi) 886 886 + } 887 887 + 888 888 + func (x *LinePair) String() string { 889 889 + return protoimpl.X.MessageStringOf(x) 890 890 + } 891 891 + 892 892 + func (*LinePair) ProtoMessage() {} 893 893 + 894 894 + func (x *LinePair) ProtoReflect() protoreflect.Message { 895 895 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[13] 896 896 + if x != nil { 897 897 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 898 898 + if ms.LoadMessageInfo() == nil { 899 899 + ms.StoreMessageInfo(mi) 900 900 + } 901 901 + return ms 902 902 + } 903 903 + return mi.MessageOf(x) 904 904 + } 905 905 + 906 906 + // Deprecated: Use LinePair.ProtoReflect.Descriptor instead. 907 907 + func (*LinePair) Descriptor() ([]byte, []int) { 908 908 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{13} 909 909 + } 910 910 + 911 911 + func (x *LinePair) GetLhs() uint32 { 912 912 + if x != nil && x.Lhs != nil { 913 913 + return *x.Lhs 914 914 + } 915 915 + return 0 916 916 + } 917 917 + 918 918 + func (x *LinePair) GetRhs() uint32 { 919 919 + if x != nil && x.Rhs != nil { 920 920 + return *x.Rhs 921 921 + } 922 922 + return 0 923 923 + } 924 924 + 925 925 + type Hunk struct { 926 926 + state protoimpl.MessageState `protogen:"open.v1"` 927 927 + // LineNumber (u32) sets containing novel content per side. 928 928 + NovelLhs []uint32 `protobuf:"varint,1,rep,packed,name=novel_lhs,json=novelLhs,proto3" json:"novel_lhs,omitempty"` 929 929 + NovelRhs []uint32 `protobuf:"varint,2,rep,packed,name=novel_rhs,json=novelRhs,proto3" json:"novel_rhs,omitempty"` 930 930 + Lines []*LinePair `protobuf:"bytes,3,rep,name=lines,proto3" json:"lines,omitempty"` 931 931 + unknownFields protoimpl.UnknownFields 932 932 + sizeCache protoimpl.SizeCache 933 933 + } 934 934 + 935 935 + func (x *Hunk) Reset() { 936 936 + *x = Hunk{} 937 937 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[14] 938 938 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 939 939 + ms.StoreMessageInfo(mi) 940 940 + } 941 941 + 942 942 + func (x *Hunk) String() string { 943 943 + return protoimpl.X.MessageStringOf(x) 944 944 + } 945 945 + 946 946 + func (*Hunk) ProtoMessage() {} 947 947 + 948 948 + func (x *Hunk) ProtoReflect() protoreflect.Message { 949 949 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[14] 950 950 + if x != nil { 951 951 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 952 952 + if ms.LoadMessageInfo() == nil { 953 953 + ms.StoreMessageInfo(mi) 954 954 + } 955 955 + return ms 956 956 + } 957 957 + return mi.MessageOf(x) 958 958 + } 959 959 + 960 960 + // Deprecated: Use Hunk.ProtoReflect.Descriptor instead. 961 961 + func (*Hunk) Descriptor() ([]byte, []int) { 962 962 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{14} 963 963 + } 964 964 + 965 965 + func (x *Hunk) GetNovelLhs() []uint32 { 966 966 + if x != nil { 967 967 + return x.NovelLhs 968 968 + } 969 969 + return nil 970 970 + } 971 971 + 972 972 + func (x *Hunk) GetNovelRhs() []uint32 { 973 973 + if x != nil { 974 974 + return x.NovelRhs 975 975 + } 976 976 + return nil 977 977 + } 978 978 + 979 979 + func (x *Hunk) GetLines() []*LinePair { 980 980 + if x != nil { 981 981 + return x.Lines 982 982 + } 983 983 + return nil 984 984 + } 985 985 + 986 986 + // Number of bytes per side when the files differ (Rust Option<(usize, usize)>). 987 987 + type ByteChanges struct { 988 988 + state protoimpl.MessageState `protogen:"open.v1"` 989 989 + Lhs uint64 `protobuf:"varint,1,opt,name=lhs,proto3" json:"lhs,omitempty"` 990 990 + Rhs uint64 `protobuf:"varint,2,opt,name=rhs,proto3" json:"rhs,omitempty"` 991 991 + unknownFields protoimpl.UnknownFields 992 992 + sizeCache protoimpl.SizeCache 993 993 + } 994 994 + 995 995 + func (x *ByteChanges) Reset() { 996 996 + *x = ByteChanges{} 997 997 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[15] 998 998 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 999 999 + ms.StoreMessageInfo(mi) 1000 1000 + } 1001 1001 + 1002 1002 + func (x *ByteChanges) String() string { 1003 1003 + return protoimpl.X.MessageStringOf(x) 1004 1004 + } 1005 1005 + 1006 1006 + func (*ByteChanges) ProtoMessage() {} 1007 1007 + 1008 1008 + func (x *ByteChanges) ProtoReflect() protoreflect.Message { 1009 1009 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[15] 1010 1010 + if x != nil { 1011 1011 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1012 1012 + if ms.LoadMessageInfo() == nil { 1013 1013 + ms.StoreMessageInfo(mi) 1014 1014 + } 1015 1015 + return ms 1016 1016 + } 1017 1017 + return mi.MessageOf(x) 1018 1018 + } 1019 1019 + 1020 1020 + // Deprecated: Use ByteChanges.ProtoReflect.Descriptor instead. 1021 1021 + func (*ByteChanges) Descriptor() ([]byte, []int) { 1022 1022 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{15} 1023 1023 + } 1024 1024 + 1025 1025 + func (x *ByteChanges) GetLhs() uint64 { 1026 1026 + if x != nil { 1027 1027 + return x.Lhs 1028 1028 + } 1029 1029 + return 0 1030 1030 + } 1031 1031 + 1032 1032 + func (x *ByteChanges) GetRhs() uint64 { 1033 1033 + if x != nil { 1034 1034 + return x.Rhs 1035 1035 + } 1036 1036 + return 0 1037 1037 + } 1038 1038 + 1039 1039 + type FileDiff struct { 1040 1040 + state protoimpl.MessageState `protogen:"open.v1"` 1041 1041 + LhsSrc *FileContent `protobuf:"bytes,1,opt,name=lhs_src,json=lhsSrc,proto3" json:"lhs_src,omitempty"` 1042 1042 + RhsSrc *FileContent `protobuf:"bytes,2,opt,name=rhs_src,json=rhsSrc,proto3" json:"rhs_src,omitempty"` 1043 1043 + Hunks []*Hunk `protobuf:"bytes,3,rep,name=hunks,proto3" json:"hunks,omitempty"` 1044 1044 + HasByteChanges *ByteChanges `protobuf:"bytes,4,opt,name=has_byte_changes,json=hasByteChanges,proto3,oneof" json:"has_byte_changes,omitempty"` 1045 1045 + HasSyntacticChanges bool `protobuf:"varint,5,opt,name=has_syntactic_changes,json=hasSyntacticChanges,proto3" json:"has_syntactic_changes,omitempty"` // TODO: lhs_positions & rhs_positions 1046 1046 + unknownFields protoimpl.UnknownFields 1047 1047 + sizeCache protoimpl.SizeCache 1048 1048 + } 1049 1049 + 1050 1050 + func (x *FileDiff) Reset() { 1051 1051 + *x = FileDiff{} 1052 1052 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[16] 1053 1053 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1054 1054 + ms.StoreMessageInfo(mi) 1055 1055 + } 1056 1056 + 1057 1057 + func (x *FileDiff) String() string { 1058 1058 + return protoimpl.X.MessageStringOf(x) 1059 1059 + } 1060 1060 + 1061 1061 + func (*FileDiff) ProtoMessage() {} 1062 1062 + 1063 1063 + func (x *FileDiff) ProtoReflect() protoreflect.Message { 1064 1064 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[16] 1065 1065 + if x != nil { 1066 1066 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1067 1067 + if ms.LoadMessageInfo() == nil { 1068 1068 + ms.StoreMessageInfo(mi) 1069 1069 + } 1070 1070 + return ms 1071 1071 + } 1072 1072 + return mi.MessageOf(x) 1073 1073 + } 1074 1074 + 1075 1075 + // Deprecated: Use FileDiff.ProtoReflect.Descriptor instead. 1076 1076 + func (*FileDiff) Descriptor() ([]byte, []int) { 1077 1077 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{16} 1078 1078 + } 1079 1079 + 1080 1080 + func (x *FileDiff) GetLhsSrc() *FileContent { 1081 1081 + if x != nil { 1082 1082 + return x.LhsSrc 1083 1083 + } 1084 1084 + return nil 1085 1085 + } 1086 1086 + 1087 1087 + func (x *FileDiff) GetRhsSrc() *FileContent { 1088 1088 + if x != nil { 1089 1089 + return x.RhsSrc 1090 1090 + } 1091 1091 + return nil 1092 1092 + } 1093 1093 + 1094 1094 + func (x *FileDiff) GetHunks() []*Hunk { 1095 1095 + if x != nil { 1096 1096 + return x.Hunks 1097 1097 + } 1098 1098 + return nil 1099 1099 + } 1100 1100 + 1101 1101 + func (x *FileDiff) GetHasByteChanges() *ByteChanges { 1102 1102 + if x != nil { 1103 1103 + return x.HasByteChanges 1104 1104 + } 1105 1105 + return nil 1106 1106 + } 1107 1107 + 1108 1108 + func (x *FileDiff) GetHasSyntacticChanges() bool { 1109 1109 + if x != nil { 1110 1110 + return x.HasSyntacticChanges 1111 1111 + } 1112 1112 + return false 1113 1113 + } 1114 1114 + 1115 1115 + type GitCommit struct { 1116 1116 + state protoimpl.MessageState `protogen:"open.v1"` 1117 1117 + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid,omitempty"` 1118 1118 + Author *GitSignature `protobuf:"bytes,2,opt,name=author,proto3" json:"author,omitempty"` 1119 1119 + Committer *GitSignature `protobuf:"bytes,3,opt,name=committer,proto3" json:"committer,omitempty"` 1120 1120 + Message []byte `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"` 1121 1121 + Parents []string `protobuf:"bytes,5,rep,name=parents,proto3" json:"parents,omitempty"` 1122 1122 + ExtraHeaders map[string]string `protobuf:"bytes,6,rep,name=extra_headers,json=extraHeaders,proto3" json:"extra_headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` 1123 1123 + unknownFields protoimpl.UnknownFields 1124 1124 + sizeCache protoimpl.SizeCache 1125 1125 + } 1126 1126 + 1127 1127 + func (x *GitCommit) Reset() { 1128 1128 + *x = GitCommit{} 1129 1129 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[17] 1130 1130 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1131 1131 + ms.StoreMessageInfo(mi) 1132 1132 + } 1133 1133 + 1134 1134 + func (x *GitCommit) String() string { 1135 1135 + return protoimpl.X.MessageStringOf(x) 1136 1136 + } 1137 1137 + 1138 1138 + func (*GitCommit) ProtoMessage() {} 1139 1139 + 1140 1140 + func (x *GitCommit) ProtoReflect() protoreflect.Message { 1141 1141 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[17] 1142 1142 + if x != nil { 1143 1143 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1144 1144 + if ms.LoadMessageInfo() == nil { 1145 1145 + ms.StoreMessageInfo(mi) 1146 1146 + } 1147 1147 + return ms 1148 1148 + } 1149 1149 + return mi.MessageOf(x) 1150 1150 + } 1151 1151 + 1152 1152 + // Deprecated: Use GitCommit.ProtoReflect.Descriptor instead. 1153 1153 + func (*GitCommit) Descriptor() ([]byte, []int) { 1154 1154 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{17} 1155 1155 + } 1156 1156 + 1157 1157 + func (x *GitCommit) GetOid() string { 1158 1158 + if x != nil { 1159 1159 + return x.Oid 1160 1160 + } 1161 1161 + return "" 1162 1162 + } 1163 1163 + 1164 1164 + func (x *GitCommit) GetAuthor() *GitSignature { 1165 1165 + if x != nil { 1166 1166 + return x.Author 1167 1167 + } 1168 1168 + return nil 1169 1169 + } 1170 1170 + 1171 1171 + func (x *GitCommit) GetCommitter() *GitSignature { 1172 1172 + if x != nil { 1173 1173 + return x.Committer 1174 1174 + } 1175 1175 + return nil 1176 1176 + } 1177 1177 + 1178 1178 + func (x *GitCommit) GetMessage() []byte { 1179 1179 + if x != nil { 1180 1180 + return x.Message 1181 1181 + } 1182 1182 + return nil 1183 1183 + } 1184 1184 + 1185 1185 + func (x *GitCommit) GetParents() []string { 1186 1186 + if x != nil { 1187 1187 + return x.Parents 1188 1188 + } 1189 1189 + return nil 1190 1190 + } 1191 1191 + 1192 1192 + func (x *GitCommit) GetExtraHeaders() map[string]string { 1193 1193 + if x != nil { 1194 1194 + return x.ExtraHeaders 1195 1195 + } 1196 1196 + return nil 1197 1197 + } 1198 1198 + 1199 1199 + type GitSignature struct { 1200 1200 + state protoimpl.MessageState `protogen:"open.v1"` 1201 1201 + Name []byte `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` 1202 1202 + Email []byte `protobuf:"bytes,2,opt,name=email,proto3" json:"email,omitempty"` 1203 1203 + Date *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=date,proto3" json:"date,omitempty"` 1204 1204 + unknownFields protoimpl.UnknownFields 1205 1205 + sizeCache protoimpl.SizeCache 1206 1206 + } 1207 1207 + 1208 1208 + func (x *GitSignature) Reset() { 1209 1209 + *x = GitSignature{} 1210 1210 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[18] 1211 1211 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1212 1212 + ms.StoreMessageInfo(mi) 1213 1213 + } 1214 1214 + 1215 1215 + func (x *GitSignature) String() string { 1216 1216 + return protoimpl.X.MessageStringOf(x) 1217 1217 + } 1218 1218 + 1219 1219 + func (*GitSignature) ProtoMessage() {} 1220 1220 + 1221 1221 + func (x *GitSignature) ProtoReflect() protoreflect.Message { 1222 1222 + mi := &file_gitmirror_v1_gitmirror_proto_msgTypes[18] 1223 1223 + if x != nil { 1224 1224 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 1225 1225 + if ms.LoadMessageInfo() == nil { 1226 1226 + ms.StoreMessageInfo(mi) 1227 1227 + } 1228 1228 + return ms 1229 1229 + } 1230 1230 + return mi.MessageOf(x) 1231 1231 + } 1232 1232 + 1233 1233 + // Deprecated: Use GitSignature.ProtoReflect.Descriptor instead. 1234 1234 + func (*GitSignature) Descriptor() ([]byte, []int) { 1235 1235 + return file_gitmirror_v1_gitmirror_proto_rawDescGZIP(), []int{18} 1236 1236 + } 1237 1237 + 1238 1238 + func (x *GitSignature) GetName() []byte { 1239 1239 + if x != nil { 1240 1240 + return x.Name 1241 1241 + } 1242 1242 + return nil 1243 1243 + } 1244 1244 + 1245 1245 + func (x *GitSignature) GetEmail() []byte { 1246 1246 + if x != nil { 1247 1247 + return x.Email 1248 1248 + } 1249 1249 + return nil 1250 1250 + } 1251 1251 + 1252 1252 + func (x *GitSignature) GetDate() *timestamppb.Timestamp { 1253 1253 + if x != nil { 1254 1254 + return x.Date 1255 1255 + } 1256 1256 + return nil 1257 1257 + } 1258 1258 + 1259 1259 + var File_gitmirror_v1_gitmirror_proto protoreflect.FileDescriptor 1260 1260 + 1261 1261 + const file_gitmirror_v1_gitmirror_proto_rawDesc = "" + 1262 1262 + "\n" + 1263 1263 + "\x1cgitmirror/v1/gitmirror.proto\x12\fgitmirror.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"9\n" + 1264 1264 + "\x11ResolveRevRequest\x12\x12\n" + 1265 1265 + "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x10\n" + 1266 1266 + "\x03rev\x18\x02 \x01(\fR\x03rev\",\n" + 1267 1267 + "\x12ResolveRevResponse\x12\x16\n" + 1268 1268 + "\x06commit\x18\x01 \x01(\tR\x06commit\"8\n" + 1269 1269 + "\n" + 1270 1270 + "RepoCommit\x12\x12\n" + 1271 1271 + "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + 1272 1272 + "\x06commit\x18\x02 \x01(\fR\x06commit\"w\n" + 1273 1273 + "\x11MergeCheckRequest\x120\n" + 1274 1274 + "\x06target\x18\x01 \x01(\v2\x18.gitmirror.v1.RepoCommitR\x06target\x120\n" + 1275 1275 + "\x06source\x18\x02 \x01(\v2\x18.gitmirror.v1.RepoCommitR\x06source\"\x9f\x01\n" + 1276 1276 + "\x12MergeCheckResponse\x12#\n" + 1277 1277 + "\ris_conflicted\x18\x01 \x01(\bR\fisConflicted\x129\n" + 1278 1278 + "\tconflicts\x18\x02 \x03(\v2\x1b.gitmirror.v1.MergeConflictR\tconflicts\x12\x1d\n" + 1279 1279 + "\amessage\x18\x03 \x01(\tH\x00R\amessage\x88\x01\x01B\n" + 1280 1280 + "\n" + 1281 1281 + "\b_message\"C\n" + 1282 1282 + "\rMergeConflict\x12\x1a\n" + 1283 1283 + "\bfilename\x18\x01 \x01(\tR\bfilename\x12\x16\n" + 1284 1284 + "\x06reason\x18\x02 \x01(\tR\x06reason\"\xf4\x01\n" + 1285 1285 + "\x10CommitLogRequest\x12\x12\n" + 1286 1286 + "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x16\n" + 1287 1287 + "\x06ranges\x18\x02 \x03(\fR\x06ranges\x12\x19\n" + 1288 1288 + "\ball_refs\x18\x03 \x01(\bR\aallRefs\x120\n" + 1289 1289 + "\x05after\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\x05after\x122\n" + 1290 1290 + "\x06before\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\x06before\x12\x1f\n" + 1291 1291 + "\vmax_commits\x18\x06 \x01(\rR\n" + 1292 1292 + "maxCommits\x12\x12\n" + 1293 1293 + "\x04skip\x18\a \x01(\rR\x04skip\"F\n" + 1294 1294 + "\x11CommitLogResponse\x121\n" + 1295 1295 + "\acommits\x18\x01 \x03(\v2\x17.gitmirror.v1.GitCommitR\acommits\"6\n" + 1296 1296 + "\x0eGetBlobRequest\x12\x12\n" + 1297 1297 + "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x10\n" + 1298 1298 + "\x03oid\x18\x02 \x01(\tR\x03oid\"\x1f\n" + 1299 1299 + "\tBlobChunk\x12\x12\n" + 1300 1300 + "\x04data\x18\x01 \x01(\fR\x04data\"\xb3\x02\n" + 1301 1301 + "\vDiffRequest\x12,\n" + 1302 1302 + "\x04base\x18\x01 \x01(\v2\x18.gitmirror.v1.RepoCommitR\x04base\x12,\n" + 1303 1303 + "\x04head\x18\x02 \x01(\v2\x18.gitmirror.v1.RepoCommitR\x04head\x12Q\n" + 1304 1304 + "\x0fcomparison_type\x18\x03 \x01(\x0e2(.gitmirror.v1.DiffRequest.ComparisonTypeR\x0ecomparisonType\"u\n" + 1305 1305 + "\x0eComparisonType\x12\x1f\n" + 1306 1306 + "\x1bCOMPARISON_TYPE_UNSPECIFIED\x10\x00\x12 \n" + 1307 1307 + "\x1cCOMPARISON_TYPE_ONLY_IN_HEAD\x10\x01\x12 \n" + 1308 1308 + "\x1cCOMPARISON_TYPE_INTERSECTION\x10\x02\"\x92\x01\n" + 1309 1309 + "\x10InterdiffRequest\x12\x12\n" + 1310 1310 + "\x04repo\x18\x01 \x01(\tR\x04repo\x12\x1b\n" + 1311 1311 + "\tfrom_base\x18\x02 \x01(\fR\bfromBase\x12\x1b\n" + 1312 1312 + "\tfrom_head\x18\x03 \x01(\fR\bfromHead\x12\x17\n" + 1313 1313 + "\ato_base\x18\x04 \x01(\fR\x06toBase\x12\x17\n" + 1314 1314 + "\ato_head\x18\x05 \x01(\fR\x06toHead\"\xb2\x01\n" + 1315 1315 + "\vFileContent\x12\x12\n" + 1316 1316 + "\x04path\x18\x01 \x01(\tR\x04path\x12\x10\n" + 1317 1317 + "\x03oid\x18\x02 \x01(\tR\x03oid\x12\x12\n" + 1318 1318 + "\x04size\x18\x03 \x01(\x04R\x04size\x12\x1b\n" + 1319 1319 + "\tis_binary\x18\x04 \x01(\bR\bisBinary\x12!\n" + 1320 1320 + "\fis_submodule\x18\x05 \x01(\bR\visSubmodule\x12\x1d\n" + 1321 1321 + "\acontent\x18\x06 \x01(\fH\x00R\acontent\x88\x01\x01B\n" + 1322 1322 + "\n" + 1323 1323 + "\b_content\"H\n" + 1324 1324 + "\bLinePair\x12\x15\n" + 1325 1325 + "\x03lhs\x18\x01 \x01(\rH\x00R\x03lhs\x88\x01\x01\x12\x15\n" + 1326 1326 + "\x03rhs\x18\x02 \x01(\rH\x01R\x03rhs\x88\x01\x01B\x06\n" + 1327 1327 + "\x04_lhsB\x06\n" + 1328 1328 + "\x04_rhs\"n\n" + 1329 1329 + "\x04Hunk\x12\x1b\n" + 1330 1330 + "\tnovel_lhs\x18\x01 \x03(\rR\bnovelLhs\x12\x1b\n" + 1331 1331 + "\tnovel_rhs\x18\x02 \x03(\rR\bnovelRhs\x12,\n" + 1332 1332 + "\x05lines\x18\x03 \x03(\v2\x16.gitmirror.v1.LinePairR\x05lines\"1\n" + 1333 1333 + "\vByteChanges\x12\x10\n" + 1334 1334 + "\x03lhs\x18\x01 \x01(\x04R\x03lhs\x12\x10\n" + 1335 1335 + "\x03rhs\x18\x02 \x01(\x04R\x03rhs\"\xaf\x02\n" + 1336 1336 + "\bFileDiff\x122\n" + 1337 1337 + "\alhs_src\x18\x01 \x01(\v2\x19.gitmirror.v1.FileContentR\x06lhsSrc\x122\n" + 1338 1338 + "\arhs_src\x18\x02 \x01(\v2\x19.gitmirror.v1.FileContentR\x06rhsSrc\x12(\n" + 1339 1339 + "\x05hunks\x18\x03 \x03(\v2\x12.gitmirror.v1.HunkR\x05hunks\x12H\n" + 1340 1340 + "\x10has_byte_changes\x18\x04 \x01(\v2\x19.gitmirror.v1.ByteChangesH\x00R\x0ehasByteChanges\x88\x01\x01\x122\n" + 1341 1341 + "\x15has_syntactic_changes\x18\x05 \x01(\bR\x13hasSyntacticChangesB\x13\n" + 1342 1342 + "\x11_has_byte_changes\"\xd0\x02\n" + 1343 1343 + "\tGitCommit\x12\x10\n" + 1344 1344 + "\x03oid\x18\x01 \x01(\tR\x03oid\x122\n" + 1345 1345 + "\x06author\x18\x02 \x01(\v2\x1a.gitmirror.v1.GitSignatureR\x06author\x128\n" + 1346 1346 + "\tcommitter\x18\x03 \x01(\v2\x1a.gitmirror.v1.GitSignatureR\tcommitter\x12\x18\n" + 1347 1347 + "\amessage\x18\x04 \x01(\fR\amessage\x12\x18\n" + 1348 1348 + "\aparents\x18\x05 \x03(\tR\aparents\x12N\n" + 1349 1349 + "\rextra_headers\x18\x06 \x03(\v2).gitmirror.v1.GitCommit.ExtraHeadersEntryR\fextraHeaders\x1a?\n" + 1350 1350 + "\x11ExtraHeadersEntry\x12\x10\n" + 1351 1351 + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + 1352 1352 + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"h\n" + 1353 1353 + "\fGitSignature\x12\x12\n" + 1354 1354 + "\x04name\x18\x01 \x01(\fR\x04name\x12\x14\n" + 1355 1355 + "\x05email\x18\x02 \x01(\fR\x05email\x12.\n" + 1356 1356 + "\x04date\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\x04date2\xcc\x03\n" + 1357 1357 + "\x10GitMirrorService\x12N\n" + 1358 1358 + "\tCommitLog\x12\x1e.gitmirror.v1.CommitLogRequest\x1a\x1f.gitmirror.v1.CommitLogResponse0\x01\x12B\n" + 1359 1359 + "\aGetBlob\x12\x1c.gitmirror.v1.GetBlobRequest\x1a\x17.gitmirror.v1.BlobChunk0\x01\x12;\n" + 1360 1360 + "\x04Diff\x12\x19.gitmirror.v1.DiffRequest\x1a\x16.gitmirror.v1.FileDiff0\x01\x12E\n" + 1361 1361 + "\tInterdiff\x12\x1e.gitmirror.v1.InterdiffRequest\x1a\x16.gitmirror.v1.FileDiff0\x01\x12O\n" + 1362 1362 + "\n" + 1363 1363 + "MergeCheck\x12\x1f.gitmirror.v1.MergeCheckRequest\x1a .gitmirror.v1.MergeCheckResponse\x12O\n" + 1364 1364 + "\n" + 1365 1365 + "ResolveRev\x12\x1f.gitmirror.v1.ResolveRevRequest\x1a .gitmirror.v1.ResolveRevResponseB2Z0tangled.org/core/gitmirror/proto/gen;gitmirrorv1b\x06proto3" 1366 1366 + 1367 1367 + var ( 1368 1368 + file_gitmirror_v1_gitmirror_proto_rawDescOnce sync.Once 1369 1369 + file_gitmirror_v1_gitmirror_proto_rawDescData []byte 1370 1370 + ) 1371 1371 + 1372 1372 + func file_gitmirror_v1_gitmirror_proto_rawDescGZIP() []byte { 1373 1373 + file_gitmirror_v1_gitmirror_proto_rawDescOnce.Do(func() { 1374 1374 + file_gitmirror_v1_gitmirror_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_gitmirror_v1_gitmirror_proto_rawDesc), len(file_gitmirror_v1_gitmirror_proto_rawDesc))) 1375 1375 + }) 1376 1376 + return file_gitmirror_v1_gitmirror_proto_rawDescData 1377 1377 + } 1378 1378 + 1379 1379 + var file_gitmirror_v1_gitmirror_proto_enumTypes = make([]protoimpl.EnumInfo, 1) 1380 1380 + var file_gitmirror_v1_gitmirror_proto_msgTypes = make([]protoimpl.MessageInfo, 20) 1381 1381 + var file_gitmirror_v1_gitmirror_proto_goTypes = []any{ 1382 1382 + (DiffRequest_ComparisonType)(0), // 0: gitmirror.v1.DiffRequest.ComparisonType 1383 1383 + (*ResolveRevRequest)(nil), // 1: gitmirror.v1.ResolveRevRequest 1384 1384 + (*ResolveRevResponse)(nil), // 2: gitmirror.v1.ResolveRevResponse 1385 1385 + (*RepoCommit)(nil), // 3: gitmirror.v1.RepoCommit 1386 1386 + (*MergeCheckRequest)(nil), // 4: gitmirror.v1.MergeCheckRequest 1387 1387 + (*MergeCheckResponse)(nil), // 5: gitmirror.v1.MergeCheckResponse 1388 1388 + (*MergeConflict)(nil), // 6: gitmirror.v1.MergeConflict 1389 1389 + (*CommitLogRequest)(nil), // 7: gitmirror.v1.CommitLogRequest 1390 1390 + (*CommitLogResponse)(nil), // 8: gitmirror.v1.CommitLogResponse 1391 1391 + (*GetBlobRequest)(nil), // 9: gitmirror.v1.GetBlobRequest 1392 1392 + (*BlobChunk)(nil), // 10: gitmirror.v1.BlobChunk 1393 1393 + (*DiffRequest)(nil), // 11: gitmirror.v1.DiffRequest 1394 1394 + (*InterdiffRequest)(nil), // 12: gitmirror.v1.InterdiffRequest 1395 1395 + (*FileContent)(nil), // 13: gitmirror.v1.FileContent 1396 1396 + (*LinePair)(nil), // 14: gitmirror.v1.LinePair 1397 1397 + (*Hunk)(nil), // 15: gitmirror.v1.Hunk 1398 1398 + (*ByteChanges)(nil), // 16: gitmirror.v1.ByteChanges 1399 1399 + (*FileDiff)(nil), // 17: gitmirror.v1.FileDiff 1400 1400 + (*GitCommit)(nil), // 18: gitmirror.v1.GitCommit 1401 1401 + (*GitSignature)(nil), // 19: gitmirror.v1.GitSignature 1402 1402 + nil, // 20: gitmirror.v1.GitCommit.ExtraHeadersEntry 1403 1403 + (*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp 1404 1404 + } 1405 1405 + var file_gitmirror_v1_gitmirror_proto_depIdxs = []int32{ 1406 1406 + 3, // 0: gitmirror.v1.MergeCheckRequest.target:type_name -> gitmirror.v1.RepoCommit 1407 1407 + 3, // 1: gitmirror.v1.MergeCheckRequest.source:type_name -> gitmirror.v1.RepoCommit 1408 1408 + 6, // 2: gitmirror.v1.MergeCheckResponse.conflicts:type_name -> gitmirror.v1.MergeConflict 1409 1409 + 21, // 3: gitmirror.v1.CommitLogRequest.after:type_name -> google.protobuf.Timestamp 1410 1410 + 21, // 4: gitmirror.v1.CommitLogRequest.before:type_name -> google.protobuf.Timestamp 1411 1411 + 18, // 5: gitmirror.v1.CommitLogResponse.commits:type_name -> gitmirror.v1.GitCommit 1412 1412 + 3, // 6: gitmirror.v1.DiffRequest.base:type_name -> gitmirror.v1.RepoCommit 1413 1413 + 3, // 7: gitmirror.v1.DiffRequest.head:type_name -> gitmirror.v1.RepoCommit 1414 1414 + 0, // 8: gitmirror.v1.DiffRequest.comparison_type:type_name -> gitmirror.v1.DiffRequest.ComparisonType 1415 1415 + 14, // 9: gitmirror.v1.Hunk.lines:type_name -> gitmirror.v1.LinePair 1416 1416 + 13, // 10: gitmirror.v1.FileDiff.lhs_src:type_name -> gitmirror.v1.FileContent 1417 1417 + 13, // 11: gitmirror.v1.FileDiff.rhs_src:type_name -> gitmirror.v1.FileContent 1418 1418 + 15, // 12: gitmirror.v1.FileDiff.hunks:type_name -> gitmirror.v1.Hunk 1419 1419 + 16, // 13: gitmirror.v1.FileDiff.has_byte_changes:type_name -> gitmirror.v1.ByteChanges 1420 1420 + 19, // 14: gitmirror.v1.GitCommit.author:type_name -> gitmirror.v1.GitSignature 1421 1421 + 19, // 15: gitmirror.v1.GitCommit.committer:type_name -> gitmirror.v1.GitSignature 1422 1422 + 20, // 16: gitmirror.v1.GitCommit.extra_headers:type_name -> gitmirror.v1.GitCommit.ExtraHeadersEntry 1423 1423 + 21, // 17: gitmirror.v1.GitSignature.date:type_name -> google.protobuf.Timestamp 1424 1424 + 7, // 18: gitmirror.v1.GitMirrorService.CommitLog:input_type -> gitmirror.v1.CommitLogRequest 1425 1425 + 9, // 19: gitmirror.v1.GitMirrorService.GetBlob:input_type -> gitmirror.v1.GetBlobRequest 1426 1426 + 11, // 20: gitmirror.v1.GitMirrorService.Diff:input_type -> gitmirror.v1.DiffRequest 1427 1427 + 12, // 21: gitmirror.v1.GitMirrorService.Interdiff:input_type -> gitmirror.v1.InterdiffRequest 1428 1428 + 4, // 22: gitmirror.v1.GitMirrorService.MergeCheck:input_type -> gitmirror.v1.MergeCheckRequest 1429 1429 + 1, // 23: gitmirror.v1.GitMirrorService.ResolveRev:input_type -> gitmirror.v1.ResolveRevRequest 1430 1430 + 8, // 24: gitmirror.v1.GitMirrorService.CommitLog:output_type -> gitmirror.v1.CommitLogResponse 1431 1431 + 10, // 25: gitmirror.v1.GitMirrorService.GetBlob:output_type -> gitmirror.v1.BlobChunk 1432 1432 + 17, // 26: gitmirror.v1.GitMirrorService.Diff:output_type -> gitmirror.v1.FileDiff 1433 1433 + 17, // 27: gitmirror.v1.GitMirrorService.Interdiff:output_type -> gitmirror.v1.FileDiff 1434 1434 + 5, // 28: gitmirror.v1.GitMirrorService.MergeCheck:output_type -> gitmirror.v1.MergeCheckResponse 1435 1435 + 2, // 29: gitmirror.v1.GitMirrorService.ResolveRev:output_type -> gitmirror.v1.ResolveRevResponse 1436 1436 + 24, // [24:30] is the sub-list for method output_type 1437 1437 + 18, // [18:24] is the sub-list for method input_type 1438 1438 + 18, // [18:18] is the sub-list for extension type_name 1439 1439 + 18, // [18:18] is the sub-list for extension extendee 1440 1440 + 0, // [0:18] is the sub-list for field type_name 1441 1441 + } 1442 1442 + 1443 1443 + func init() { file_gitmirror_v1_gitmirror_proto_init() } 1444 1444 + func file_gitmirror_v1_gitmirror_proto_init() { 1445 1445 + if File_gitmirror_v1_gitmirror_proto != nil { 1446 1446 + return 1447 1447 + } 1448 1448 + file_gitmirror_v1_gitmirror_proto_msgTypes[4].OneofWrappers = []any{} 1449 1449 + file_gitmirror_v1_gitmirror_proto_msgTypes[12].OneofWrappers = []any{} 1450 1450 + file_gitmirror_v1_gitmirror_proto_msgTypes[13].OneofWrappers = []any{} 1451 1451 + file_gitmirror_v1_gitmirror_proto_msgTypes[16].OneofWrappers = []any{} 1452 1452 + type x struct{} 1453 1453 + out := protoimpl.TypeBuilder{ 1454 1454 + File: protoimpl.DescBuilder{ 1455 1455 + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), 1456 1456 + RawDescriptor: unsafe.Slice(unsafe.StringData(file_gitmirror_v1_gitmirror_proto_rawDesc), len(file_gitmirror_v1_gitmirror_proto_rawDesc)), 1457 1457 + NumEnums: 1, 1458 1458 + NumMessages: 20, 1459 1459 + NumExtensions: 0, 1460 1460 + NumServices: 1, 1461 1461 + }, 1462 1462 + GoTypes: file_gitmirror_v1_gitmirror_proto_goTypes, 1463 1463 + DependencyIndexes: file_gitmirror_v1_gitmirror_proto_depIdxs, 1464 1464 + EnumInfos: file_gitmirror_v1_gitmirror_proto_enumTypes, 1465 1465 + MessageInfos: file_gitmirror_v1_gitmirror_proto_msgTypes, 1466 1466 + }.Build() 1467 1467 + File_gitmirror_v1_gitmirror_proto = out.File 1468 1468 + file_gitmirror_v1_gitmirror_proto_goTypes = nil 1469 1469 + file_gitmirror_v1_gitmirror_proto_depIdxs = nil 1470 1470 + }

+324

gitmirror/proto/gen/gitmirror_grpc.pb.go

View file Reviewed

··· 1 1 + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. 2 2 + // versions: 3 3 + // - protoc-gen-go-grpc v1.6.2 4 4 + // - protoc (unknown) 5 5 + // source: gitmirror/v1/gitmirror.proto 6 6 + 7 7 + package gitmirrorv1 8 8 + 9 9 + import ( 10 10 + context "context" 11 11 + grpc "google.golang.org/grpc" 12 12 + codes "google.golang.org/grpc/codes" 13 13 + status "google.golang.org/grpc/status" 14 14 + ) 15 15 + 16 16 + // This is a compile-time assertion to ensure that this generated file 17 17 + // is compatible with the grpc package it is being compiled against. 18 18 + // Requires gRPC-Go v1.64.0 or later. 19 19 + const _ = grpc.SupportPackageIsVersion9 20 20 + 21 21 + const ( 22 22 + GitMirrorService_CommitLog_FullMethodName = "/gitmirror.v1.GitMirrorService/CommitLog" 23 23 + GitMirrorService_GetBlob_FullMethodName = "/gitmirror.v1.GitMirrorService/GetBlob" 24 24 + GitMirrorService_Diff_FullMethodName = "/gitmirror.v1.GitMirrorService/Diff" 25 25 + GitMirrorService_Interdiff_FullMethodName = "/gitmirror.v1.GitMirrorService/Interdiff" 26 26 + GitMirrorService_MergeCheck_FullMethodName = "/gitmirror.v1.GitMirrorService/MergeCheck" 27 27 + GitMirrorService_ResolveRev_FullMethodName = "/gitmirror.v1.GitMirrorService/ResolveRev" 28 28 + ) 29 29 + 30 30 + // GitMirrorServiceClient is the client API for GitMirrorService service. 31 31 + // 32 32 + // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. 33 33 + type GitMirrorServiceClient interface { 34 34 + CommitLog(ctx context.Context, in *CommitLogRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[CommitLogResponse], error) 35 35 + GetBlob(ctx context.Context, in *GetBlobRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[BlobChunk], error) 36 36 + Diff(ctx context.Context, in *DiffRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[FileDiff], error) 37 37 + Interdiff(ctx context.Context, in *InterdiffRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[FileDiff], error) 38 38 + MergeCheck(ctx context.Context, in *MergeCheckRequest, opts ...grpc.CallOption) (*MergeCheckResponse, error) 39 39 + ResolveRev(ctx context.Context, in *ResolveRevRequest, opts ...grpc.CallOption) (*ResolveRevResponse, error) 40 40 + } 41 41 + 42 42 + type gitMirrorServiceClient struct { 43 43 + cc grpc.ClientConnInterface 44 44 + } 45 45 + 46 46 + func NewGitMirrorServiceClient(cc grpc.ClientConnInterface) GitMirrorServiceClient { 47 47 + return &gitMirrorServiceClient{cc} 48 48 + } 49 49 + 50 50 + func (c *gitMirrorServiceClient) CommitLog(ctx context.Context, in *CommitLogRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[CommitLogResponse], error) { 51 51 + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) 52 52 + stream, err := c.cc.NewStream(ctx, &GitMirrorService_ServiceDesc.Streams[0], GitMirrorService_CommitLog_FullMethodName, cOpts...) 53 53 + if err != nil { 54 54 + return nil, err 55 55 + } 56 56 + x := &grpc.GenericClientStream[CommitLogRequest, CommitLogResponse]{ClientStream: stream} 57 57 + if err := x.ClientStream.SendMsg(in); err != nil { 58 58 + return nil, err 59 59 + } 60 60 + if err := x.ClientStream.CloseSend(); err != nil { 61 61 + return nil, err 62 62 + } 63 63 + return x, nil 64 64 + } 65 65 + 66 66 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 67 67 + type GitMirrorService_CommitLogClient = grpc.ServerStreamingClient[CommitLogResponse] 68 68 + 69 69 + func (c *gitMirrorServiceClient) GetBlob(ctx context.Context, in *GetBlobRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[BlobChunk], error) { 70 70 + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) 71 71 + stream, err := c.cc.NewStream(ctx, &GitMirrorService_ServiceDesc.Streams[1], GitMirrorService_GetBlob_FullMethodName, cOpts...) 72 72 + if err != nil { 73 73 + return nil, err 74 74 + } 75 75 + x := &grpc.GenericClientStream[GetBlobRequest, BlobChunk]{ClientStream: stream} 76 76 + if err := x.ClientStream.SendMsg(in); err != nil { 77 77 + return nil, err 78 78 + } 79 79 + if err := x.ClientStream.CloseSend(); err != nil { 80 80 + return nil, err 81 81 + } 82 82 + return x, nil 83 83 + } 84 84 + 85 85 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 86 86 + type GitMirrorService_GetBlobClient = grpc.ServerStreamingClient[BlobChunk] 87 87 + 88 88 + func (c *gitMirrorServiceClient) Diff(ctx context.Context, in *DiffRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[FileDiff], error) { 89 89 + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) 90 90 + stream, err := c.cc.NewStream(ctx, &GitMirrorService_ServiceDesc.Streams[2], GitMirrorService_Diff_FullMethodName, cOpts...) 91 91 + if err != nil { 92 92 + return nil, err 93 93 + } 94 94 + x := &grpc.GenericClientStream[DiffRequest, FileDiff]{ClientStream: stream} 95 95 + if err := x.ClientStream.SendMsg(in); err != nil { 96 96 + return nil, err 97 97 + } 98 98 + if err := x.ClientStream.CloseSend(); err != nil { 99 99 + return nil, err 100 100 + } 101 101 + return x, nil 102 102 + } 103 103 + 104 104 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 105 105 + type GitMirrorService_DiffClient = grpc.ServerStreamingClient[FileDiff] 106 106 + 107 107 + func (c *gitMirrorServiceClient) Interdiff(ctx context.Context, in *InterdiffRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[FileDiff], error) { 108 108 + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) 109 109 + stream, err := c.cc.NewStream(ctx, &GitMirrorService_ServiceDesc.Streams[3], GitMirrorService_Interdiff_FullMethodName, cOpts...) 110 110 + if err != nil { 111 111 + return nil, err 112 112 + } 113 113 + x := &grpc.GenericClientStream[InterdiffRequest, FileDiff]{ClientStream: stream} 114 114 + if err := x.ClientStream.SendMsg(in); err != nil { 115 115 + return nil, err 116 116 + } 117 117 + if err := x.ClientStream.CloseSend(); err != nil { 118 118 + return nil, err 119 119 + } 120 120 + return x, nil 121 121 + } 122 122 + 123 123 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 124 124 + type GitMirrorService_InterdiffClient = grpc.ServerStreamingClient[FileDiff] 125 125 + 126 126 + func (c *gitMirrorServiceClient) MergeCheck(ctx context.Context, in *MergeCheckRequest, opts ...grpc.CallOption) (*MergeCheckResponse, error) { 127 127 + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) 128 128 + out := new(MergeCheckResponse) 129 129 + err := c.cc.Invoke(ctx, GitMirrorService_MergeCheck_FullMethodName, in, out, cOpts...) 130 130 + if err != nil { 131 131 + return nil, err 132 132 + } 133 133 + return out, nil 134 134 + } 135 135 + 136 136 + func (c *gitMirrorServiceClient) ResolveRev(ctx context.Context, in *ResolveRevRequest, opts ...grpc.CallOption) (*ResolveRevResponse, error) { 137 137 + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) 138 138 + out := new(ResolveRevResponse) 139 139 + err := c.cc.Invoke(ctx, GitMirrorService_ResolveRev_FullMethodName, in, out, cOpts...) 140 140 + if err != nil { 141 141 + return nil, err 142 142 + } 143 143 + return out, nil 144 144 + } 145 145 + 146 146 + // GitMirrorServiceServer is the server API for GitMirrorService service. 147 147 + // All implementations must embed UnimplementedGitMirrorServiceServer 148 148 + // for forward compatibility. 149 149 + type GitMirrorServiceServer interface { 150 150 + CommitLog(*CommitLogRequest, grpc.ServerStreamingServer[CommitLogResponse]) error 151 151 + GetBlob(*GetBlobRequest, grpc.ServerStreamingServer[BlobChunk]) error 152 152 + Diff(*DiffRequest, grpc.ServerStreamingServer[FileDiff]) error 153 153 + Interdiff(*InterdiffRequest, grpc.ServerStreamingServer[FileDiff]) error 154 154 + MergeCheck(context.Context, *MergeCheckRequest) (*MergeCheckResponse, error) 155 155 + ResolveRev(context.Context, *ResolveRevRequest) (*ResolveRevResponse, error) 156 156 + mustEmbedUnimplementedGitMirrorServiceServer() 157 157 + } 158 158 + 159 159 + // UnimplementedGitMirrorServiceServer must be embedded to have 160 160 + // forward compatible implementations. 161 161 + // 162 162 + // NOTE: this should be embedded by value instead of pointer to avoid a nil 163 163 + // pointer dereference when methods are called. 164 164 + type UnimplementedGitMirrorServiceServer struct{} 165 165 + 166 166 + func (UnimplementedGitMirrorServiceServer) CommitLog(*CommitLogRequest, grpc.ServerStreamingServer[CommitLogResponse]) error { 167 167 + return status.Error(codes.Unimplemented, "method CommitLog not implemented") 168 168 + } 169 169 + func (UnimplementedGitMirrorServiceServer) GetBlob(*GetBlobRequest, grpc.ServerStreamingServer[BlobChunk]) error { 170 170 + return status.Error(codes.Unimplemented, "method GetBlob not implemented") 171 171 + } 172 172 + func (UnimplementedGitMirrorServiceServer) Diff(*DiffRequest, grpc.ServerStreamingServer[FileDiff]) error { 173 173 + return status.Error(codes.Unimplemented, "method Diff not implemented") 174 174 + } 175 175 + func (UnimplementedGitMirrorServiceServer) Interdiff(*InterdiffRequest, grpc.ServerStreamingServer[FileDiff]) error { 176 176 + return status.Error(codes.Unimplemented, "method Interdiff not implemented") 177 177 + } 178 178 + func (UnimplementedGitMirrorServiceServer) MergeCheck(context.Context, *MergeCheckRequest) (*MergeCheckResponse, error) { 179 179 + return nil, status.Error(codes.Unimplemented, "method MergeCheck not implemented") 180 180 + } 181 181 + func (UnimplementedGitMirrorServiceServer) ResolveRev(context.Context, *ResolveRevRequest) (*ResolveRevResponse, error) { 182 182 + return nil, status.Error(codes.Unimplemented, "method ResolveRev not implemented") 183 183 + } 184 184 + func (UnimplementedGitMirrorServiceServer) mustEmbedUnimplementedGitMirrorServiceServer() {} 185 185 + func (UnimplementedGitMirrorServiceServer) testEmbeddedByValue() {} 186 186 + 187 187 + // UnsafeGitMirrorServiceServer may be embedded to opt out of forward compatibility for this service. 188 188 + // Use of this interface is not recommended, as added methods to GitMirrorServiceServer will 189 189 + // result in compilation errors. 190 190 + type UnsafeGitMirrorServiceServer interface { 191 191 + mustEmbedUnimplementedGitMirrorServiceServer() 192 192 + } 193 193 + 194 194 + func RegisterGitMirrorServiceServer(s grpc.ServiceRegistrar, srv GitMirrorServiceServer) { 195 195 + // If the following call panics, it indicates UnimplementedGitMirrorServiceServer was 196 196 + // embedded by pointer and is nil. This will cause panics if an 197 197 + // unimplemented method is ever invoked, so we test this at initialization 198 198 + // time to prevent it from happening at runtime later due to I/O. 199 199 + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { 200 200 + t.testEmbeddedByValue() 201 201 + } 202 202 + s.RegisterService(&GitMirrorService_ServiceDesc, srv) 203 203 + } 204 204 + 205 205 + func _GitMirrorService_CommitLog_Handler(srv interface{}, stream grpc.ServerStream) error { 206 206 + m := new(CommitLogRequest) 207 207 + if err := stream.RecvMsg(m); err != nil { 208 208 + return err 209 209 + } 210 210 + return srv.(GitMirrorServiceServer).CommitLog(m, &grpc.GenericServerStream[CommitLogRequest, CommitLogResponse]{ServerStream: stream}) 211 211 + } 212 212 + 213 213 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 214 214 + type GitMirrorService_CommitLogServer = grpc.ServerStreamingServer[CommitLogResponse] 215 215 + 216 216 + func _GitMirrorService_GetBlob_Handler(srv interface{}, stream grpc.ServerStream) error { 217 217 + m := new(GetBlobRequest) 218 218 + if err := stream.RecvMsg(m); err != nil { 219 219 + return err 220 220 + } 221 221 + return srv.(GitMirrorServiceServer).GetBlob(m, &grpc.GenericServerStream[GetBlobRequest, BlobChunk]{ServerStream: stream}) 222 222 + } 223 223 + 224 224 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 225 225 + type GitMirrorService_GetBlobServer = grpc.ServerStreamingServer[BlobChunk] 226 226 + 227 227 + func _GitMirrorService_Diff_Handler(srv interface{}, stream grpc.ServerStream) error { 228 228 + m := new(DiffRequest) 229 229 + if err := stream.RecvMsg(m); err != nil { 230 230 + return err 231 231 + } 232 232 + return srv.(GitMirrorServiceServer).Diff(m, &grpc.GenericServerStream[DiffRequest, FileDiff]{ServerStream: stream}) 233 233 + } 234 234 + 235 235 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 236 236 + type GitMirrorService_DiffServer = grpc.ServerStreamingServer[FileDiff] 237 237 + 238 238 + func _GitMirrorService_Interdiff_Handler(srv interface{}, stream grpc.ServerStream) error { 239 239 + m := new(InterdiffRequest) 240 240 + if err := stream.RecvMsg(m); err != nil { 241 241 + return err 242 242 + } 243 243 + return srv.(GitMirrorServiceServer).Interdiff(m, &grpc.GenericServerStream[InterdiffRequest, FileDiff]{ServerStream: stream}) 244 244 + } 245 245 + 246 246 + // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. 247 247 + type GitMirrorService_InterdiffServer = grpc.ServerStreamingServer[FileDiff] 248 248 + 249 249 + func _GitMirrorService_MergeCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { 250 250 + in := new(MergeCheckRequest) 251 251 + if err := dec(in); err != nil { 252 252 + return nil, err 253 253 + } 254 254 + if interceptor == nil { 255 255 + return srv.(GitMirrorServiceServer).MergeCheck(ctx, in) 256 256 + } 257 257 + info := &grpc.UnaryServerInfo{ 258 258 + Server: srv, 259 259 + FullMethod: GitMirrorService_MergeCheck_FullMethodName, 260 260 + } 261 261 + handler := func(ctx context.Context, req interface{}) (interface{}, error) { 262 262 + return srv.(GitMirrorServiceServer).MergeCheck(ctx, req.(*MergeCheckRequest)) 263 263 + } 264 264 + return interceptor(ctx, in, info, handler) 265 265 + } 266 266 + 267 267 + func _GitMirrorService_ResolveRev_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { 268 268 + in := new(ResolveRevRequest) 269 269 + if err := dec(in); err != nil { 270 270 + return nil, err 271 271 + } 272 272 + if interceptor == nil { 273 273 + return srv.(GitMirrorServiceServer).ResolveRev(ctx, in) 274 274 + } 275 275 + info := &grpc.UnaryServerInfo{ 276 276 + Server: srv, 277 277 + FullMethod: GitMirrorService_ResolveRev_FullMethodName, 278 278 + } 279 279 + handler := func(ctx context.Context, req interface{}) (interface{}, error) { 280 280 + return srv.(GitMirrorServiceServer).ResolveRev(ctx, req.(*ResolveRevRequest)) 281 281 + } 282 282 + return interceptor(ctx, in, info, handler) 283 283 + } 284 284 + 285 285 + // GitMirrorService_ServiceDesc is the grpc.ServiceDesc for GitMirrorService service. 286 286 + // It's only intended for direct use with grpc.RegisterService, 287 287 + // and not to be introspected or modified (even as a copy) 288 288 + var GitMirrorService_ServiceDesc = grpc.ServiceDesc{ 289 289 + ServiceName: "gitmirror.v1.GitMirrorService", 290 290 + HandlerType: (*GitMirrorServiceServer)(nil), 291 291 + Methods: []grpc.MethodDesc{ 292 292 + { 293 293 + MethodName: "MergeCheck", 294 294 + Handler: _GitMirrorService_MergeCheck_Handler, 295 295 + }, 296 296 + { 297 297 + MethodName: "ResolveRev", 298 298 + Handler: _GitMirrorService_ResolveRev_Handler, 299 299 + }, 300 300 + }, 301 301 + Streams: []grpc.StreamDesc{ 302 302 + { 303 303 + StreamName: "CommitLog", 304 304 + Handler: _GitMirrorService_CommitLog_Handler, 305 305 + ServerStreams: true, 306 306 + }, 307 307 + { 308 308 + StreamName: "GetBlob", 309 309 + Handler: _GitMirrorService_GetBlob_Handler, 310 310 + ServerStreams: true, 311 311 + }, 312 312 + { 313 313 + StreamName: "Diff", 314 314 + Handler: _GitMirrorService_Diff_Handler, 315 315 + ServerStreams: true, 316 316 + }, 317 317 + { 318 318 + StreamName: "Interdiff", 319 319 + Handler: _GitMirrorService_Interdiff_Handler, 320 320 + ServerStreams: true, 321 321 + }, 322 322 + }, 323 323 + Metadata: "gitmirror/v1/gitmirror.proto", 324 324 + }

+172

gitmirror/proto/gitmirror/v1/gitmirror.proto

View file Reviewed

··· 1 1 + syntax = "proto3"; 2 2 + 3 3 + package gitmirror.v1; 4 4 + 5 5 + import "google/protobuf/timestamp.proto"; 6 6 + 7 7 + option go_package = "tangled.org/core/gitmirror/proto/gen;gitmirrorv1"; 8 8 + 9 9 + service GitMirrorService { 10 10 + rpc CommitLog(CommitLogRequest) returns (stream CommitLogResponse); 11 11 + rpc GetBlob(GetBlobRequest) returns (stream BlobChunk); 12 12 + rpc Diff(DiffRequest) returns (stream FileDiff); 13 13 + rpc Interdiff(InterdiffRequest) returns (stream FileDiff); 14 14 + rpc MergeCheck(MergeCheckRequest) returns (MergeCheckResponse); 15 15 + rpc ResolveRev(ResolveRevRequest) returns (ResolveRevResponse); 16 16 + } 17 17 + 18 18 + message ResolveRevRequest { 19 19 + // repo carries the DID as a string. 20 20 + string repo = 1; 21 21 + // rev is a SIMPLE revspec: a branch name, tag name, or short/full commit oid. 22 22 + // HEAD and revspec navigation (HEAD~2, foo^, ref@{...}, a..b, path:file) are rejected. 23 23 + bytes rev = 2; 24 24 + } 25 25 + message ResolveRevResponse { 26 26 + // commit is the resolved commit object id, hex-encoded. 27 27 + string commit = 1; 28 28 + } 29 29 + 30 30 + // A commit in a specific repo, addressed by the repo's DID. 31 31 + message RepoCommit { 32 32 + // repo carries the DID as a string. 33 33 + string repo = 1; 34 34 + // commit is a full commit object id, hex-encoded (NOT a revspec/branch/tag). 35 35 + bytes commit = 2; 36 36 + } 37 37 + 38 38 + message MergeCheckRequest { 39 39 + // Branch/commit being merged into (the "ours" side of the 3-way merge). 40 40 + RepoCommit target = 1; 41 41 + // PR head being merged (the "theirs" side of the 3-way merge). 42 42 + RepoCommit source = 2; 43 43 + } 44 44 + message MergeCheckResponse { 45 45 + // Whether the 3-way merge has unresolved conflicts. 46 46 + bool is_conflicted = 1; 47 47 + // One entry per conflicted file. 48 48 + repeated MergeConflict conflicts = 2; 49 49 + // Optional human-readable summary of the merge check. 50 50 + optional string message = 3; 51 51 + } 52 52 + message MergeConflict { 53 53 + string filename = 1; 54 54 + string reason = 2; 55 55 + } 56 56 + 57 57 + message CommitLogRequest { 58 58 + // repo DID 59 59 + string repo = 1; 60 60 + // Ranges to include in the git log (revspec, "A..B", "A...B", etc.). 61 61 + // At least one range, or all_refs must be specified. 62 62 + repeated bytes ranges = 2; 63 63 + // If true, all refs are searched for commits. 64 64 + // Must not be true when ranges are given. 65 65 + bool all_refs = 3; 66 66 + // After is an optional parameter to specify the earliest commit to consider. 67 67 + google.protobuf.Timestamp after = 4; 68 68 + // Before is an optional parameter to specify the latest commit to consider. 69 69 + google.protobuf.Timestamp before = 5; 70 70 + // MaxCommits is an optional parameter to specify the maximum number of commits 71 71 + // to return. If max_commits is 0, all commits that match the criteria will be 72 72 + // returned. 73 73 + uint32 max_commits = 6; 74 74 + // Skip is an optional parameter to specify the number of commits to skip. 75 75 + // This can be used to implement a poor mans pagination. 76 76 + uint32 skip = 7; 77 77 + } 78 78 + message CommitLogResponse { 79 79 + repeated GitCommit commits = 1; 80 80 + } 81 81 + 82 82 + message GetBlobRequest { 83 83 + // repo carries the DID as a string. 84 84 + string repo = 1; 85 85 + // oid is the blob object id (hex). 86 86 + string oid = 2; 87 87 + } 88 88 + message BlobChunk { 89 89 + bytes data = 1; 90 90 + } 91 91 + 92 92 + message DiffRequest { 93 93 + RepoCommit base = 1; 94 94 + RepoCommit head = 2; 95 95 + ComparisonType comparison_type = 3; 96 96 + 97 97 + enum ComparisonType { 98 98 + COMPARISON_TYPE_UNSPECIFIED = 0; 99 99 + // Corresponds to the BASE..HEAD syntax that only returns any commits that 100 100 + // are in HEAD but not in BASE. 101 101 + COMPARISON_TYPE_ONLY_IN_HEAD = 1; 102 102 + // Corresponds to the BASE...HEAD syntax that returns any commits that are 103 103 + // not in both BASE and HEAD. 104 104 + COMPARISON_TYPE_INTERSECTION = 2; 105 105 + } 106 106 + } 107 107 + 108 108 + message InterdiffRequest { 109 109 + // repo carries the DID as a string. 110 110 + string repo = 1; 111 111 + // Old patch range (from_base..from_head) and new patch range (to_base..to_head). 112 112 + bytes from_base = 2; 113 113 + bytes from_head = 3; 114 114 + bytes to_base = 4; 115 115 + bytes to_head = 5; 116 116 + } 117 117 + 118 118 + // Diff and Interdiff stream one FileDiff per changed file. 119 119 + 120 120 + message FileContent { 121 121 + string path = 1; 122 122 + string oid = 2; 123 123 + uint64 size = 3; 124 124 + bool is_binary = 4; 125 125 + bool is_submodule = 5; 126 126 + // Raw file bytes, inlined when the oid is not fetchable by the client 127 127 + // (e.g. interdiff) 128 128 + optional bytes content = 6; 129 129 + } 130 130 + 131 131 + // One aligned line pair; a side is absent (None) when unset. 132 132 + message LinePair { 133 133 + optional uint32 lhs = 1; 134 134 + optional uint32 rhs = 2; 135 135 + } 136 136 + 137 137 + message Hunk { 138 138 + // LineNumber (u32) sets containing novel content per side. 139 139 + repeated uint32 novel_lhs = 1; 140 140 + repeated uint32 novel_rhs = 2; 141 141 + repeated LinePair lines = 3; 142 142 + } 143 143 + 144 144 + // Number of bytes per side when the files differ (Rust Option<(usize, usize)>). 145 145 + message ByteChanges { 146 146 + uint64 lhs = 1; 147 147 + uint64 rhs = 2; 148 148 + } 149 149 + 150 150 + message FileDiff { 151 151 + FileContent lhs_src = 1; 152 152 + FileContent rhs_src = 2; 153 153 + repeated Hunk hunks = 3; 154 154 + optional ByteChanges has_byte_changes = 4; 155 155 + bool has_syntactic_changes = 5; 156 156 + // TODO: lhs_positions & rhs_positions 157 157 + } 158 158 + 159 159 + message GitCommit { 160 160 + string oid = 1; 161 161 + GitSignature author = 2; 162 162 + GitSignature committer = 3; 163 163 + bytes message = 4; 164 164 + repeated string parents = 5; 165 165 + map<string, string> extra_headers = 6; 166 166 + } 167 167 + 168 168 + message GitSignature { 169 169 + bytes name = 1; 170 170 + bytes email = 2; 171 171 + google.protobuf.Timestamp date = 3; 172 172 + }

+365

gitmirror/src/diff.rs

View file Reviewed

··· 1 1 + use gix::ObjectId; 2 2 + use gix::bstr::ByteSlice as _; 3 3 + use gix::objs::tree::EntryKind; 4 4 + use line_numbers::{LineNumber, SingleLineSpan}; 5 5 + use rustc_hash::FxHashSet; 6 6 + use tracing::info; 7 7 + 8 8 + /// Blobs larger than this are treated as binary. 9 9 + const LARGE_FILE_THRESHOLD_BYTES: u64 = 1024 * 1024; 10 10 + 11 11 + #[derive(Debug)] 12 12 + pub struct FileContent { 13 13 + pub(crate) path: String, 14 14 + pub(crate) oid: String, 15 15 + pub(crate) size: usize, 16 16 + pub(crate) is_binary: bool, 17 17 + pub(crate) is_submodule: bool, 18 18 + /// Raw file bytes, inlined when the `oid` is not fetchable by the client (interdiff's 19 19 + /// synthetic rebased tree). `None` for ordinary diffs and for binary/oversized blobs. 20 20 + pub(crate) content: Option<Vec<u8>>, 21 21 + } 22 22 + 23 23 + impl From<FileContent> for crate::protocol::v1::FileContent { 24 24 + fn from(f: FileContent) -> Self { 25 25 + Self { 26 26 + path: f.path, 27 27 + oid: f.oid, 28 28 + size: f.size as u64, 29 29 + is_binary: f.is_binary, 30 30 + is_submodule: f.is_submodule, 31 31 + content: f.content, 32 32 + } 33 33 + } 34 34 + } 35 35 + 36 36 + #[derive(Debug, Clone)] 37 37 + pub struct Hunk { 38 38 + pub(crate) novel_lhs: FxHashSet<LineNumber>, 39 39 + pub(crate) novel_rhs: FxHashSet<LineNumber>, 40 40 + pub(crate) lines: Vec<(Option<LineNumber>, Option<LineNumber>)>, 41 41 + } 42 42 + 43 43 + impl From<Hunk> for crate::protocol::v1::Hunk { 44 44 + fn from(h: Hunk) -> Self { 45 45 + // Sort the novel line sets for deterministic output. 46 46 + let sorted = |set: FxHashSet<LineNumber>| -> Vec<u32> { 47 47 + let mut v: Vec<u32> = set.into_iter().map(|n| n.0).collect(); 48 48 + v.sort_unstable(); 49 49 + v 50 50 + }; 51 51 + Self { 52 52 + novel_lhs: sorted(h.novel_lhs), 53 53 + novel_rhs: sorted(h.novel_rhs), 54 54 + lines: h 55 55 + .lines 56 56 + .into_iter() 57 57 + .map(|(lhs, rhs)| crate::protocol::v1::LinePair { 58 58 + lhs: lhs.map(|n| n.0), 59 59 + rhs: rhs.map(|n| n.0), 60 60 + }) 61 61 + .collect(), 62 62 + } 63 63 + } 64 64 + } 65 65 + 66 66 + /// A matched token (an atom, a delimiter, or a comment word). 67 67 + #[derive(PartialEq, Eq, Debug, Clone)] 68 68 + pub enum MatchKind { 69 69 + // TBD 70 70 + } 71 71 + 72 72 + #[derive(Debug, Clone, PartialEq, Eq)] 73 73 + pub struct MatchedPos { 74 74 + pub(crate) kind: MatchKind, 75 75 + pub(crate) pos: SingleLineSpan, 76 76 + } 77 77 + 78 78 + #[derive(Debug)] 79 79 + pub struct Diff { 80 80 + pub(crate) lhs_src: FileContent, 81 81 + pub(crate) rhs_src: FileContent, 82 82 + pub(crate) hunks: Vec<Hunk>, 83 83 + 84 84 + #[allow(unused)] 85 85 + pub(crate) lhs_positions: Vec<MatchedPos>, 86 86 + #[allow(unused)] 87 87 + pub(crate) rhs_positions: Vec<MatchedPos>, 88 88 + 89 89 + /// If the two files do not have exactly the same bytes, the 90 90 + /// number of bytes in each file. 91 91 + pub(crate) has_byte_changes: Option<(usize, usize)>, 92 92 + pub(crate) has_syntactic_changes: bool, 93 93 + } 94 94 + 95 95 + impl From<Diff> for crate::protocol::v1::FileDiff { 96 96 + fn from(d: Diff) -> Self { 97 97 + Self { 98 98 + lhs_src: Some(d.lhs_src.into()), 99 99 + rhs_src: Some(d.rhs_src.into()), 100 100 + hunks: d.hunks.into_iter().map(Into::into).collect(), 101 101 + has_byte_changes: d.has_byte_changes.map(|(lhs, rhs)| { 102 102 + crate::protocol::v1::ByteChanges { 103 103 + lhs: lhs as u64, 104 104 + rhs: rhs as u64, 105 105 + } 106 106 + }), 107 107 + has_syntactic_changes: d.has_syntactic_changes, 108 108 + } 109 109 + } 110 110 + } 111 111 + 112 112 + /// Diff two trees, yielding one [`Diff`] per changed file (line-level [`Hunk`]s included). 113 113 + /// 114 114 + /// Returns a lazy iterator of `anyhow::Result<Diff>`. 115 115 + pub fn diff<'repo>( 116 116 + repo: &'repo gix::Repository, 117 117 + old_tree: &gix::Tree<'_>, 118 118 + new_tree: &gix::Tree<'_>, 119 119 + embed_content: bool, 120 120 + ) -> anyhow::Result<DiffIter<'repo>> { 121 121 + let changes = repo.diff_tree_to_tree(Some(old_tree), Some(new_tree), None)?; 122 122 + let mut cache = repo.diff_resource_cache_for_tree_diff()?; 123 123 + cache.filter.options.large_file_threshold_bytes = LARGE_FILE_THRESHOLD_BYTES; 124 124 + Ok(DiffIter { 125 125 + repo, 126 126 + changes: changes.into_iter(), 127 127 + cache, 128 128 + embed_content, 129 129 + }) 130 130 + } 131 131 + 132 132 + /// Lazy iterator over per-file [`Diff`]s. 133 133 + pub struct DiffIter<'repo> { 134 134 + repo: &'repo gix::Repository, 135 135 + changes: std::vec::IntoIter<gix::object::tree::diff::ChangeDetached>, 136 136 + cache: gix::diff::blob::Platform, 137 137 + embed_content: bool, 138 138 + } 139 139 + 140 140 + impl Iterator for DiffIter<'_> { 141 141 + type Item = anyhow::Result<Diff>; 142 142 + 143 143 + fn next(&mut self) -> Option<Self::Item> { 144 144 + loop { 145 145 + let change = self.changes.next()?; 146 146 + let (old, new) = change_sides(&change); 147 147 + // Trees are recursed into by gix and never diffed directly; skip defensively. 148 148 + if old.is_kind(EntryKind::Tree) || new.is_kind(EntryKind::Tree) { 149 149 + continue; 150 150 + } 151 151 + // Submodules (gitlinks) can't go through the blob pipeline — their commit lives in 152 152 + // another repo. Emit the commit oids directly for the caller to compare. 153 153 + if old.is_kind(EntryKind::Commit) || new.is_kind(EntryKind::Commit) { 154 154 + return Some(Ok(submodule_diff(self.repo, &change, old, new))); 155 155 + } 156 156 + let result = build_diff(self.repo, &change, &mut self.cache, self.embed_content); 157 157 + self.cache.clear_resource_cache_keep_allocation(); 158 158 + return Some(result); 159 159 + } 160 160 + } 161 161 + } 162 162 + 163 163 + enum Side { 164 164 + Absent, 165 165 + Present { oid: ObjectId, kind: EntryKind }, 166 166 + } 167 167 + 168 168 + impl Side { 169 169 + fn is_kind(&self, wanted: EntryKind) -> bool { 170 170 + matches!(self, Side::Present { kind, .. } if *kind == wanted) 171 171 + } 172 172 + } 173 173 + 174 174 + /// Decompose a change into its `(old, new)` sides regardless of variant. 175 175 + fn change_sides(change: &gix::object::tree::diff::ChangeDetached) -> (Side, Side) { 176 176 + use gix::object::tree::diff::ChangeDetached as C; 177 177 + let present = |oid, mode: gix::object::tree::EntryMode| Side::Present { 178 178 + oid, 179 179 + kind: mode.kind(), 180 180 + }; 181 181 + match change { 182 182 + C::Addition { id, entry_mode, .. } => (Side::Absent, present(*id, *entry_mode)), 183 183 + C::Deletion { id, entry_mode, .. } => (present(*id, *entry_mode), Side::Absent), 184 184 + C::Modification { 185 185 + previous_id, 186 186 + previous_entry_mode, 187 187 + id, 188 188 + entry_mode, 189 189 + .. 190 190 + } => ( 191 191 + present(*previous_id, *previous_entry_mode), 192 192 + present(*id, *entry_mode), 193 193 + ), 194 194 + C::Rewrite { 195 195 + source_id, 196 196 + source_entry_mode, 197 197 + id, 198 198 + entry_mode, 199 199 + .. 200 200 + } => ( 201 201 + present(*source_id, *source_entry_mode), 202 202 + present(*id, *entry_mode), 203 203 + ), 204 204 + } 205 205 + } 206 206 + 207 207 + /// Build a [`Diff`] for a submodule (gitlink) change: no hunks, both sides carry their commit 208 208 + /// oid with `is_submodule` set. The caller compares the oids as submodule pointers. 209 209 + fn submodule_diff( 210 210 + repo: &gix::Repository, 211 211 + change: &gix::object::tree::diff::ChangeDetached, 212 212 + old: Side, 213 213 + new: Side, 214 214 + ) -> Diff { 215 215 + let path = change.location().to_string(); 216 216 + let side = |s: Side| FileContent { 217 217 + path: path.clone(), 218 218 + oid: match s { 219 219 + Side::Absent => ObjectId::null(repo.object_hash()).to_string(), 220 220 + Side::Present { oid, .. } => oid.to_string(), 221 221 + }, 222 222 + size: 0, 223 223 + is_binary: false, 224 224 + is_submodule: true, 225 225 + content: None, 226 226 + }; 227 227 + Diff { 228 228 + lhs_src: side(old), 229 229 + rhs_src: side(new), 230 230 + hunks: Vec::new(), 231 231 + lhs_positions: Vec::new(), 232 232 + rhs_positions: Vec::new(), 233 233 + has_byte_changes: None, 234 234 + has_syntactic_changes: false, 235 235 + } 236 236 + } 237 237 + 238 238 + /// Build the [`Diff`] for a single changed file. 239 239 + fn build_diff( 240 240 + repo: &gix::Repository, 241 241 + change: &gix::object::tree::diff::ChangeDetached, 242 242 + cache: &mut gix::diff::blob::Platform, 243 243 + embed_content: bool, 244 244 + ) -> anyhow::Result<Diff> { 245 245 + use gix::diff::blob::platform::prepare_diff::Operation; 246 246 + use gix::diff::blob::platform::resource::Data; 247 247 + use gix::diff::blob::{Diff as BlobDiff, InternedInput}; 248 248 + use gix::prelude::TreeDiffChangeExt as _; 249 249 + 250 250 + let change = change.attach(repo, repo); 251 251 + let blob = change.diff(cache)?; 252 252 + let out = blob.resource_cache.prepare_diff()?; 253 253 + 254 254 + // Per-side file metadata, derived from the prepared resources. 255 255 + let side = 256 256 + |res: &gix::diff::blob::platform::Resource<'_>, embed_content: bool| -> FileContent { 257 257 + let (size, is_binary, content) = match res.data { 258 258 + // Only textual buffers carry inlinable bytes; binary/missing sides fall back to oid. 259 259 + Data::Buffer { buf, .. } => (buf.len(), false, embed_content.then(|| buf.to_vec())), 260 260 + Data::Binary { size } => (size as usize, true, None), 261 261 + Data::Missing => (0, false, None), 262 262 + }; 263 263 + FileContent { 264 264 + path: res.rela_path.to_string(), 265 265 + oid: res.id.to_string(), 266 266 + size, 267 267 + is_binary, 268 268 + is_submodule: false, 269 269 + content, 270 270 + } 271 271 + }; 272 272 + let mut lhs_src = side(&out.old, embed_content); 273 273 + let mut rhs_src = side(&out.new, false); 274 274 + 275 275 + let has_byte_changes = if lhs_src.size == rhs_src.size && out.old.id == out.new.id { 276 276 + None 277 277 + } else { 278 278 + Some((lhs_src.size, rhs_src.size)) 279 279 + }; 280 280 + 281 281 + let hunks = match out.operation { 282 282 + Operation::InternalDiff { algorithm } => { 283 283 + let input = InternedInput::new(out.old.intern_source(), out.new.intern_source()); 284 284 + let mut d = BlobDiff::compute(algorithm, &input); 285 285 + d.postprocess_lines(&input); 286 286 + d.hunks() 287 287 + .map(|h| { 288 288 + let before: Vec<LineNumber> = h.before.clone().map(LineNumber).collect(); 289 289 + let after: Vec<LineNumber> = h.after.clone().map(LineNumber).collect(); 290 290 + let n = before.len().max(after.len()); 291 291 + let lines = (0..n) 292 292 + .map(|i| (before.get(i).copied(), after.get(i).copied())) 293 293 + .collect(); 294 294 + Hunk { 295 295 + novel_lhs: before.iter().copied().collect(), 296 296 + novel_rhs: after.iter().copied().collect(), 297 297 + lines, 298 298 + } 299 299 + }) 300 300 + .collect() 301 301 + } 302 302 + Operation::SourceOrDestinationIsBinary => { 303 303 + lhs_src.is_binary = true; 304 304 + rhs_src.is_binary = true; 305 305 + Vec::new() 306 306 + } 307 307 + Operation::ExternalCommand { .. } => unreachable!("we disabled that"), 308 308 + }; 309 309 + 310 310 + Ok(Diff { 311 311 + lhs_src, 312 312 + rhs_src, 313 313 + hunks, 314 314 + lhs_positions: Vec::new(), 315 315 + rhs_positions: Vec::new(), 316 316 + has_byte_changes, 317 317 + has_syntactic_changes: false, 318 318 + }) 319 319 + } 320 320 + 321 321 + /// Compute the two trees whose diff is the interdiff between an old patch 322 322 + /// version (`from_base..from_head`) and a new one (`to_base..to_head`). 323 323 + /// 324 324 + /// Rebase `from_base..from_head` onto `to_base` and return rebased tree so 325 325 + /// caller can diff between `rebased_tree` and `to_head.tree` 326 326 + pub fn prepare_interdiff<'repo>( 327 327 + repo: &'repo gix::Repository, 328 328 + (from_base_id, from_head_id): (ObjectId, ObjectId), 329 329 + to_base_id: ObjectId, 330 330 + ) -> anyhow::Result<gix::Tree<'repo>> { 331 331 + let from_head = repo.find_commit(from_head_id)?; 332 332 + 333 333 + let from_base = repo.find_commit(from_base_id)?; 334 334 + let to_base = repo.find_commit(to_base_id)?; 335 335 + 336 336 + // Endpoint trees for the 3-way merge. 337 337 + let from_base_tree = from_base.tree_id()?.detach(); 338 338 + let from_head_tree = from_head.tree_id()?.detach(); 339 339 + let to_base_tree = to_base.tree_id()?.detach(); 340 340 + 341 341 + let options = repo.tree_merge_options()?; 342 342 + let labels = gix::merge::blob::builtin_driver::text::Labels { 343 343 + ancestor: Some("from.base".as_bytes().as_bstr()), 344 344 + current: Some("to.base".as_bytes().as_bstr()), 345 345 + other: Some("from.head".as_bytes().as_bstr()), 346 346 + }; 347 347 + let mut outcome = repo.merge_trees( 348 348 + from_base_tree, 349 349 + to_base_tree, 350 350 + from_head_tree, 351 351 + labels, 352 352 + options, 353 353 + )?; 354 354 + 355 355 + if !outcome.conflicts.is_empty() { 356 356 + info!( 357 357 + conflicts = outcome.conflicts.len(), 358 358 + "interdiff rebase produced conflicts; tree contains conflict markers" 359 359 + ); 360 360 + } 361 361 + 362 362 + let rebased_id = outcome.tree.write()?.detach(); 363 363 + let rebased_tree = repo.find_tree(rebased_id)?; 364 364 + Ok(rebased_tree) 365 365 + }

+46

gitmirror/src/main.rs

View file Reviewed

··· 1 1 + use std::net::SocketAddr; 2 2 + use std::path::PathBuf; 3 3 + 4 4 + use clap::{Parser, Subcommand}; 5 5 + 6 6 + mod diff; 7 7 + mod merge; 8 8 + mod protocol; 9 9 + mod service; 10 10 + 11 11 + #[derive(Parser)] 12 12 + #[command(name = "gitmirror", about = "Git mirror gRPC service")] 13 13 + struct Cli { 14 14 + #[command(subcommand)] 15 15 + cmd: Command, 16 16 + } 17 17 + 18 18 + #[derive(Subcommand)] 19 19 + enum Command { 20 20 + /// Run the gRPC server. 21 21 + Serve(ServeArgs), 22 22 + } 23 23 + 24 24 + #[derive(clap::Args)] 25 25 + struct ServeArgs { 26 26 + /// Address to bind the gRPC server to. 27 27 + #[arg(long, env = "GITMIRROR_ADDR", default_value = "127.0.0.1:9000")] 28 28 + addr: SocketAddr, 29 29 + 30 30 + /// Base directory holding bare mirror repos, one per DID (<base>/<did>). 31 31 + #[arg(long, env = "GITMIRROR_REPO_BASE", default_value = "repos")] 32 32 + repo_base: PathBuf, 33 33 + } 34 34 + 35 35 + #[tokio::main] 36 36 + async fn main() -> anyhow::Result<()> { 37 37 + tracing_subscriber::fmt() 38 38 + .with_env_filter( 39 39 + tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| "info".into()), 40 40 + ) 41 41 + .init(); 42 42 + 43 43 + match Cli::parse().cmd { 44 44 + Command::Serve(args) => service::serve(args.addr, args.repo_base).await, 45 45 + } 46 46 + }

+289

gitmirror/src/merge.rs

View file Reviewed

··· 1 1 + use gix::bstr::ByteSlice as _; 2 2 + use gix::diff::tree_with_rewrites::Change; 3 3 + use gix::merge::tree::{Conflict, TreatAsUnresolved}; 4 4 + 5 5 + use crate::protocol::v1::{MergeCheckResponse, MergeConflict}; 6 6 + 7 7 + /// Perform a 3-way merge check between `target` (ours) and `source` (theirs), using their 8 8 + /// merge base as the common ancestor. 9 9 + /// 10 10 + /// This is read-only: it inspects only the conflicts of the in-memory merge and never persists 11 11 + /// the merged tree. The caller must have opened `repo` with [`gix::Repository::with_object_memory`] 12 12 + /// so that any objects `merge_trees` writes while merging land in memory rather than on disk — 13 13 + /// the mirrored repositories (reached read-only via alternates) are never mutated. 14 14 + pub fn merge_check( 15 15 + repo: &gix::Repository, 16 16 + target_oid: gix::ObjectId, 17 17 + source_oid: gix::ObjectId, 18 18 + ) -> anyhow::Result<MergeCheckResponse> { 19 19 + let our_tree = repo.find_commit(target_oid)?.tree_id()?.detach(); 20 20 + let their_tree = repo.find_commit(source_oid)?.tree_id()?.detach(); 21 21 + 22 22 + // Common ancestor for the 3-way merge. When the histories are unrelated (no merge base), 23 23 + // fall back to the empty tree — the same behaviour as `git merge --allow-unrelated-histories`, 24 24 + // which surfaces add/add conflicts with real filenames instead of erroring out. 25 25 + let (ancestor_tree, unrelated) = match repo.merge_base(target_oid, source_oid) { 26 26 + Ok(base) => (repo.find_commit(base.detach())?.tree_id()?.detach(), false), 27 27 + Err(_) => (gix::ObjectId::empty_tree(repo.object_hash()), true), 28 28 + }; 29 29 + 30 30 + let options = repo.tree_merge_options()?; 31 31 + let labels = gix::merge::blob::builtin_driver::text::Labels { 32 32 + ancestor: Some("ancestor".as_bytes().as_bstr()), 33 33 + current: Some("target".as_bytes().as_bstr()), 34 34 + other: Some("source".as_bytes().as_bstr()), 35 35 + }; 36 36 + 37 37 + let outcome = repo.merge_trees(ancestor_tree, our_tree, their_tree, labels, options)?; 38 38 + 39 39 + // Report only genuinely-unresolved conflicts (matching git's notion), so gix's 40 40 + // auto-resolutions don't show up as false positives. The merged tree is intentionally 41 41 + // never written. 42 42 + let mut conflicts = Vec::new(); 43 43 + for conflict in &outcome.conflicts { 44 44 + if !conflict.is_unresolved(TreatAsUnresolved::git()) { 45 45 + continue; 46 46 + } 47 47 + conflicts.push(MergeConflict { 48 48 + filename: conflict.ours.location().to_string(), 49 49 + reason: conflict_reason(conflict).to_string(), 50 50 + }); 51 51 + } 52 52 + 53 53 + let is_conflicted = !conflicts.is_empty(); 54 54 + let message = match (is_conflicted, unrelated) { 55 55 + (true, true) => Some(format!( 56 56 + "{} conflicting file(s); unrelated histories (no common ancestor)", 57 57 + conflicts.len() 58 58 + )), 59 59 + (true, false) => Some(format!("{} conflicting file(s)", conflicts.len())), 60 60 + (false, true) => Some("no common ancestor (unrelated histories)".to_string()), 61 61 + (false, false) => None, 62 62 + }; 63 63 + 64 64 + Ok(MergeCheckResponse { 65 65 + is_conflicted, 66 66 + conflicts, 67 67 + message, 68 68 + }) 69 69 + } 70 70 + 71 71 + /// Classify a conflict into a short, human-readable reason from the shape of the two changes. 72 72 + /// Derived from the change variants rather than the resolution failure so it stays stable 73 73 + /// across gix versions. 74 74 + fn conflict_reason(conflict: &Conflict) -> &'static str { 75 75 + match (&conflict.ours, &conflict.theirs) { 76 76 + (Change::Deletion { .. }, _) | (_, Change::Deletion { .. }) => "modify/delete conflict", 77 77 + (Change::Addition { .. }, Change::Addition { .. }) => "add/add conflict", 78 78 + (Change::Rewrite { .. }, _) | (_, Change::Rewrite { .. }) => "rename conflict", 79 79 + _ => "content conflict", 80 80 + } 81 81 + } 82 82 + 83 83 + #[cfg(test)] 84 84 + mod tests { 85 85 + use super::*; 86 86 + use std::path::Path; 87 87 + use std::process::Command; 88 88 + 89 89 + fn git(dir: &Path, args: &[&str]) { 90 90 + let status = Command::new("git") 91 91 + .args(args) 92 92 + .current_dir(dir) 93 93 + .env("GIT_AUTHOR_NAME", "t") 94 94 + .env("GIT_AUTHOR_EMAIL", "t@t") 95 95 + .env("GIT_COMMITTER_NAME", "t") 96 96 + .env("GIT_COMMITTER_EMAIL", "t@t") 97 97 + .status() 98 98 + .expect("run git"); 99 99 + assert!(status.success(), "git {args:?} failed"); 100 100 + } 101 101 + 102 102 + fn write(dir: &Path, name: &str, content: &str) { 103 103 + std::fs::write(dir.join(name), content).unwrap(); 104 104 + } 105 105 + 106 106 + fn rev_parse(dir: &Path, rev: &str) -> gix::ObjectId { 107 107 + let out = Command::new("git") 108 108 + .args(["rev-parse", rev]) 109 109 + .current_dir(dir) 110 110 + .output() 111 111 + .expect("rev-parse"); 112 112 + let hex = String::from_utf8(out.stdout).unwrap(); 113 113 + gix::ObjectId::from_hex(hex.trim().as_bytes()).unwrap() 114 114 + } 115 115 + 116 116 + /// Count loose object files under `<repo>/.git/objects`, ignoring `info` and `pack`. 117 117 + fn count_loose_objects(git_dir: &Path) -> usize { 118 118 + let objects = git_dir.join(".git").join("objects"); 119 119 + let mut n = 0; 120 120 + for shard in std::fs::read_dir(&objects).unwrap() { 121 121 + let shard = shard.unwrap(); 122 122 + let name = shard.file_name(); 123 123 + if name == "info" || name == "pack" || !shard.file_type().unwrap().is_dir() { 124 124 + continue; 125 125 + } 126 126 + n += std::fs::read_dir(shard.path()).unwrap().count(); 127 127 + } 128 128 + n 129 129 + } 130 130 + 131 131 + /// Build a repo with a shared base commit, a `main` (target/ours) tip, and a `source` 132 132 + /// (theirs) tip built by the two closures. 133 133 + fn fixture( 134 134 + target: impl FnOnce(&Path), 135 135 + source: impl FnOnce(&Path), 136 136 + ) -> (tempfile::TempDir, gix::ObjectId, gix::ObjectId) { 137 137 + let dir = tempfile::tempdir().unwrap(); 138 138 + let p = dir.path(); 139 139 + git(p, &["init", "-q", "-b", "main"]); 140 140 + write(p, "a.txt", "line1\nline2\nline3\n"); 141 141 + write(p, "b.txt", "keep\n"); 142 142 + git(p, &["add", "."]); 143 143 + git(p, &["commit", "-q", "-m", "base"]); 144 144 + 145 145 + git(p, &["branch", "source"]); 146 146 + // target edits on main 147 147 + target(p); 148 148 + git(p, &["add", "-A"]); 149 149 + git(p, &["commit", "-q", "-m", "target"]); 150 150 + let target_oid = rev_parse(p, "main"); 151 151 + 152 152 + git(p, &["checkout", "-q", "source"]); 153 153 + source(p); 154 154 + git(p, &["add", "-A"]); 155 155 + git(p, &["commit", "-q", "-m", "source"]); 156 156 + let source_oid = rev_parse(p, "source"); 157 157 + 158 158 + (dir, target_oid, source_oid) 159 159 + } 160 160 + 161 161 + fn open_in_memory(dir: &Path) -> gix::Repository { 162 162 + gix::open(dir).unwrap().with_object_memory() 163 163 + } 164 164 + 165 165 + /// Mirror of `GitMirror::open_merge_scratch`: a throwaway repo whose alternates point at the 166 166 + /// given object dirs, opened in-memory. 167 167 + fn scratch_with_alternates(object_dirs: &[std::path::PathBuf]) -> (tempfile::TempDir, gix::Repository) { 168 168 + let scratch = tempfile::tempdir().unwrap(); 169 169 + gix::init_bare(scratch.path()).unwrap(); 170 170 + let info = scratch.path().join("objects").join("info"); 171 171 + std::fs::create_dir_all(&info).unwrap(); 172 172 + let mut alternates = String::new(); 173 173 + for d in object_dirs { 174 174 + alternates.push_str(&std::fs::canonicalize(d).unwrap().display().to_string()); 175 175 + alternates.push('\n'); 176 176 + } 177 177 + std::fs::write(info.join("alternates"), alternates).unwrap(); 178 178 + let repo = gix::open(scratch.path()).unwrap().with_object_memory(); 179 179 + (scratch, repo) 180 180 + } 181 181 + 182 182 + #[test] 183 183 + fn cross_repo_via_alternates_never_touches_mirrors() { 184 184 + // Two separate repos sharing a base commit: `a` holds the target tip, `b` the source 185 185 + // tip. This is the real gitmirror shape (target and source live in different mirrors). 186 186 + let a = tempfile::tempdir().unwrap(); 187 187 + let ap = a.path(); 188 188 + git(ap, &["init", "-q", "-b", "main"]); 189 189 + write(ap, "a.txt", "line1\nline2\nline3\n"); 190 190 + git(ap, &["add", "."]); 191 191 + git(ap, &["commit", "-q", "-m", "base"]); 192 192 + // target edit in repo `a` 193 193 + write(ap, "a.txt", "line1\nOURS\nline3\n"); 194 194 + git(ap, &["add", "-A"]); 195 195 + git(ap, &["commit", "-q", "-m", "target"]); 196 196 + let target = rev_parse(ap, "main"); 197 197 + 198 198 + // Clone `a` → `b`, reset to the shared base, and make a conflicting source edit. 199 199 + let b = tempfile::tempdir().unwrap(); 200 200 + let bp = b.path(); 201 201 + git(bp, &["clone", "-q", ap.to_str().unwrap(), "."]); 202 202 + git(bp, &["checkout", "-q", "-B", "source", &target.to_string()]); 203 203 + git(bp, &["reset", "-q", "--hard", "HEAD~1"]); // back to base 204 204 + write(bp, "a.txt", "line1\nTHEIRS\nline3\n"); 205 205 + git(bp, &["add", "-A"]); 206 206 + git(bp, &["commit", "-q", "-m", "source"]); 207 207 + let source = rev_parse(bp, "source"); 208 208 + 209 209 + let a_objs = ap.join(".git").join("objects"); 210 210 + let b_objs = bp.join(".git").join("objects"); 211 211 + let before_a = count_loose_objects(ap); 212 212 + let before_b = count_loose_objects(bp); 213 213 + 214 214 + let (_scratch, repo) = scratch_with_alternates(&[a_objs, b_objs]); 215 215 + let out = merge_check(&repo, target, source).unwrap(); 216 216 + 217 217 + assert!(out.is_conflicted); 218 218 + assert_eq!(out.conflicts.len(), 1); 219 219 + assert_eq!(out.conflicts[0].filename, "a.txt"); 220 220 + // Neither mirror gained loose objects — the merge was read-only against both. 221 221 + assert_eq!(count_loose_objects(ap), before_a, "target mirror mutated"); 222 222 + assert_eq!(count_loose_objects(bp), before_b, "source mirror mutated"); 223 223 + } 224 224 + 225 225 + #[test] 226 226 + fn non_overlapping_edits_are_clean() { 227 227 + let (dir, t, s) = fixture( 228 228 + |p| write(p, "a.txt", "line1\nCHANGED\nline3\n"), 229 229 + |p| write(p, "b.txt", "keep\nappended\n"), 230 230 + ); 231 231 + let repo = open_in_memory(dir.path()); 232 232 + let before = count_loose_objects(dir.path()); 233 233 + let out = merge_check(&repo, t, s).unwrap(); 234 234 + assert!(!out.is_conflicted, "expected clean, got {out:?}"); 235 235 + assert!(out.conflicts.is_empty()); 236 236 + // never-touch-the-mirror: the in-memory merge writes no loose objects to disk. 237 237 + assert_eq!(count_loose_objects(dir.path()), before); 238 238 + } 239 239 + 240 240 + #[test] 241 241 + fn same_line_edits_conflict() { 242 242 + let (dir, t, s) = fixture( 243 243 + |p| write(p, "a.txt", "line1\nOURS\nline3\n"), 244 244 + |p| write(p, "a.txt", "line1\nTHEIRS\nline3\n"), 245 245 + ); 246 246 + let repo = open_in_memory(dir.path()); 247 247 + let before = count_loose_objects(dir.path()); 248 248 + let out = merge_check(&repo, t, s).unwrap(); 249 249 + assert!(out.is_conflicted); 250 250 + assert_eq!(out.conflicts.len(), 1); 251 251 + assert_eq!(out.conflicts[0].filename, "a.txt"); 252 252 + assert_eq!(out.conflicts[0].reason, "content conflict"); 253 253 + assert_eq!(count_loose_objects(dir.path()), before); 254 254 + } 255 255 + 256 256 + #[test] 257 257 + fn modify_delete_conflict() { 258 258 + let (dir, t, s) = fixture( 259 259 + |p| write(p, "a.txt", "line1\nOURS\nline3\n"), 260 260 + |p| std::fs::remove_file(p.join("a.txt")).unwrap(), 261 261 + ); 262 262 + let repo = open_in_memory(dir.path()); 263 263 + let out = merge_check(&repo, t, s).unwrap(); 264 264 + assert!(out.is_conflicted); 265 265 + assert_eq!(out.conflicts[0].filename, "a.txt"); 266 266 + assert_eq!(out.conflicts[0].reason, "modify/delete conflict"); 267 267 + } 268 268 + 269 269 + #[test] 270 270 + fn source_is_ancestor_is_clean() { 271 271 + // Source is an ancestor of target (i.e. already merged / up to date) → no conflicts. 272 272 + let dir = tempfile::tempdir().unwrap(); 273 273 + let p = dir.path(); 274 274 + git(p, &["init", "-q", "-b", "main"]); 275 275 + write(p, "a.txt", "line1\nline2\n"); 276 276 + git(p, &["add", "."]); 277 277 + git(p, &["commit", "-q", "-m", "base"]); 278 278 + let base = rev_parse(p, "main"); 279 279 + write(p, "a.txt", "line1\nline2\nline3\n"); 280 280 + git(p, &["add", "-A"]); 281 281 + git(p, &["commit", "-q", "-m", "target"]); 282 282 + let target = rev_parse(p, "main"); 283 283 + 284 284 + let repo = open_in_memory(p); 285 285 + let out = merge_check(&repo, target, base).unwrap(); 286 286 + assert!(!out.is_conflicted, "expected clean, got {out:?}"); 287 287 + assert!(out.conflicts.is_empty()); 288 288 + } 289 289 + }

+3

gitmirror/src/protocol.rs

View file Reviewed

··· 1 1 + pub mod v1 { 2 2 + tonic::include_proto!("gitmirror.v1"); 3 3 + }

+523

gitmirror/src/service.rs

View file Reviewed

··· 1 1 + use std::net::SocketAddr; 2 2 + use std::path::PathBuf; 3 3 + use std::pin::Pin; 4 4 + 5 5 + use gix::bstr::ByteSlice as _; 6 6 + use gix::revision::plumbing::Spec as RevSpec; 7 7 + use gix::revision::walk::Sorting; 8 8 + use tempfile::TempDir; 9 9 + use tokio::sync::mpsc; 10 10 + use tokio_stream::wrappers::ReceiverStream; 11 11 + use tokio_stream::Stream; 12 12 + use tonic::transport::Server; 13 13 + use tonic::{Request, Response, Status}; 14 14 + use tracing::{debug, info}; 15 15 + 16 16 + use crate::diff::{self, prepare_interdiff}; 17 17 + use crate::protocol::v1::diff_request::ComparisonType; 18 18 + use crate::protocol::v1::git_mirror_service_server::{GitMirrorService, GitMirrorServiceServer}; 19 19 + use crate::protocol::v1::{ 20 20 + BlobChunk, CommitLogRequest, CommitLogResponse, DiffRequest, FileDiff, GetBlobRequest, 21 21 + GitCommit, GitSignature, InterdiffRequest, MergeCheckRequest, MergeCheckResponse, 22 22 + ResolveRevRequest, ResolveRevResponse, 23 23 + }; 24 24 + 25 25 + type FileDiffStream = Pin<Box<dyn Stream<Item = Result<FileDiff, Status>> + Send>>; 26 26 + type BlobChunkStream = Pin<Box<dyn Stream<Item = Result<BlobChunk, Status>> + Send>>; 27 27 + type CommitLogResponseStream = 28 28 + Pin<Box<dyn Stream<Item = Result<CommitLogResponse, Status>> + Send>>; 29 29 + 30 30 + const BLOB_CHUNK_SIZE: usize = 64 * 1024; 31 31 + const COMMIT_LOG_BATCH_SIZE: usize = 128; 32 32 + 33 33 + struct GitMirror { 34 34 + repo_base: PathBuf, 35 35 + } 36 36 + 37 37 + /// A [`gix::Repository`] backed by a temporary directory that is removed on drop. Derefs to 38 38 + /// `gix::Repository`, so it is used just like one; keeping it alive keeps the scratch dir alive. 39 39 + struct TempRepository { 40 40 + repo: gix::Repository, 41 41 + // Declared AFTER `repo` so `repo` drops first: any file handles into the scratch dir close 42 42 + // before the dir itself is removed (Rust drops struct fields in declaration order). 43 43 + _dir: TempDir, 44 44 + } 45 45 + 46 46 + impl TempRepository { 47 47 + fn new(repo: gix::Repository, dir: TempDir) -> Self { 48 48 + Self { repo, _dir: dir } 49 49 + } 50 50 + } 51 51 + 52 52 + impl std::ops::Deref for TempRepository { 53 53 + type Target = gix::Repository; 54 54 + fn deref(&self) -> &gix::Repository { 55 55 + &self.repo 56 56 + } 57 57 + } 58 58 + 59 59 + impl GitMirror { 60 60 + fn open_repo(&self, did: &str) -> Result<gix::Repository, Status> { 61 61 + if !did.starts_with("did:") { 62 62 + return Err(Status::invalid_argument("repo must be a DID")); 63 63 + } 64 64 + gix::open(self.repo_base.join(did)) 65 65 + .map_err(|e| Status::not_found(format!("repo not found: {e}"))) 66 66 + } 67 67 + 68 68 + /// Build a throwaway bare repo whose `objects/info/alternates` points read-only at each of the 69 69 + /// given git repositories, so a single `gix::Repository` can see objects from all of them 70 70 + /// without ever mutating them. 71 71 + fn open_scratch(&self, dids: &[&str]) -> Result<TempRepository, Status> { 72 72 + let mut seen: Vec<&str> = Vec::new(); 73 73 + let mut object_dirs = Vec::new(); 74 74 + for &did in dids { 75 75 + if seen.contains(&did) { 76 76 + continue 77 77 + } 78 78 + if !did.starts_with("did:") { 79 79 + return Err(Status::invalid_argument("repo must be a DID")); 80 80 + } 81 81 + seen.push(did); 82 82 + let object_dir = std::fs::canonicalize(self.repo_base.join(did).join("objects")) 83 83 + .map_err(|_| Status::not_found(format!("repo not found: {did}")))?; 84 84 + object_dirs.push(object_dir); 85 85 + } 86 86 + if object_dirs.is_empty() { 87 87 + return Err(Status::internal("open_scratch requires at least one repo")); 88 88 + } 89 89 + 90 90 + let scratch = tempfile::tempdir().map_err(|e| Status::internal(e.to_string()))?; 91 91 + gix::init_bare(scratch.path()).map_err(|e| Status::internal(e.to_string()))?; 92 92 + 93 93 + let info_dir = scratch.path().join("objects").join("info"); 94 94 + std::fs::create_dir_all(&info_dir).map_err(|e| Status::internal(e.to_string()))?; 95 95 + let alternates = object_dirs 96 96 + .iter() 97 97 + .map(|p| p.display().to_string()) 98 98 + .collect::<Vec<_>>() 99 99 + .join("\n"); 100 100 + std::fs::write(info_dir.join("alternates"), format!("{alternates}\n")) 101 101 + .map_err(|e| Status::internal(e.to_string()))?; 102 102 + 103 103 + let repo = gix::open(scratch.path()) 104 104 + .map_err(|e| Status::internal(e.to_string()))? 105 105 + .with_object_memory(); 106 106 + Ok(TempRepository::new(repo, scratch)) 107 107 + } 108 108 + } 109 109 + 110 110 + #[tonic::async_trait] 111 111 + impl GitMirrorService for GitMirror { 112 112 + type DiffStream = FileDiffStream; 113 113 + 114 114 + async fn diff( 115 115 + &self, 116 116 + request: Request<DiffRequest>, 117 117 + ) -> Result<Response<Self::DiffStream>, Status> { 118 118 + let req = request.into_inner(); 119 119 + let head = req 120 120 + .head 121 121 + .ok_or_else(|| Status::invalid_argument("head is required"))?; 122 122 + let base = req.base; 123 123 + debug!( 124 124 + base_repo = ?base.as_ref().map(|b| b.repo.as_str()), 125 125 + base_commit = ?base.as_ref().map(|b| b.commit.as_bstr()), 126 126 + head_repo = %head.repo, 127 127 + head_commit = %head.commit.as_bstr(), 128 128 + "diff request", 129 129 + ); 130 130 + let scratch = match &base { 131 131 + Some(base) => self.open_scratch(&[head.repo.as_str(), base.repo.as_str()])?, 132 132 + None => self.open_scratch(&[head.repo.as_str()])?, 133 133 + }; 134 134 + let head_commit_id = find_commit_by_sha(&scratch, &head.commit)?; 135 135 + let base_commit_id = base 136 136 + .as_ref() 137 137 + .map(|b| find_commit_by_sha(&scratch, &b.commit)) 138 138 + .transpose()?; 139 139 + let comparison_type = 140 140 + ComparisonType::try_from(req.comparison_type).unwrap_or(ComparisonType::Unspecified); 141 141 + 142 142 + let (tx, rx) = mpsc::channel::<Result<FileDiff, Status>>(16); 143 143 + tokio::task::spawn_blocking(move || { 144 144 + let repo = &*scratch; 145 145 + 146 146 + let run = || -> anyhow::Result<()> { 147 147 + let head_commit = repo.find_commit(head_commit_id)?; 148 148 + let old = match base_commit_id { 149 149 + Some(base_commit_id) => match comparison_type { 150 150 + ComparisonType::OnlyInHead => { 151 151 + repo.find_tree(repo.find_commit(base_commit_id)?.tree_id()?)? 152 152 + } 153 153 + ComparisonType::Unspecified | ComparisonType::Intersection => { 154 154 + let merge_base = 155 155 + repo.merge_base(base_commit_id, head_commit_id)?.detach(); 156 156 + repo.find_tree(repo.find_commit(merge_base)?.tree_id()?)? 157 157 + } 158 158 + }, 159 159 + None => match head_commit.parent_ids().next() { 160 160 + Some(parent_id) => { 161 161 + repo.find_tree(repo.find_commit(parent_id.detach())?.tree_id()?)? 162 162 + } 163 163 + None => repo.empty_tree(), 164 164 + }, 165 165 + }; 166 166 + let new = repo.find_tree(head_commit.tree_id()?)?; 167 167 + for item in diff::diff(repo, &old, &new, false)? { 168 168 + if tx.blocking_send(Ok(item?.into())).is_err() { 169 169 + break; 170 170 + } 171 171 + } 172 172 + Ok(()) 173 173 + }; 174 174 + if let Err(e) = run() { 175 175 + let _ = tx.blocking_send(Err(Status::internal(e.to_string()))); 176 176 + } 177 177 + }); 178 178 + 179 179 + Ok(Response::new(Box::pin(ReceiverStream::new(rx)))) 180 180 + } 181 181 + 182 182 + type InterdiffStream = FileDiffStream; 183 183 + 184 184 + async fn interdiff( 185 185 + &self, 186 186 + request: Request<InterdiffRequest>, 187 187 + ) -> Result<Response<Self::InterdiffStream>, Status> { 188 188 + let req = request.into_inner(); 189 189 + let repo = self.open_repo(&req.repo)?; 190 190 + let from_base_id = resolve_commit_oid(&repo, &req.from_base)?; 191 191 + let from_head_id = resolve_commit_oid(&repo, &req.from_head)?; 192 192 + let to_base_id = resolve_commit_oid(&repo, &req.to_base)?; 193 193 + let to_head_id = resolve_commit_oid(&repo, &req.to_head)?; 194 194 + let safe = repo.into_sync(); 195 195 + 196 196 + let (tx, rx) = mpsc::channel::<Result<FileDiff, Status>>(16); 197 197 + tokio::task::spawn_blocking(move || { 198 198 + let repo = safe.to_thread_local(); 199 199 + let run = || -> anyhow::Result<()> { 200 200 + let to_head = repo.find_commit(to_head_id)?; 201 201 + let to_head_tree = to_head.tree()?; 202 202 + let rebased_tree = 203 203 + prepare_interdiff(&repo, (from_base_id, from_head_id), to_base_id)?; 204 204 + for item in diff::diff(&repo, &rebased_tree, &to_head_tree, true)? { 205 205 + if tx.blocking_send(Ok(item?.into())).is_err() { 206 206 + break; 207 207 + } 208 208 + } 209 209 + Ok(()) 210 210 + }; 211 211 + if let Err(e) = run() { 212 212 + let _ = tx.blocking_send(Err(Status::internal(e.to_string()))); 213 213 + } 214 214 + }); 215 215 + 216 216 + Ok(Response::new(Box::pin(ReceiverStream::new(rx)))) 217 217 + } 218 218 + 219 219 + type GetBlobStream = BlobChunkStream; 220 220 + 221 221 + async fn get_blob( 222 222 + &self, 223 223 + request: Request<GetBlobRequest>, 224 224 + ) -> Result<Response<Self::GetBlobStream>, Status> { 225 225 + let req = request.into_inner(); 226 226 + let repo = self.open_repo(&req.repo)?; 227 227 + let oid = gix::ObjectId::from_hex(req.oid.as_bytes()) 228 228 + .map_err(|e| Status::invalid_argument(format!("bad oid '{}': {e}", req.oid)))?; 229 229 + let safe = repo.into_sync(); 230 230 + 231 231 + let (tx, rx) = mpsc::channel::<Result<BlobChunk, Status>>(16); 232 232 + tokio::task::spawn_blocking(move || { 233 233 + let repo = safe.to_thread_local(); 234 234 + let run = || -> anyhow::Result<()> { 235 235 + let blob = repo.find_object(oid)?.try_into_blob()?; 236 236 + for chunk in blob.data.chunks(BLOB_CHUNK_SIZE) { 237 237 + let msg = BlobChunk { 238 238 + data: chunk.to_vec(), 239 239 + }; 240 240 + if tx.blocking_send(Ok(msg)).is_err() { 241 241 + break; 242 242 + } 243 243 + } 244 244 + Ok(()) 245 245 + }; 246 246 + if let Err(e) = run() { 247 247 + let _ = tx.blocking_send(Err(Status::internal(e.to_string()))); 248 248 + } 249 249 + }); 250 250 + 251 251 + Ok(Response::new(Box::pin(ReceiverStream::new(rx)))) 252 252 + } 253 253 + 254 254 + type CommitLogStream = CommitLogResponseStream; 255 255 + 256 256 + async fn commit_log( 257 257 + &self, 258 258 + request: Request<CommitLogRequest>, 259 259 + ) -> Result<Response<Self::CommitLogStream>, Status> { 260 260 + let req = request.into_inner(); 261 261 + debug!( 262 262 + repo = %req.repo, 263 263 + all_refs = req.all_refs, 264 264 + ranges = ?req.ranges, 265 265 + after = ?req.after, 266 266 + before = ?req.before, 267 267 + max_commits = req.max_commits, 268 268 + skip = req.skip, 269 269 + "commit_log request", 270 270 + ); 271 271 + if req.all_refs != req.ranges.is_empty() { 272 272 + return Err(Status::invalid_argument( 273 273 + "specify exactly one of `ranges` or `all_refs`", 274 274 + )); 275 275 + } 276 276 + let repo = self.open_repo(&req.repo)?; 277 277 + let safe = repo.into_sync(); 278 278 + 279 279 + let (tx, rx) = mpsc::channel::<Result<CommitLogResponse, Status>>(16); 280 280 + tokio::task::spawn_blocking(move || { 281 281 + let repo = safe.to_thread_local(); 282 282 + let run = || -> anyhow::Result<()> { 283 283 + let after = req.after.map(|t| t.seconds); 284 284 + let before = req.before.map(|t| t.seconds); 285 285 + let max_commits = req.max_commits as usize; 286 286 + let mut skip = req.skip as usize; 287 287 + let mut sent = 0usize; 288 288 + let mut batch = Vec::with_capacity(COMMIT_LOG_BATCH_SIZE); 289 289 + 290 290 + for info in commit_log_walk(&repo, &req)? { 291 291 + let info = info?; 292 292 + let commit_time = info.commit_time(); 293 293 + if before.is_some_and(|b| commit_time > b) { 294 294 + continue; 295 295 + } 296 296 + if after.is_some_and(|a| commit_time < a) { 297 297 + break; 298 298 + } 299 299 + if skip > 0 { 300 300 + skip -= 1; 301 301 + continue; 302 302 + } 303 303 + if max_commits != 0 && sent >= max_commits { 304 304 + break; 305 305 + } 306 306 + batch.push(GitCommit::try_from(&info.object()?)?); 307 307 + sent += 1; 308 308 + if batch.len() == COMMIT_LOG_BATCH_SIZE { 309 309 + let msg = CommitLogResponse { 310 310 + commits: std::mem::take(&mut batch), 311 311 + }; 312 312 + if tx.blocking_send(Ok(msg)).is_err() { 313 313 + return Ok(()); // client hung up 314 314 + } 315 315 + } 316 316 + } 317 317 + if !batch.is_empty() { 318 318 + let _ = tx.blocking_send(Ok(CommitLogResponse { commits: batch })); 319 319 + } 320 320 + Ok(()) 321 321 + }; 322 322 + if let Err(e) = run() { 323 323 + let _ = tx.blocking_send(Err(Status::internal(e.to_string()))); 324 324 + } 325 325 + }); 326 326 + 327 327 + Ok(Response::new(Box::pin(ReceiverStream::new(rx)))) 328 328 + } 329 329 + 330 330 + async fn merge_check( 331 331 + &self, 332 332 + request: Request<MergeCheckRequest>, 333 333 + ) -> Result<Response<MergeCheckResponse>, Status> { 334 334 + let req = request.into_inner(); 335 335 + let target = req 336 336 + .target 337 337 + .ok_or_else(|| Status::invalid_argument("target is required"))?; 338 338 + let source = req 339 339 + .source 340 340 + .ok_or_else(|| Status::invalid_argument("source is required"))?; 341 341 + debug!( 342 342 + target_repo = %target.repo, 343 343 + target_commit = %target.commit.as_bstr(), 344 344 + source_repo = %source.repo, 345 345 + source_commit = %source.commit.as_bstr(), 346 346 + "merge_check request", 347 347 + ); 348 348 + 349 349 + let scratch = self.open_scratch(&[target.repo.as_str(), source.repo.as_str()])?; 350 350 + 351 351 + let response = 352 352 + tokio::task::spawn_blocking(move || -> Result<MergeCheckResponse, Status> { 353 353 + let target_oid = find_commit_by_sha(&scratch, &target.commit)?; 354 354 + let source_oid = find_commit_by_sha(&scratch, &source.commit)?; 355 355 + crate::merge::merge_check(&scratch, target_oid, source_oid) 356 356 + .map_err(|e| Status::internal(e.to_string())) 357 357 + }) 358 358 + .await 359 359 + .map_err(|e| Status::internal(format!("merge task panicked: {e}")))??; 360 360 + 361 361 + Ok(Response::new(response)) 362 362 + } 363 363 + 364 364 + async fn resolve_rev( 365 365 + &self, 366 366 + request: Request<ResolveRevRequest>, 367 367 + ) -> Result<Response<ResolveRevResponse>, Status> { 368 368 + let req = request.into_inner(); 369 369 + debug!(repo = %req.repo, rev = %req.rev.as_bstr(), "resolve_rev request"); 370 370 + let repo = self.open_repo(&req.repo)?; 371 371 + let commit = tokio::task::spawn_blocking(move || -> Result<String, Status> { 372 372 + Ok(resolve_simple_rev(&repo, &req.rev)?.to_string()) 373 373 + }) 374 374 + .await 375 375 + .map_err(|e| Status::internal(format!("resolve task panicked: {e}")))??; 376 376 + Ok(Response::new(ResolveRevResponse { commit })) 377 377 + } 378 378 + } 379 379 + 380 380 + fn resolve_commit_oid(repo: &gix::Repository, spec: &[u8]) -> Result<gix::ObjectId, Status> { 381 381 + let commit = repo 382 382 + .rev_parse_single(spec.as_bstr()) 383 383 + .map_err(|e| { 384 384 + Status::invalid_argument(format!("bad rev '{}': {e}", String::from_utf8_lossy(spec))) 385 385 + })? 386 386 + .object() 387 387 + .map_err(|e| Status::internal(e.to_string()))? 388 388 + .peel_to_commit() 389 389 + .map_err(|e| Status::internal(e.to_string()))?; 390 390 + Ok(commit.id) 391 391 + } 392 392 + 393 393 + fn resolve_simple_rev(repo: &gix::Repository, rev: &[u8]) -> Result<gix::ObjectId, Status> { 394 394 + let unsupported = rev == b"HEAD" 395 395 + || rev == b"@" 396 396 + || rev.windows(2).any(|w| w == b"@{") 397 397 + || rev.iter().any(|&b| matches!(b, b'~' | b'^' | b':')); 398 398 + if unsupported { 399 399 + return Err(Status::invalid_argument(format!( 400 400 + "unsupported rev '{}': only a branch, tag, or commit oid is allowed", 401 401 + rev.as_bstr() 402 402 + ))); 403 403 + } 404 404 + resolve_commit_oid(repo, rev) 405 405 + } 406 406 + 407 407 + fn find_commit_by_sha(repo: &gix::Repository, sha: &[u8]) -> Result<gix::ObjectId, Status> { 408 408 + let oid = gix::ObjectId::from_hex(sha).map_err(|e| { 409 409 + Status::invalid_argument(format!("bad commit sha '{}': {e}", sha.as_bstr())) 410 410 + })?; 411 411 + repo.find_commit(oid) 412 412 + .map_err(|_| Status::not_found(format!("commit not found: {oid}")))?; 413 413 + Ok(oid) 414 414 + } 415 415 + 416 416 + fn commit_log_walk<'repo>( 417 417 + repo: &'repo gix::Repository, 418 418 + req: &CommitLogRequest, 419 419 + ) -> anyhow::Result<gix::revision::Walk<'repo>> { 420 420 + let mut tips = Vec::new(); 421 421 + let mut hidden = Vec::new(); 422 422 + 423 423 + if req.all_refs { 424 424 + for r in repo.references()?.all()? { 425 425 + let mut r = r.map_err(|e| anyhow::anyhow!(e))?; 426 426 + if let Ok(commit) = r.peel_to_commit() { 427 427 + tips.push(commit.id); 428 428 + } 429 429 + } 430 430 + } else { 431 431 + for range in &req.ranges { 432 432 + let revspec = repo.rev_parse(range.as_bstr())?; 433 433 + let spec = revspec.detach(); 434 434 + match spec { 435 435 + RevSpec::Include(id) => tips.push(id), 436 436 + RevSpec::Range { from, to } => { 437 437 + tips.push(to); 438 438 + hidden.push(from); 439 439 + } 440 440 + _ => { 441 441 + anyhow::bail!("The spec isn't currently supported: {spec:?}") 442 442 + } 443 443 + } 444 444 + } 445 445 + } 446 446 + 447 447 + Ok(repo 448 448 + .rev_walk(tips) 449 449 + .sorting(Sorting::ByCommitTime(Default::default())) 450 450 + .with_hidden(hidden) 451 451 + .all()?) 452 452 + } 453 453 + 454 454 + impl TryFrom<&gix::Commit<'_>> for GitCommit { 455 455 + type Error = anyhow::Error; 456 456 + 457 457 + fn try_from(commit: &gix::Commit<'_>) -> anyhow::Result<Self> { 458 458 + let decoded = commit.decode()?; 459 459 + Ok(GitCommit { 460 460 + oid: commit.id.to_string(), 461 461 + author: Some(decoded.author()?.try_into()?), 462 462 + committer: Some(decoded.committer()?.try_into()?), 463 463 + message: decoded.message.to_vec(), 464 464 + parents: decoded 465 465 + .parents 466 466 + .into_iter() 467 467 + .map(|id| id.to_string()) 468 468 + .collect(), 469 469 + extra_headers: decoded 470 470 + .extra_headers 471 471 + .iter() 472 472 + .map(|(k, v)| (k.to_string(), v.to_string())) 473 473 + .collect(), 474 474 + }) 475 475 + } 476 476 + } 477 477 + 478 478 + impl TryFrom<gix::actor::SignatureRef<'_>> for GitSignature { 479 479 + type Error = anyhow::Error; 480 480 + 481 481 + fn try_from(sig: gix::actor::SignatureRef<'_>) -> anyhow::Result<Self> { 482 482 + let time = sig.time()?; 483 483 + Ok(GitSignature { 484 484 + name: sig.name.to_vec(), 485 485 + email: sig.email.to_vec(), 486 486 + date: Some(prost_types::Timestamp { 487 487 + seconds: time.seconds, 488 488 + nanos: 0, 489 489 + }), 490 490 + }) 491 491 + } 492 492 + } 493 493 + 494 494 + pub async fn serve(addr: SocketAddr, repo_base: PathBuf) -> anyhow::Result<()> { 495 495 + let service = GitMirror { repo_base }; 496 496 + info!(addr = %addr, "gitmirror gRPC server listening"); 497 497 + 498 498 + Server::builder() 499 499 + .add_service(GitMirrorServiceServer::new(service)) 500 500 + .serve(addr) 501 501 + .await?; 502 502 + 503 503 + Ok(()) 504 504 + } 505 505 + 506 506 + #[cfg(test)] 507 507 + mod tests { 508 508 + use super::*; 509 509 + 510 510 + #[test] 511 511 + fn temp_repository_removes_scratch_dir_on_drop() { 512 512 + let dir = tempfile::tempdir().unwrap(); 513 513 + gix::init_bare(dir.path()).unwrap(); 514 514 + let repo = gix::open(dir.path()).unwrap().with_object_memory(); 515 515 + let temp = TempRepository::new(repo, dir); 516 516 + let path = temp.git_dir().to_path_buf(); 517 517 + assert!(path.exists()); 518 518 + // Derefs to gix::Repository. 519 519 + assert!(temp.object_hash() == gix::hash::Kind::Sha1); 520 520 + drop(temp); 521 521 + assert!(!path.exists(), "scratch dir should be gone after drop"); 522 522 + } 523 523 + }

+10

localinfra/Caddyfile

View file Reviewed

··· 53 53 reverse_proxy knotmirror:7000 54 54 } 55 55 56 56 + gitmirror.tngl.boltless.dev { 57 57 + tls internal 58 58 + # gitmirror (tonic) serves h2c; Caddy defaults to HTTP/1.1 to the backend. 59 59 + reverse_proxy gitmirror:9000 { 60 60 + transport http { 61 61 + versions h2c 2 62 62 + } 63 63 + } 64 64 + } 65 65 + 56 66 # zoekt (internal service) 57 67 zoekt.tngl.boltless.dev { 58 68 tls internal

+29

localinfra/gitmirror.Dockerfile

View file Reviewed

··· 1 1 + # Development only. Not for production use. 2 2 + 3 3 + FROM rust:1.96-bookworm AS build 4 4 + 5 5 + RUN apt-get update && apt-get install -y --no-install-recommends protobuf-compiler libprotobuf-dev \ 6 6 + && rm -rf /var/lib/apt/lists/* 7 7 + 8 8 + WORKDIR /src 9 9 + COPY . . 10 10 + 11 11 + # Cache mounts on the cargo registry + target dir. The binary is copied out within the same 12 12 + # RUN because the target cache mount is unmounted afterwards (a later COPY --from could not 13 13 + # see it). 14 14 + RUN --mount=type=cache,target=/usr/local/cargo/registry \ 15 15 + --mount=type=cache,target=/src/target \ 16 16 + cargo build --release -p gitmirror \ 17 17 + && cp /src/target/release/gitmirror /usr/local/bin/gitmirror 18 18 + 19 19 + FROM debian:bookworm-slim 20 20 + 21 21 + RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates tini \ 22 22 + && rm -rf /var/lib/apt/lists/* 23 23 + 24 24 + COPY --from=build /usr/local/bin/gitmirror /usr/local/bin/gitmirror 25 25 + 26 26 + EXPOSE 9000 27 27 + 28 28 + ENTRYPOINT ["/usr/bin/tini", "--"] 29 29 + CMD ["sh", "-c", "if [ -f /usr/local/share/ca-certificates/caddy.crt ]; then update-ca-certificates; fi && exec /usr/local/bin/gitmirror serve"]