This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7198

lock: refactor in preparation for next commit
ClosedPublic

Authored by valentin.gatienbaron on Nov 1 2019, 9:51 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGcd822413b9aa: lock: refactor in preparation for next commit

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

pulkit added subscribers: marmoute, pulkit.Nov 13 2019, 8:17 AM

@marmoute can you have a look at these two patches?

marmoute added a comment.Nov 13 2019, 9:21 AM
In D7198#108404, @pulkit wrote:

@marmoute can you have a look at these two patches?

Yes, I will.

indygreg accepted this revision.Nov 18 2019, 10:53 PM
indygreg added a subscriber: indygreg.

This looks like a non-behavior-changing refactor. Thanks also for the switch to a context manager, which is more robust.

This revision is now accepted and ready to land.Nov 18 2019, 10:53 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/lock.py (21 lines)

Diff 18231

mercurial/lock.py

""" """
try: try:
return self.vfs.readlock(self.f) return self.vfs.readlock(self.f)
except (OSError, IOError) as why: except (OSError, IOError) as why:
if why.errno == errno.ENOENT: if why.errno == errno.ENOENT:
return None return None
raise raise
def _testlock(self, locker): def _lockshouldbebroken(self, locker):
if locker is None: if locker is None:
return None return False
try: try:
host, pid = locker.split(b":", 1) host, pid = locker.split(b":", 1)
except ValueError: except ValueError:
return locker return False
if host != lock._host: if host != lock._host:
return locker return False
try: try:
pid = int(pid) pid = int(pid)
except ValueError: except ValueError:
return locker return False
if procutil.testpid(pid): if procutil.testpid(pid):
return False
return True
def _testlock(self, locker):
if not self._lockshouldbebroken(locker):
return locker return locker
# if locker dead, break lock. must do this with another lock # if locker dead, break lock. must do this with another lock
# held, or can race and break valid lock. # held, or can race and break valid lock.
try: try:
l = lock(self.vfs, self.f + b'.break', timeout=0) with lock(self.vfs, self.f + b'.break', timeout=0):
self.vfs.unlink(self.f) self.vfs.unlink(self.f)
l.release()
except error.LockError: except error.LockError:
return locker return locker
def testlock(self): def testlock(self):
"""return id of locker if lock is valid, else None. """return id of locker if lock is valid, else None.
If old-style lock, we cannot tell what machine locker is on. If old-style lock, we cannot tell what machine locker is on.
with new-style lock, if locker is on this machine, we can with new-style lock, if locker is on this machine, we can