comparison mercurial/merge.py @ 45462:c1d6e930ac8a

fsmonitor: increase the threshold before we recommend it, when using rust 50k files works just fine with the rust status, and it's annoying to get told "consider using fsmonitor" when we have another solution to the status speed. 400k files was not chosen in any rigorous way. I know 200k files is fine. Twice as many files should still be fine. Differential Revision: https://phab.mercurial-scm.org/D9021
author Valentin Gatien-Baron <vgatien-baron@janestreet.com>
date Mon, 14 Sep 2020 11:32:24 -0400
parents ccd3bf4490c1
children 14b3dbfa4eeb
comparison
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')