( )⚙ D11598 dirstate-item: replace call to new_merged

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11598

dirstate-item: replace call to new_merged
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7a8c9869e4fe: dirstate-item: replace call to new_merged
Summary

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

Diff Detail

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

Event Timeline

marmoute created this revision.Oct 3 2021, 6:52 AM
Alphare accepted this revision.Oct 3 2021, 5:17 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:17 PM
marmoute added a commit: rHG7a8c9869e4fe: dirstate-item: replace call to new_merged.Oct 3 2021, 5:36 PM
Closed by commit rHG7a8c9869e4fe: dirstate-item: replace call to new_merged (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30603

mercurial/pure/parsers.py

@classmethod @classmethod
def from_v1_data(cls, state, mode, size, mtime): def from_v1_data(cls, state, mode, size, mtime):
"""Build a new DirstateItem object from V1 data """Build a new DirstateItem object from V1 data
Since the dirstate-v1 format is frozen, the signature of this function Since the dirstate-v1 format is frozen, the signature of this function
is not expected to change, unlike the __init__ one. is not expected to change, unlike the __init__ one.
""" """
if state == b'm': if state == b'm':
return cls.new_merged() return cls(wc_tracked=True, p1_tracked=True, p2_info=True)
elif state == b'a': elif state == b'a':
return cls.new_added() return cls.new_added()
elif state == b'r': elif state == b'r':
if size == NONNORMAL: if size == NONNORMAL:
p1_tracked = True p1_tracked = True
p2_info = True p2_info = True
elif size == FROM_P2: elif size == FROM_P2:
p1_tracked = False p1_tracked = False

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

// We don’t know if P1_TRACKED should be set (file history) // We don’t know if P1_TRACKED should be set (file history)
Flags::P2_INFO Flags::P2_INFO
} else { } else {
Flags::P1_TRACKED Flags::P1_TRACKED
}, },
mode_size: None, mode_size: None,
mtime: None, mtime: None,
}, },
EntryState::Merged => Self::new_merged(), EntryState::Merged => Self {
flags: Flags::WDIR_TRACKED
| Flags::P1_TRACKED // might not be true because of rename ?
| Flags::P2_INFO, // might not be true because of rename ?
mode_size: None,
mtime: None,
},
} }
} }
pub fn new_from_p2() -> Self { pub fn new_from_p2() -> Self {
Self { Self {
// might be missing P1_TRACKED // might be missing P1_TRACKED
flags: Flags::WDIR_TRACKED | Flags::P2_INFO, flags: Flags::WDIR_TRACKED | Flags::P2_INFO,
mode_size: None, mode_size: None,