This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11607

dirstate-item: replace call to new_possibly_dirty
ClosedPublic

Authored by marmoute on Oct 3 2021, 6:53 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd0081dbca442: dirstate-item: replace call to new_normal
Summary

The constructor is on its way out, so we inline the last relevant call before
dropping it.

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

marmoute created this revision.Oct 3 2021, 6:53 AM
Alphare added a subscriber: Alphare.Oct 3 2021, 5:20 PM

Same as the previous patch

marmoute added a commit: rHGd0081dbca442: dirstate-item: replace call to new_normal.Oct 3 2021, 5:38 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd0081dbca442: dirstate-item: replace call to new_normal (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30665

mercurial/pure/parsers.py

elif mtime == AMBIGUOUS_TIME: elif mtime == AMBIGUOUS_TIME:
return cls( return cls(
wc_tracked=True, wc_tracked=True,
p1_tracked=True, p1_tracked=True,
has_meaningful_mtime=False, has_meaningful_mtime=False,
parentfiledata=(mode, size, 42), parentfiledata=(mode, size, 42),
) )
else: else:
return cls.new_normal(mode, size, mtime) return cls(
wc_tracked=True,
p1_tracked=True,
parentfiledata=(mode, size, mtime),
)
else: else:
raise RuntimeError(b'unknown state: %s' % state) raise RuntimeError(b'unknown state: %s' % state)
def set_possibly_dirty(self): def set_possibly_dirty(self):
"""Mark a file as "possibly dirty" """Mark a file as "possibly dirty"
This means the next status call will have to actually check its content This means the next status call will have to actually check its content
to make sure it is correct. to make sure it is correct.

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

} }
} else if mtime == MTIME_UNSET { } else if mtime == MTIME_UNSET {
Self { Self {
flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED, flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED,
mode_size: Some((mode, size)), mode_size: Some((mode, size)),
mtime: None, mtime: None,
} }
} else { } else {
Self::new_normal(mode, size, mtime) Self {
flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED,
mode_size: Some((mode, size)),
mtime: Some(mtime),
}
} }
} }
EntryState::Added => Self { EntryState::Added => Self {
flags: Flags::WDIR_TRACKED, flags: Flags::WDIR_TRACKED,
mode_size: None, mode_size: None,
mtime: None, mtime: None,
}, },
EntryState::Removed => Self { EntryState::Removed => Self {