This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11599

dirstate-item: drop the legacy new_merged constructor
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb2af515b4faf: dirstate-item: drop the legacy new_merged constructor
Summary

Nobody is calling it anymore. Its purposes has been filled.

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: rHGb2af515b4faf: dirstate-item: drop the legacy new_merged constructor.Oct 3 2021, 5:36 PM
Closed by commit rHGb2af515b4faf: dirstate-item: drop the legacy new_merged constructor (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30657

mercurial/cext/parsers.c

} }
t->flags = dirstate_flag_wc_tracked; t->flags = dirstate_flag_wc_tracked;
t->mode = 0; t->mode = 0;
t->size = 0; t->size = 0;
t->mtime = 0; t->mtime = 0;
return (PyObject *)t; return (PyObject *)t;
}; };
/* constructor to help legacy API to build a new "merged" item
Should eventually be removed */
static PyObject *dirstate_item_new_merged(PyTypeObject *subtype)
{
dirstateItemObject *t;
t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
if (!t) {
return NULL;
}
t->flags = (dirstate_flag_wc_tracked | dirstate_flag_p1_tracked |
dirstate_flag_p2_info);
t->mode = 0;
t->size = 0;
t->mtime = 0;
return (PyObject *)t;
};
/* constructor to help legacy API to build a new "from_p2" item /* constructor to help legacy API to build a new "from_p2" item
Should eventually be removed */ Should eventually be removed */
static PyObject *dirstate_item_new_from_p2(PyTypeObject *subtype) static PyObject *dirstate_item_new_from_p2(PyTypeObject *subtype)
{ {
/* We do all the initialization here and not a tp_init function because /* We do all the initialization here and not a tp_init function because
* dirstate_item is immutable. */ * dirstate_item is immutable. */
dirstateItemObject *t; dirstateItemObject *t;
"return a \"mtime\" suitable for v1 serialization"}, "return a \"mtime\" suitable for v1 serialization"},
{"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O, {"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O,
"True if the stored mtime would be ambiguous with the current time"}, "True if the stored mtime would be ambiguous with the current time"},
{"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth,
METH_VARARGS | METH_CLASS, "build a new DirstateItem object from V1 data"}, METH_VARARGS | METH_CLASS, "build a new DirstateItem object from V1 data"},
{"new_added", (PyCFunction)dirstate_item_new_added, {"new_added", (PyCFunction)dirstate_item_new_added,
METH_NOARGS | METH_CLASS, METH_NOARGS | METH_CLASS,
"constructor to help legacy API to build a new \"added\" item"}, "constructor to help legacy API to build a new \"added\" item"},
{"new_merged", (PyCFunction)dirstate_item_new_merged,
METH_NOARGS | METH_CLASS,
"constructor to help legacy API to build a new \"merged\" item"},
{"new_from_p2", (PyCFunction)dirstate_item_new_from_p2, {"new_from_p2", (PyCFunction)dirstate_item_new_from_p2,
METH_NOARGS | METH_CLASS, METH_NOARGS | METH_CLASS,
"constructor to help legacy API to build a new \"from_p2\" item"}, "constructor to help legacy API to build a new \"from_p2\" item"},
{"new_possibly_dirty", (PyCFunction)dirstate_item_new_possibly_dirty, {"new_possibly_dirty", (PyCFunction)dirstate_item_new_possibly_dirty,
METH_NOARGS | METH_CLASS, METH_NOARGS | METH_CLASS,
"constructor to help legacy API to build a new \"possibly_dirty\" item"}, "constructor to help legacy API to build a new \"possibly_dirty\" item"},
{"new_normal", (PyCFunction)dirstate_item_new_normal, {"new_normal", (PyCFunction)dirstate_item_new_normal,
METH_VARARGS | METH_CLASS, METH_VARARGS | METH_CLASS,

mercurial/pure/parsers.py

def new_added(cls): def new_added(cls):
"""constructor to help legacy API to build a new "added" item """constructor to help legacy API to build a new "added" item
Should eventually be removed Should eventually be removed
""" """
return cls(wc_tracked=True) return cls(wc_tracked=True)
@classmethod @classmethod
def new_merged(cls):
"""constructor to help legacy API to build a new "merged" item
Should eventually be removed
"""
return cls(wc_tracked=True, p1_tracked=True, p2_info=True)
@classmethod
def new_from_p2(cls): def new_from_p2(cls):
"""constructor to help legacy API to build a new "from_p2" item """constructor to help legacy API to build a new "from_p2" item
Should eventually be removed Should eventually be removed
""" """
return cls(wc_tracked=True, p2_info=True) return cls(wc_tracked=True, p2_info=True)
@classmethod @classmethod

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

pub fn new_added() -> Self { pub fn new_added() -> Self {
Self { Self {
flags: Flags::WDIR_TRACKED, flags: Flags::WDIR_TRACKED,
mode_size: None, mode_size: None,
mtime: None, mtime: None,
} }
} }
pub fn new_merged() -> Self {
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_normal(mode: i32, size: i32, mtime: i32) -> Self { pub fn new_normal(mode: i32, size: i32, mtime: i32) -> Self {
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: Some(mtime), mtime: Some(mtime),
} }
} }

rust/hg-cpython/src/dirstate/item.rs

@classmethod @classmethod
def new_added(_cls) -> PyResult<Self> { def new_added(_cls) -> PyResult<Self> {
let entry = DirstateEntry::new_added(); let entry = DirstateEntry::new_added();
DirstateItem::create_instance(py, Cell::new(entry)) DirstateItem::create_instance(py, Cell::new(entry))
} }
@classmethod @classmethod
def new_merged(_cls) -> PyResult<Self> {
let entry = DirstateEntry::new_merged();
DirstateItem::create_instance(py, Cell::new(entry))
}
@classmethod
def new_from_p2(_cls) -> PyResult<Self> { def new_from_p2(_cls) -> PyResult<Self> {
let entry = DirstateEntry::new_from_p2(); let entry = DirstateEntry::new_from_p2();
DirstateItem::create_instance(py, Cell::new(entry)) DirstateItem::create_instance(py, Cell::new(entry))
} }
@classmethod @classmethod
def new_possibly_dirty(_cls) -> PyResult<Self> { def new_possibly_dirty(_cls) -> PyResult<Self> {
let entry = DirstateEntry::new_possibly_dirty(); let entry = DirstateEntry::new_possibly_dirty();