( )⚙ D12539 rust-status: stop using `state()` in `handle_normal_file`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12539

rust-status: stop using `state()` in `handle_normal_file`
Needs ReviewPublic

Authored by Alphare on Tue, Apr 12, 12:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Let's use the new API

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 33103

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

/// A node in the dirstate tree has no corresponding *file* on the /// A node in the dirstate tree has no corresponding *file* on the
/// filesystem /// filesystem
/// ///
/// Does nothing on a "directory" node /// Does nothing on a "directory" node
fn mark_removed_or_deleted_if_file( fn mark_removed_or_deleted_if_file(
&self, &self,
dirstate_node: &NodeRef<'tree, 'on_disk>, dirstate_node: &NodeRef<'tree, 'on_disk>,
) -> Result<(), DirstateV2ParseError> { ) -> Result<(), DirstateV2ParseError> {
if let Some(state) = dirstate_node.state()? { if let Some(entry) = dirstate_node.entry()? {
if !entry.any_tracked() {
// Future-compat for when we start storing ignored and unknown
// files for caching reasons
return Ok(())
}
let path = dirstate_node.full_path(self.dmap.on_disk)?; let path = dirstate_node.full_path(self.dmap.on_disk)?;
if self.matcher.matches(path) { if self.matcher.matches(path) {
if let EntryState::Removed = state { if entry.removed() {
self.push_outcome(Outcome::Removed, dirstate_node)? self.push_outcome(Outcome::Removed, dirstate_node)?
} else { } else {
self.push_outcome(Outcome::Deleted, &dirstate_node)? self.push_outcome(Outcome::Deleted, &dirstate_node)?
} }
} }
} }
Ok(()) Ok(())
} }