Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 52974:ea9846b8e539
importrust: migrate over the last `dirstate` import
This was missed in 0bd91b0a1a93. It still works because we haven't removed
the `hg-cpython` bridge yet.
I'm honestly not sure if we should continue advertising for fsmonitor at all
with the Rust extensions, but that's another discussion.
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Mon, 17 Feb 2025 16:28:00 +0100 |
| parents | f3762eafed66 |
| children | 1a99bdbdb71b |
comparison
equal
deleted
inserted
replaced
| 52973:ef4192dec3d3 | 52974:ea9846b8e539 |
|---|---|
| 1842 fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused') | 1842 fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused') |
| 1843 fsmonitorthreshold = repo.ui.configint( | 1843 fsmonitorthreshold = repo.ui.configint( |
| 1844 b'fsmonitor', b'warn_update_file_count' | 1844 b'fsmonitor', b'warn_update_file_count' |
| 1845 ) | 1845 ) |
| 1846 # avoid cycle dirstate -> sparse -> merge -> dirstate | 1846 # avoid cycle dirstate -> sparse -> merge -> dirstate |
| 1847 dirstate_rustmod = policy.importrust("dirstate") | 1847 dirstate_rustmod = policy.importrust("dirstate", pyo3=True) |
| 1848 | 1848 |
| 1849 if dirstate_rustmod is not None: | 1849 if dirstate_rustmod is not None: |
| 1850 # When using rust status, fsmonitor becomes necessary at higher sizes | 1850 # When using rust status, fsmonitor becomes necessary at higher sizes |
| 1851 fsmonitorthreshold = repo.ui.configint( | 1851 fsmonitorthreshold = repo.ui.configint( |
| 1852 b'fsmonitor', | 1852 b'fsmonitor', |