This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11660

dirstate-v2: Use attributes as intended instead of properties in v2_data()
ClosedPublic

Authored by SimonSapin on Oct 14 2021, 9:05 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdb5897321351: dirstate-v2: Use attributes as intended instead of properties in v2_data()
Summary

The property return other integer values instead of None, so is not None
does not work.

This fixes test-dirstate-race.t in pure-Python mode, which currently fails
on the default branch.

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

SimonSapin created this revision.Oct 14 2021, 9:05 AM
pulkit accepted this revision.Oct 14 2021, 2:41 PM
This revision is now accepted and ready to land.Oct 14 2021, 2:41 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (6 lines)

Diff 30816

mercurial/pure/parsers.py

"""Returns (flags, mode, size, mtime) for v2 serialization""" """Returns (flags, mode, size, mtime) for v2 serialization"""
flags = 0 flags = 0
if self._wc_tracked: if self._wc_tracked:
flags |= DIRSTATE_V2_WDIR_TRACKED flags |= DIRSTATE_V2_WDIR_TRACKED
if self._p1_tracked: if self._p1_tracked:
flags |= DIRSTATE_V2_P1_TRACKED flags |= DIRSTATE_V2_P1_TRACKED
if self._p2_info: if self._p2_info:
flags |= DIRSTATE_V2_P2_INFO flags |= DIRSTATE_V2_P2_INFO
if self.mode is not None and self.size is not None: if self._mode is not None and self._size is not None:
flags |= DIRSTATE_V2_HAS_MODE_AND_SIZE flags |= DIRSTATE_V2_HAS_MODE_AND_SIZE
if self.mode & stat.S_IXUSR: if self.mode & stat.S_IXUSR:
flags |= DIRSTATE_V2_MODE_EXEC_PERM flags |= DIRSTATE_V2_MODE_EXEC_PERM
if stat.S_ISLNK(self.mode): if stat.S_ISLNK(self.mode):
flags |= DIRSTATE_V2_MODE_IS_SYMLINK flags |= DIRSTATE_V2_MODE_IS_SYMLINK
if self.mtime is not None: if self._mtime is not None:
flags |= DIRSTATE_V2_HAS_MTIME flags |= DIRSTATE_V2_HAS_MTIME
return (flags, self.size or 0, self.mtime or 0) return (flags, self._size or 0, self._mtime or 0)
def v1_state(self): def v1_state(self):
"""return a "state" suitable for v1 serialization""" """return a "state" suitable for v1 serialization"""
if not self.any_tracked: if not self.any_tracked:
# the object has no state to record, this is -currently- # the object has no state to record, this is -currently-
# unsupported # unsupported
raise RuntimeError('untracked item') raise RuntimeError('untracked item')
elif self.removed: elif self.removed: