comparison rust/hg-core/src/dirstate/entry.rs @ 49139:7241b3721ba5

rust-dirstatemap: stop using `.state` in `is_from_other_parent` This is a deprecated API and will be removed one day. Differential Revision: https://phab.mercurial-scm.org/D12537
author Raphaël Gomès <rgomes@octobus.net>
date Tue, 12 Apr 2022 16:24:25 +0200
parents c6c1caf28349
children f8ec7b16c98f
comparison
equal deleted inserted replaced
49138:c6c1caf28349 49139:7241b3721ba5
653 self.v1_mtime(), 653 self.v1_mtime(),
654 ) 654 )
655 } 655 }
656 656
657 pub(crate) fn is_from_other_parent(&self) -> bool { 657 pub(crate) fn is_from_other_parent(&self) -> bool {
658 self.state() == EntryState::Normal 658 self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
659 && self.size() == SIZE_FROM_OTHER_PARENT
660 } 659 }
661 660
662 // TODO: other platforms 661 // TODO: other platforms
663 #[cfg(unix)] 662 #[cfg(unix)]
664 pub fn mode_changed( 663 pub fn mode_changed(