# HG changeset patch # User Arseniy Alekseyev # Date 1678802918 0 # Node ID edcc35a4f1dc7f982dd5aef172aa0bcaa9e9ec94 # Parent 97a6d6bdbc08df0d7b2f8c8528a21d5ba3daff9b dirstate: fix the bug in [status] dealing with committed&ignored directories In particular, these directories can "infect" their sibling directories with ignored status due to using a shared memoization cell by accident. This fixes bug #6795. diff -r 97a6d6bdbc08 -r edcc35a4f1dc rust/hg-core/src/dirstate_tree/status.rs --- a/rust/hg-core/src/dirstate_tree/status.rs Tue Mar 14 14:01:47 2023 +0000 +++ b/rust/hg-core/src/dirstate_tree/status.rs Tue Mar 14 14:08:38 2023 +0000 @@ -244,7 +244,7 @@ match self.parent { None => false, Some(parent) => { - *(parent.cache.get_or_init(|| { + *(self.cache.get_or_init(|| { parent.force(ignore_fn) || ignore_fn(self.path) })) } diff -r 97a6d6bdbc08 -r edcc35a4f1dc tests/test-status-committed-and-ignored.t --- a/tests/test-status-committed-and-ignored.t Tue Mar 14 14:01:47 2023 +0000 +++ b/tests/test-status-committed-and-ignored.t Tue Mar 14 14:08:38 2023 +0000 @@ -30,6 +30,4 @@ $ touch d1/g $ touch d2/g $ RAYON_NUM_THREADS=1 hg status - ? d2/g (no-rust no-rhg !) - -^ BUG: d2/g does not show up with rust status + ? d2/g