This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11602

dirstate-item: replace call to new_from_p2
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGda304f78a0e1: dirstate-item: replace call to new_from_p2
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:52 AM
Alphare accepted this revision.Oct 3 2021, 5:19 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:19 PM
marmoute added a commit: rHGda304f78a0e1: dirstate-item: replace call to new_from_p2.Oct 3 2021, 5:37 PM
Closed by commit rHGda304f78a0e1: dirstate-item: replace call to new_from_p2 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30660

mercurial/pure/parsers.py

p1_tracked = False p1_tracked = False
p2_info = True p2_info = True
else: else:
p1_tracked = True p1_tracked = True
p2_info = False p2_info = False
return cls(p1_tracked=p1_tracked, p2_info=p2_info) return cls(p1_tracked=p1_tracked, p2_info=p2_info)
elif state == b'n': elif state == b'n':
if size == FROM_P2: if size == FROM_P2:
return cls.new_from_p2() return cls(wc_tracked=True, p2_info=True)
elif size == NONNORMAL: elif size == NONNORMAL:
return cls.new_possibly_dirty() return cls.new_possibly_dirty()
elif mtime == AMBIGUOUS_TIME: elif mtime == AMBIGUOUS_TIME:
instance = cls.new_normal(mode, size, 42) instance = cls.new_normal(mode, size, 42)
instance._mtime = None instance._mtime = None
return instance return instance
else: else:
return cls.new_normal(mode, size, mtime) return cls.new_normal(mode, size, mtime)

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

state: EntryState, state: EntryState,
mode: i32, mode: i32,
size: i32, size: i32,
mtime: i32, mtime: i32,
) -> Self { ) -> Self {
match state { match state {
EntryState::Normal => { EntryState::Normal => {
if size == SIZE_FROM_OTHER_PARENT { if size == SIZE_FROM_OTHER_PARENT {
Self::new_from_p2() Self {
// might be missing P1_TRACKED
flags: Flags::WDIR_TRACKED | Flags::P2_INFO,
mode_size: None,
mtime: None,
}
} else if size == SIZE_NON_NORMAL { } else if size == SIZE_NON_NORMAL {
Self::new_possibly_dirty() Self::new_possibly_dirty()
} 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,
} }