This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10958

dirstate-entry: `merged_removed` and `from_p2_removed` properties
ClosedPublic

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

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb8ffe85e399b: dirstate-entry: `merged_removed` and `from_p2_removed` properties
Summary

Lets start to define and use more semantic property. These two might be a bit
too low level and could be shaved off later, however this seems an improvement
for now.

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:50 PM
SimonSapin accepted this revision.Jul 5 2021, 12:24 AM
pulkit added a subscriber: pulkit.Jul 6 2021, 12:31 PM
pulkit added inline comments.
mercurial/pure/parsers.py
107

This description does not sounds correct.

109

s/attraction/abstraction

110

missing closing brackets in comment

123

s/attraction/abstraction

124

missing closing brackets in comment

baymax updated this revision to Diff 28860.Jul 6 2021, 2:08 PM

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

pulkit accepted this revision.Jul 6 2021, 2:50 PM
This revision is now accepted and ready to land.Jul 6 2021, 2:50 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/parsers.c (23 lines)
Mmercurial/dirstate.py (12 lines)
Mmercurial/pure/parsers.py (21 lines)

Diff 28897

mercurial/cext/parsers.c

#define PyInt_FromLong PyLong_FromLong #define PyInt_FromLong PyLong_FromLong
#define PyInt_FromSsize_t PyLong_FromSsize_t #define PyInt_FromSsize_t PyLong_FromSsize_t
#define PyInt_AsLong PyLong_AsLong #define PyInt_AsLong PyLong_AsLong
#endif #endif
static const char *const versionerrortext = "Python minor version mismatch"; static const char *const versionerrortext = "Python minor version mismatch";
static const int dirstate_v1_from_p2 = -2; static const int dirstate_v1_from_p2 = -2;
static const int dirstate_v1_nonnormal = -1;
static PyObject *dict_new_presized(PyObject *self, PyObject *args) static PyObject *dict_new_presized(PyObject *self, PyObject *args)
{ {
Py_ssize_t expected_size; Py_ssize_t expected_size;
if (!PyArg_ParseTuple(args, "n:make_presized_dict", &expected_size)) { if (!PyArg_ParseTuple(args, "n:make_presized_dict", &expected_size)) {
return NULL; return NULL;
} }
{ {
if (self->state == 'm') { if (self->state == 'm') {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstatetuple_get_merged_removed(dirstateTupleObject *self)
{
if (self->state == 'r' && self->size == dirstate_v1_nonnormal) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dirstatetuple_get_from_p2(dirstateTupleObject *self) static PyObject *dirstatetuple_get_from_p2(dirstateTupleObject *self)
{ {
if (self->size == dirstate_v1_from_p2) { if (self->size == dirstate_v1_from_p2) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstatetuple_get_from_p2_removed(dirstateTupleObject *self)
{
if (self->state == 'r' && self->size == dirstate_v1_from_p2) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dirstatetuple_get_removed(dirstateTupleObject *self) static PyObject *dirstatetuple_get_removed(dirstateTupleObject *self)
{ {
if (self->state == 'r') { if (self->state == 'r') {
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},
{"merged_removed", (getter)dirstatetuple_get_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", 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 */
}; };
PyTypeObject dirstateTupleType = { PyTypeObject dirstateTupleType = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"dirstate_tuple", /* tp_name */ "dirstate_tuple", /* tp_name */

mercurial/dirstate.py

def normallookup(self, f): def normallookup(self, f):
'''Mark a file normal, but possibly dirty.''' '''Mark a file normal, but possibly dirty.'''
if self.in_merge: if self.in_merge:
# if there is a merge going on and the file was either # if there is a merge going on and the file was either
# "merged" or coming from other parent (-2) before # "merged" or coming from other parent (-2) before
# being removed, restore that state. # being removed, restore that state.
entry = self._map.get(f) entry = self._map.get(f)
if entry is not None: if entry is not None:
if entry.removed and (entry[2] == NONNORMAL or entry.from_p2): # XXX this should probably be dealt with a a lower level
# (see `merged_removed` and `from_p2_removed`)
if entry.merged_removed or entry.from_p2_removed:
source = self._map.copymap.get(f) source = self._map.copymap.get(f)
if entry[2] == NONNORMAL: if entry.merged_removed:
self.merge(f) self.merge(f)
elif entry.from_p2: elif entry.from_p2_removed:
self.otherparent(f) self.otherparent(f)
if source: if source is not None:
self.copy(source, f) self.copy(source, f)
return return
if entry.merged or entry.state == b'n' and entry.from_p2: elif entry.merged or entry.state == b'n' and entry.from_p2:
return return
self._addpath(f, b'n', 0, possibly_dirty=True) self._addpath(f, b'n', 0, possibly_dirty=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def otherparent(self, f): def otherparent(self, f):
'''Mark as coming from the other parent, always dirty.''' '''Mark as coming from the other parent, always dirty.'''
if not self.in_merge: if not self.in_merge:
msg = _(b"setting %r to other parent only allowed in merges") % f msg = _(b"setting %r to other parent only allowed in merges") % f

mercurial/pure/parsers.py

_unpack = struct.unpack _unpack = struct.unpack
_compress = zlib.compress _compress = zlib.compress
_decompress = zlib.decompress _decompress = zlib.decompress
# a special value used internally for `size` if the file come from the other parent # a special value used internally for `size` if the file come from the other parent
FROM_P2 = -2 FROM_P2 = -2
# a special value used internally for `size` if the file is modified/merged/added
NONNORMAL = -1
class dirstatetuple(object): class dirstatetuple(object):
"""represent a dirstate entry """represent a dirstate entry
It contains: It contains:
- state (one of 'n', 'a', 'r', 'm') - state (one of 'n', 'a', 'r', 'm')
- mode, - mode,
def from_p2(self): def from_p2(self):
"""True if the file have been fetched from p2 during the current merge """True if the file have been fetched from p2 during the current merge
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._size == FROM_P2 return self._size == FROM_P2
@property @property
def from_p2_removed(self):
"""True if the file has been removed, but was "from_p2" initially
pulkitUnsubmitted
Not Done

This description does not sounds correct.

pulkit: This description does not sounds correct.
This property seems like an abstraction leakage and should probably be
pulkitUnsubmitted
Not Done

s/attraction/abstraction

pulkit: `s/attraction/abstraction`
dealt in this class (or maybe the dirstatemap) directly.
pulkitUnsubmitted
Not Done

missing closing brackets in comment

pulkit: missing closing brackets in comment
"""
return self._state == b'r' and self._size == FROM_P2
@property
def removed(self): def removed(self):
"""True if the file has been removed""" """True if the file has been removed"""
return self._state == b'r' return self._state == b'r'
@property
def merged_removed(self):
"""True if the file has been removed, but was "merged" initially
This property seems like an abstraction leakage and should probably be
pulkitUnsubmitted
Not Done

s/attraction/abstraction

pulkit: `s/attraction/abstraction`
dealt in this class (or maybe the dirstatemap) directly.
pulkitUnsubmitted
Not Done

missing closing brackets in comment

pulkit: missing closing brackets in comment
"""
return self._state == b'r' and self._size == NONNORMAL
def v1_state(self): def v1_state(self):
"""return a "state" suitable for v1 serialization""" """return a "state" suitable for v1 serialization"""
return self._state return self._state
def v1_mode(self): def v1_mode(self):
"""return a "mode" suitable for v1 serialization""" """return a "mode" suitable for v1 serialization"""
return self._mode return self._mode