mercurial/merge.py
branchstable
changeset 48805 d4486810a179
parent 48757 af9f2c64302e
child 48875 6000f5b25c9b
child 49344 0cc5f74ff7f0
--- a/mercurial/merge.py	Mon Feb 21 11:22:40 2022 +0100
+++ b/mercurial/merge.py	Mon Feb 28 18:34:23 2022 +0100
@@ -25,6 +25,7 @@
     mergestate as mergestatemod,
     obsutil,
     pathutil,
+    policy,
     pycompat,
     scmutil,
     subrepoutil,
@@ -1764,9 +1765,9 @@
         b'fsmonitor', b'warn_update_file_count'
     )
     # avoid cycle dirstate -> sparse -> merge -> dirstate
-    from . import dirstate
+    dirstate_rustmod = policy.importrust("dirstate")
 
-    if dirstate.rustmod is not None:
+    if dirstate_rustmod is not None:
         # When using rust status, fsmonitor becomes necessary at higher sizes
         fsmonitorthreshold = repo.ui.configint(
             b'fsmonitor',