This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10968

dirstate-entry: add a `added` property
ClosedPublic

Authored by marmoute on Jul 4 2021, 5:51 PM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8bcae9bf9e8d: dirstate-entry: add a `added` property
Summary

Lets use more semantic property instead of the state implementation details.

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.Jul 4 2021, 5:51 PM
SimonSapin accepted this revision.Jul 5 2021, 12:56 AM
pulkit accepted this revision.Jul 6 2021, 12:43 PM
This revision is now accepted and ready to land.Jul 6 2021, 12:43 PM
baymax updated this revision to Diff 28870.Jul 6 2021, 2:09 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG8bcae9bf9e8d: dirstate-entry: add a `added` property.Jul 6 2021, 3:10 PM
Closed by commit rHG8bcae9bf9e8d: dirstate-entry: add a `added` property (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28907

mercurial/cext/parsers.c

{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
static PyObject *dirstatetuple_get_state(dirstateTupleObject *self) static PyObject *dirstatetuple_get_state(dirstateTupleObject *self)
{ {
return PyBytes_FromStringAndSize(&self->state, 1); return PyBytes_FromStringAndSize(&self->state, 1);
}; };
static PyObject *dirstatetuple_get_added(dirstateTupleObject *self)
{
if (self->state == 'a') {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dirstatetuple_get_merged(dirstateTupleObject *self) static PyObject *dirstatetuple_get_merged(dirstateTupleObject *self)
{ {
if (self->state == 'm') { if (self->state == 'm') {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyGetSetDef dirstatetuple_getset[] = { static PyGetSetDef dirstatetuple_getset[] = {
{"state", (getter)dirstatetuple_get_state, NULL, "state", NULL}, {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL},
{"added", (getter)dirstatetuple_get_added, NULL, "added", NULL},
{"merged_removed", (getter)dirstatetuple_get_merged_removed, NULL, {"merged_removed", (getter)dirstatetuple_get_merged_removed, NULL,
"merged_removed", NULL}, "merged_removed", NULL},
{"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL}, {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL},
{"from_p2_removed", (getter)dirstatetuple_get_from_p2_removed, NULL, {"from_p2_removed", (getter)dirstatetuple_get_from_p2_removed, NULL,
"from_p2_removed", NULL}, "from_p2_removed", NULL},
{"from_p2", (getter)dirstatetuple_get_from_p2, NULL, "from_p2", NULL}, {"from_p2", (getter)dirstatetuple_get_from_p2, NULL, "from_p2", NULL},
{"removed", (getter)dirstatetuple_get_removed, NULL, "removed", NULL}, {"removed", (getter)dirstatetuple_get_removed, NULL, "removed", NULL},
{NULL} /* Sentinel */ {NULL} /* Sentinel */

mercurial/dirstate.py

# changed in the same second without changing its size. # changed in the same second without changing its size.
# This can happen if we quickly do multiple commits. # This can happen if we quickly do multiple commits.
# Force lookup, so we don't miss such a racy file change. # Force lookup, so we don't miss such a racy file change.
ladd(fn) ladd(fn)
elif listclean: elif listclean:
cadd(fn) cadd(fn)
elif t.merged: elif t.merged:
madd(fn) madd(fn)
elif state == b'a': elif t.added:
aadd(fn) aadd(fn)
elif t.removed: elif t.removed:
radd(fn) radd(fn)
status = scmutil.status( status = scmutil.status(
modified, added, removed, deleted, unknown, ignored, clean modified, added, removed, deleted, unknown, ignored, clean
) )
return (lookup, status) return (lookup, status)

mercurial/pure/parsers.py

XXX This "state" is a bit obscure and mostly a direct expression of the XXX This "state" is a bit obscure and mostly a direct expression of the
dirstatev1 format. It would make sense to ultimately deprecate it in dirstatev1 format. It would make sense to ultimately deprecate it in
favor of the more "semantic" attributes. favor of the more "semantic" attributes.
""" """
return self._state return self._state
@property @property
def added(self):
"""True if the file has been added"""
return self._state == b'a'
@property
def merged(self): def merged(self):
"""True if the file has been merged """True if the file has been merged
Should only be set if a merge is in progress in the dirstate Should only be set if a merge is in progress in the dirstate
""" """
return self._state == b'm' return self._state == b'm'
@property @property