This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12448

rust-dirstate: don't return a state for untracked entries
ClosedPublic

Authored by Alphare on Apr 6 2022, 10:10 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGa85c123c625a: rust-dirstate: don't return a state for untracked entries
rHG18e4ecd0abfe: rust-dirstate: don't return a state for untracked entries
Summary

This state API is a remnant of the former API and is slated for removal at
some point. Any caller of this function will expect an entry that is tracked
in the larger sense.

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.Apr 6 2022, 10:10 AM
marmoute accepted this revision.Apr 8 2022, 6:49 AM
Alphare added a commit: rHG18e4ecd0abfe: rust-dirstate: don't return a state for untracked entries.Apr 8 2022, 11:55 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG18e4ecd0abfe: rust-dirstate: don't return a state for untracked entries (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32920.Apr 8 2022, 12:29 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

Diff 32884

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

} }
NodeRef::OnDisk(node) => node.entry(), NodeRef::OnDisk(node) => node.entry(),
} }
} }
pub(super) fn state( pub(super) fn state(
&self, &self,
) -> Result<Option<EntryState>, DirstateV2ParseError> { ) -> Result<Option<EntryState>, DirstateV2ParseError> {
Ok(self.entry()?.map(|e| e.state())) Ok(self.entry()?.and_then(|e| {
if e.any_tracked() {
Some(e.state())
} else {
None
}
}))
} }
pub(super) fn cached_directory_mtime( pub(super) fn cached_directory_mtime(
&self, &self,
) -> Result<Option<TruncatedTimestamp>, DirstateV2ParseError> { ) -> Result<Option<TruncatedTimestamp>, DirstateV2ParseError> {
match self { match self {
NodeRef::InMemory(_path, node) => Ok(match node.data { NodeRef::InMemory(_path, node) => Ok(match node.data {
NodeData::CachedDirectory { mtime } => Some(mtime), NodeData::CachedDirectory { mtime } => Some(mtime),