##// END OF EJS Templates
merge: remove direct rustmod reference...
Raphaël Gomès -
r49660:d4486810 6.1 stable
parent child Browse files
Show More
@@ -25,6 +25,7 b' from . import ('
25 mergestate as mergestatemod,
25 mergestate as mergestatemod,
26 obsutil,
26 obsutil,
27 pathutil,
27 pathutil,
28 policy,
28 pycompat,
29 pycompat,
29 scmutil,
30 scmutil,
30 subrepoutil,
31 subrepoutil,
@@ -1764,9 +1765,9 b' def _advertisefsmonitor(repo, num_gets, '
1764 b'fsmonitor', b'warn_update_file_count'
1765 b'fsmonitor', b'warn_update_file_count'
1765 )
1766 )
1766 # avoid cycle dirstate -> sparse -> merge -> dirstate
1767 # avoid cycle dirstate -> sparse -> merge -> dirstate
1767 from . import dirstate
1768 dirstate_rustmod = policy.importrust("dirstate")
1768
1769
1769 if dirstate.rustmod is not None:
1770 if dirstate_rustmod is not None:
1770 # When using rust status, fsmonitor becomes necessary at higher sizes
1771 # When using rust status, fsmonitor becomes necessary at higher sizes
1771 fsmonitorthreshold = repo.ui.configint(
1772 fsmonitorthreshold = repo.ui.configint(
1772 b'fsmonitor',
1773 b'fsmonitor',
General Comments 0
You need to be logged in to leave comments. Login now