Fix default configs for filesystem.py

Summary: Context: https://www.internalfb.com/diff/D29691021 (625af211f0)?dst_version_fbid=865632144112269&transaction_fbid=283492570407143

Reviewed By: DurhamG

Differential Revision: D33300537

fbshipit-source-id: 9a89517ef0201cff2a01006b299f2ccfccd51bbc
This commit is contained in:
Hootan Shadmehr 2022-01-11 11:29:37 -08:00 committed by Facebook GitHub Bot
parent 813b242b93
commit 540fe51131
2 changed files with 8 additions and 10 deletions

View File

@ -600,6 +600,10 @@ coreconfigitem("worker", "backgroundclosethreadcount", default=4)
coreconfigitem("worker", "enabled", default=True)
coreconfigitem("worker", "numcpus", default=None)
coreconfigitem("workingcopy", "enablerustwalker", default=False)
coreconfigitem("workingcopy", "rustwalkerthreads", default=0)
coreconfigitem("workingcopy", "rustpendingchanges", default=False)
# Rebase related configuration moved to core because other extension are doing
# strange things. For example, shelve import the extensions to reuse some bit
# without formally loading it.

View File

@ -16,7 +16,7 @@ import stat
from typing import Callable, Iterable, Optional, Tuple
from bindings import workingcopy
from edenscm.mercurial import match as matchmod, registrar
from edenscm.mercurial import match as matchmod
from . import encoding, error, pathutil, util, vfs as vfsmod
from .i18n import _
@ -25,12 +25,6 @@ from .node import hex
_rangemask = 0x7FFFFFFF
configtable = {}
configitem = registrar.configitem(configtable)
configitem("workingcopy", "enablerustwalker", default=False)
configitem("workingcopy", "rustwalkerthreads", default=0)
configitem("workingcopy", "rustpendingchanges", default=False)
class physicalfilesystem(object):
def __init__(self, root, dirstate):
@ -164,7 +158,7 @@ class physicalfilesystem(object):
repo-rooted file path and the bool is whether the file exists on disk
or not.
"""
if self.ui.configbool("workingcopy", "rustpendingchanges", False):
if self.ui.configbool("workingcopy", "rustpendingchanges"):
physicalfs = workingcopy.physicalfilesystem(self.opener.join(""))
pendingchanges = physicalfs.pendingchanges(
self.dirstate._map._tree, match, False, self.dirstate._lastnormaltime
@ -190,7 +184,7 @@ class physicalfilesystem(object):
seen = set()
walkfn = self._walk
if self.ui.configbool("workingcopy", "enablerustwalker", False):
if self.ui.configbool("workingcopy", "enablerustwalker"):
walkfn = self._rustwalk
lookups = []
@ -274,7 +268,7 @@ class physicalfilesystem(object):
match.traversedir = origmatch.traversedir
traversedir = bool(match.traversedir)
threadcount = self.ui.configint("workingcopy", "rustwalkerthreads", 0)
threadcount = self.ui.configint("workingcopy", "rustwalkerthreads")
walker = workingcopy.walker(join(""), match, traversedir, threadcount)
for fn in walker:
fn = self.dirstate.normalize(fn)