mercurial/merge.py
changeset 45462 c1d6e930ac8a
parent 45459 ccd3bf4490c1
child 45466 14b3dbfa4eeb
equal deleted inserted replaced
45461:14be07d5603c 45462:c1d6e930ac8a
  1696     # considered stable.
  1696     # considered stable.
  1697     fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused')
  1697     fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused')
  1698     fsmonitorthreshold = repo.ui.configint(
  1698     fsmonitorthreshold = repo.ui.configint(
  1699         b'fsmonitor', b'warn_update_file_count'
  1699         b'fsmonitor', b'warn_update_file_count'
  1700     )
  1700     )
       
  1701     # avoid cycle dirstate -> sparse -> merge -> dirstate
       
  1702     from . import dirstate
       
  1703 
       
  1704     if dirstate.rustmod is not None:
       
  1705         # When using rust status, fsmonitor becomes necessary at higher sizes
       
  1706         fsmonitorthreshold = repo.ui.configint(
       
  1707             b'fsmonitor', b'warn_update_file_count_rust',
       
  1708         )
       
  1709 
  1701     try:
  1710     try:
  1702         # avoid cycle: extensions -> cmdutil -> merge
  1711         # avoid cycle: extensions -> cmdutil -> merge
  1703         from . import extensions
  1712         from . import extensions
  1704 
  1713 
  1705         extensions.find(b'fsmonitor')
  1714         extensions.find(b'fsmonitor')