This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10639

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

Authored by Alphare on May 4 2021, 4:47 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc8f62920f07a: rust-status: fix ignore and include not composing (issue6514)
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.May 4 2021, 4:47 AM

Pending CI refresh

baymax updated this revision to Diff 27541.May 4 2021, 5:36 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Alphare added a commit: rHGc8f62920f07a: rust-status: fix ignore and include not composing (issue6514).May 27 2021, 5:36 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc8f62920f07a: rust-status: fix ignore and include not composing (issue6514) (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28220

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

.unwrap(); .unwrap();
} }
} else if self.options.list_unknown { } else if self.options.list_unknown {
files_sender files_sender
.send((filename.to_owned(), Dispatch::Unknown)) .send((filename.to_owned(), Dispatch::Unknown))
.unwrap(); .unwrap();
} }
} else if self.is_ignored(&filename) && self.options.list_ignored { } else if self.is_ignored(&filename) && self.options.list_ignored {
if self.matcher.matches(&filename) {
files_sender files_sender
.send((filename.to_owned(), Dispatch::Ignored)) .send((filename.to_owned(), Dispatch::Ignored))
.unwrap(); .unwrap();
} }
}
} else if let Some(entry) = entry_option { } else if let Some(entry) = entry_option {
// Used to be a file or a folder, now something else. // Used to be a file or a folder, now something else.
if self.matcher.matches_everything() if self.matcher.matches_everything()
|| self.matcher.matches(&filename) || self.matcher.matches(&filename)
{ {
files_sender files_sender
.send((filename.to_owned(), dispatch_missing(entry.state))) .send((filename.to_owned(), dispatch_missing(entry.state)))
.unwrap(); .unwrap();

tests/test-status.t

> A.hs > A.hs
> B.hs > B.hs
> ignored-folder/ > ignored-folder/
> EOF > EOF
$ hg st -i -I 're:.*\.hs$' $ hg st -i -I 're:.*\.hs$'
I A.hs I A.hs
I B.hs I B.hs
I ignored-folder/ctest.hs I ignored-folder/ctest.hs
I ignored-folder/other.txt (known-bad-output rust !)