This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10959

dirstate-entry: restrict `from_p2` property to tracked file
ClosedPublic

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

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG28632eb3ca3e: dirstate-entry: restrict `from_p2` property to tracked file
Summary

The other case is now handled in from_p2_removed, and should ideally be moved
to a lower level. So we can drop the state == 'n' narrowing and move it in the
property itself.

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:25 AM
pulkit accepted this revision.Jul 6 2021, 12:32 PM
This revision is now accepted and ready to land.Jul 6 2021, 12:32 PM
baymax updated this revision to Diff 28861.Jul 6 2021, 2:08 PM

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

Revision Contents
Changeset List

Diff 28898

mercurial/cext/parsers.c

Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; 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->state == 'n' && 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) static PyObject *dirstatetuple_get_from_p2_removed(dirstateTupleObject *self)
{ {

mercurial/dirstate.py

# Discard "merged" markers when moving away from a merge state # Discard "merged" markers when moving away from a merge state
if s.merged: if s.merged:
source = self._map.copymap.get(f) source = self._map.copymap.get(f)
if source: if source:
copies[f] = source copies[f] = source
self.normallookup(f) self.normallookup(f)
# Also fix up otherparent markers # Also fix up otherparent markers
elif s.state == b'n' and s.from_p2: elif s.from_p2:
source = self._map.copymap.get(f) source = self._map.copymap.get(f)
if source: if source:
copies[f] = source copies[f] = source
self.add(f) self.add(f)
return copies return copies
def setbranch(self, branch): def setbranch(self, branch):
self.__class__._branch.set(self, encoding.fromlocal(branch)) self.__class__._branch.set(self, encoding.fromlocal(branch))
source = self._map.copymap.get(f) source = self._map.copymap.get(f)
if entry.merged_removed: if entry.merged_removed:
self.merge(f) self.merge(f)
elif entry.from_p2_removed: elif entry.from_p2_removed:
self.otherparent(f) self.otherparent(f)
if source is not None: if source is not None:
self.copy(source, f) self.copy(source, f)
return return
elif entry.merged or entry.state == b'n' and entry.from_p2: elif entry.merged or 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

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
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
This is only True is the file is currently tracked.
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._state == b'n' and self._size == FROM_P2
@property @property
def from_p2_removed(self): def from_p2_removed(self):
"""True if the file has been removed, but was "from_p2" initially """True if the file has been removed, but was "from_p2" initially
This property seems like an abstraction leakage and should probably be This property seems like an abstraction leakage and should probably be
dealt in this class (or maybe the dirstatemap) directly. dealt in this class (or maybe the dirstatemap) directly.
""" """