From 78bd513eaa980318469e80b5b15ea4f63af2d2ae Mon Sep 17 00:00:00 2001 From: Muir Manders Date: Tue, 16 Apr 2024 07:27:26 -0700 Subject: [PATCH] edensparse: allow config overrides when making matcher Summary: FilteredFS (AKA edensparse) was ignoring the `config` arg to sparsematcher(), but that arg is important for sparse commands like debugsparsematch or debugsparseexplainmatch (which are useful to debug sparse profiles without needing a sparse clone). Let's just let it do its thing. Reviewed By: sggutier Differential Revision: D56164263 fbshipit-source-id: f0c1d0c0043b75e54f9c6eabe29797d5f466c156 --- eden/scm/sapling/ext/sparse.py | 3 +-- eden/scm/tests/test-eden-sparse.t | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/eden/scm/sapling/ext/sparse.py b/eden/scm/sapling/ext/sparse.py index 101dd93eaa7b7..ff582e0cfbcc0 100644 --- a/eden/scm/sapling/ext/sparse.py +++ b/eden/scm/sapling/ext/sparse.py @@ -1002,8 +1002,7 @@ def sparsematch(self, *revs, **kwargs): includetemp = kwargs.get("includetemp", True) - # Don't allow overrides for edensparse checkouts - rawconfig = kwargs.get("config") if not _isedensparse(self) else None + rawconfig = kwargs.get("config") cachekey = self._cachekey(revs, includetemp=includetemp) diff --git a/eden/scm/tests/test-eden-sparse.t b/eden/scm/tests/test-eden-sparse.t index 155f25e60c623..5142353575588 100644 --- a/eden/scm/tests/test-eden-sparse.t +++ b/eden/scm/tests/test-eden-sparse.t @@ -16,6 +16,5 @@ $ hg clone -q --eden test:server client --config clone.eden-sparse-filter=eden-sparse $ cd client -FIXME Allow adhoc use of sparse commands to debug sparse profiles: +Allow adhoc use of sparse commands to debug sparse profiles: $ hg debugsparsematch -q --sparse-profile=sparse excluded --config extensions.sparse= - excluded