This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8517

rust-status: don't dispatch unknown file when traversing if not listing unknowns
ClosedPublic

Authored by Alphare on May 12 2020, 7:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdc60ba32d43b: rust-status: don't dispatch unknown file when traversing if not listing unknowns
Summary

This usually isn't a (functional) problem since we ignore the unknown files
anyway, but when specifically using hg purge, unknown files were iterated over
regardless of the option being true.
This is both more correct and more efficient.

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 12 2020, 7:50 AM
Alphare added a commit: rHGdc60ba32d43b: rust-status: don't dispatch unknown file when traversing if not listing unknowns.May 14 2020, 4:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdc60ba32d43b: rust-status: don't dispatch unknown file when traversing if not listing unknowns (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21379

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

&& dir_ignore_fn(&filename) && dir_ignore_fn(&filename)
{ {
if options.list_ignored { if options.list_ignored {
files_sender files_sender
.send(Ok((filename.to_owned(), Dispatch::Ignored))) .send(Ok((filename.to_owned(), Dispatch::Ignored)))
.unwrap(); .unwrap();
} }
} else { } else {
if options.list_unknown {
files_sender files_sender
.send(Ok((filename.to_owned(), Dispatch::Unknown))) .send(Ok((filename.to_owned(), Dispatch::Unknown)))
.unwrap(); .unwrap();
} }
}
} else if ignore_fn(&filename) && options.list_ignored { } else if ignore_fn(&filename) && options.list_ignored {
files_sender files_sender
.send(Ok((filename.to_owned(), Dispatch::Ignored))) .send(Ok((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 matcher.matches_everything() || matcher.matches(&filename) { if matcher.matches_everything() || matcher.matches(&filename) {