comparison rust/hg-core/src/dirstate/status.rs @ 47317:c8f62920f07a stable

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

47316:c365850b6114

                    files_sender
                        .send((filename.to_owned(), Dispatch::Unknown))
                        .unwrap();
                }
            } else if self.is_ignored(&filename) && self.options.list_ignored {
                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()
                || self.matcher.matches(&filename)

47317:c8f62920f07a

                    files_sender
                        .send((filename.to_owned(), Dispatch::Unknown))
                        .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()
                || self.matcher.matches(&filename)