This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11600

dirstate-item: replace call to new_added
ClosedPublic

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

Details

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

Revision Contents
Changeset List

Diff 30658

mercurial/pure/parsers.py

"""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(wc_tracked=True, p1_tracked=True, p2_info=True) 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(wc_tracked=True)
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
p2_info = True p2_info = True
else: else:

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

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::new_normal(mode, size, mtime)
} }
} }
EntryState::Added => Self::new_added(), EntryState::Added => Self {
flags: Flags::WDIR_TRACKED,
mode_size: None,
mtime: None,
},
EntryState::Removed => Self { EntryState::Removed => Self {
flags: if size == SIZE_NON_NORMAL { flags: if size == SIZE_NON_NORMAL {
Flags::P1_TRACKED | Flags::P2_INFO Flags::P1_TRACKED | Flags::P2_INFO
} else if size == SIZE_FROM_OTHER_PARENT { } else if size == SIZE_FROM_OTHER_PARENT {
// 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