This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12536

rust-dirstate-entry: add `modified` method
Needs ReviewPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This will also be used in other places later in the series.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/dirstate/entry.rs (10 lines)

Diff 33099

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

pub fn p2_info(&self) -> bool { pub fn p2_info(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO) self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
} }
pub fn added(&self) -> bool { pub fn added(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent() self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
} }
pub fn modified(&self) -> bool {
self.flags
.contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
}
pub fn maybe_clean(&self) -> bool { pub fn maybe_clean(&self) -> bool {
if !self.flags.contains(Flags::WDIR_TRACKED) { if !self.flags.contains(Flags::WDIR_TRACKED) {
false false
} else if !self.flags.contains(Flags::P1_TRACKED) { } else if !self.flags.contains(Flags::P1_TRACKED) {
false false
} else if self.flags.contains(Flags::P2_INFO) { } else if self.flags.contains(Flags::P2_INFO) {
false false
} else { } else {
fn v1_state(&self) -> EntryState { fn v1_state(&self) -> EntryState {
if !self.any_tracked() { if !self.any_tracked() {
// TODO: return an Option instead? // TODO: return an Option instead?
panic!("Accessing v1_state of an untracked DirstateEntry") panic!("Accessing v1_state of an untracked DirstateEntry")
} }
if self.removed() { if self.removed() {
EntryState::Removed EntryState::Removed
} else if self } else if self.modified() {
.flags
.contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
{
EntryState::Merged EntryState::Merged
} else if self.added() { } else if self.added() {
EntryState::Added EntryState::Added
} else { } else {
EntryState::Normal EntryState::Normal
} }
} }