mercurial/dirstate.py
changeset 49357 5b7a10ddb42f
parent 49356 a87443d4aec0
child 49360 bd3519dc6741
--- a/mercurial/dirstate.py	Sat Jun 11 00:58:41 2022 +0200
+++ b/mercurial/dirstate.py	Sat Jun 11 00:59:11 2022 +0200
@@ -670,6 +670,20 @@
         self._dirty = True
 
     def rebuild(self, parent, allfiles, changedfiles=None):
+
+        matcher = self._sparsematcher
+        if matcher is not None and not matcher.always():
+            # should not add non-matching files
+            allfiles = [f for f in allfiles if matcher(f)]
+            if changedfiles:
+                changedfiles = [f for f in changedfiles if matcher(f)]
+
+            if changedfiles is not None:
+                # these files will be deleted from the dirstate when they are
+                # not found to be in allfiles
+                dirstatefilestoremove = {f for f in self if not matcher(f)}
+                changedfiles = dirstatefilestoremove.union(changedfiles)
+
         if changedfiles is None:
             # Rebuild entire dirstate
             to_lookup = allfiles