rust-status: fix ignore and include not composing (issue6514)

While the fix is pretty simple, the overall dispatch logic has become kind of
ugly. Thankfully we're currently upstreaming a better algorithm, this code is
temporary anyway.

Differential Revision: https://phab.mercurial-scm.org/D10639

rust/hg-core/src/dirstate/status.rs

@@ -557,10 +557,12 b' where'
                         .unwrap();
                 }
             } else if self.is_ignored(&filename) && self.options.list_ignored {
+                if self.matcher.matches(&filename) {
                 files_sender
                     .send((filename.to_owned(), Dispatch::Ignored))
                     .unwrap();
             }
+            }
         } else if let Some(entry) = entry_option {
             // Used to be a file or a folder, now something else.
             if self.matcher.matches_everything()

tests/test-status.t

@@ -708,4 +708,3 b' Check using include flag while listing i'
   I A.hs
   I B.hs
   I ignored-folder/ctest.hs
-  I ignored-folder/other.txt (known-bad-output rust !)