Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 52979:ea9846b8e539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Feb 19 00:26:24 2025 +0100
+++ b/mercurial/merge.py	Mon Feb 17 16:28:00 2025 +0100
@@ -1844,7 +1844,7 @@
         b'fsmonitor', b'warn_update_file_count'
     )
     # avoid cycle dirstate -> sparse -> merge -> dirstate
-    dirstate_rustmod = policy.importrust("dirstate")
+    dirstate_rustmod = policy.importrust("dirstate", pyo3=True)
 
     if dirstate_rustmod is not None:
         # When using rust status, fsmonitor becomes necessary at higher sizes