This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12481

debuglock: ignore ENOENT error when unlocking
ClosedPublic

Authored by marmoute on Apr 6 2022, 1:22 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG020378f32d57: debuglock: ignore ENOENT error when unlocking
rHGc3c3c419205e: debuglock: ignore ENOENT error when unlocking
Summary

This is consistent with the main lock.release code.

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.Apr 6 2022, 1:22 PM
Alphare added a subscriber: Alphare.Apr 7 2022, 4:36 AM
Alphare added inline comments.
mercurial/debugcommands.py
2151

Maybe just use tryunlink? I see it does catch IoError, should it?

marmoute updated this revision to Diff 32878.Apr 8 2022, 11:47 AM
marmoute added inline comments.Apr 8 2022, 11:47 AM
mercurial/debugcommands.py
2151

lets go with tryunlink

Alphare accepted this revision.Apr 12 2022, 4:53 AM
This revision is now accepted and ready to land.Apr 12 2022, 4:53 AM
marmoute added a commit: rHGc3c3c419205e: debuglock: ignore ENOENT error when unlocking.Apr 12 2022, 5:04 AM
Closed by commit rHGc3c3c419205e: debuglock: ignore ENOENT error when unlocking (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (4 lines)

Diff 33008

mercurial/debugcommands.py

The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs. The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
The set locks are removed when the command exits. The set locks are removed when the command exits.
Returns 0 if no locks are held. Returns 0 if no locks are held.
""" """
if opts.get('force_free_lock'): if opts.get('force_free_lock'):
repo.svfs.unlink(b'lock') repo.svfs.tryunlink(b'lock')
AlphareUnsubmitted
Not Done

Maybe just use tryunlink? I see it does catch IoError, should it?

Alphare: Maybe just use `tryunlink`? I see it does catch `IoError`, should it?
marmouteAuthorUnsubmitted
Done

lets go with tryunlink

marmoute: lets go with `tryunlink`
if opts.get('force_free_wlock'): if opts.get('force_free_wlock'):
repo.vfs.unlink(b'wlock') repo.vfs.tryunlink(b'wlock')
if opts.get('force_free_lock') or opts.get('force_free_wlock'): if opts.get('force_free_lock') or opts.get('force_free_wlock'):
return 0 return 0
locks = [] locks = []
try: try:
if opts.get('set_wlock'): if opts.get('set_wlock'):
try: try:
locks.append(repo.wlock(False)) locks.append(repo.wlock(False))