This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12475

rust-dirstatemap: use `DirstateEntry::tracked` directly
ClosedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGe87cf0cd5182: rust-dirstatemap: use `DirstateEntry::tracked` directly
rHG94f94aaadbee: rust-dirstatemap: use `DirstateEntry::tracked` directly
Summary

state() is a legacy API that will be removed at some point, let's use the
newer API.

Diff Detail

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

Event Timeline

Alphare created this revision.Apr 6 2022, 10:13 AM
marmoute accepted this revision.Apr 8 2022, 7:37 AM
Alphare added a commit: rHG94f94aaadbee: rust-dirstatemap: use `DirstateEntry::tracked` directly.Apr 8 2022, 11:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG94f94aaadbee: rust-dirstatemap: use `DirstateEntry::tracked` directly (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32947.Apr 8 2022, 12:29 PM

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

baymax updated this revision to Diff 33049.Apr 12 2022, 10:59 AM

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

baymax updated this revision to Diff 33131.Apr 12 2022, 12:06 PM

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

Revision Contents
Changeset List

Diff 33131

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

) )
}) })
} }
pub fn drop_entry_and_copy_source( pub fn drop_entry_and_copy_source(
&mut self, &mut self,
filename: &HgPath, filename: &HgPath,
) -> Result<(), DirstateError> { ) -> Result<(), DirstateError> {
let was_tracked = self let was_tracked = self.get(filename)?.map_or(false, |e| e.tracked());
.get(filename)?
.map_or(false, |e| e.state().is_tracked());
struct Dropped { struct Dropped {
was_tracked: bool, was_tracked: bool,
had_entry: bool, had_entry: bool,
had_copy_source: bool, had_copy_source: bool,
} }
/// If this returns `Ok(Some((dropped, removed)))`, then /// If this returns `Ok(Some((dropped, removed)))`, then
/// ///