D3744: backout: use context manager for locks
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jun 14 23:34:22 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3744
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -560,13 +560,8 @@
Returns 0 on success, 1 if nothing to backout or there are unresolved
files.
'''
- wlock = lock = None
- try:
- wlock = repo.wlock()
- lock = repo.lock()
+ with repo.wlock(), repo.lock():
return _dobackout(ui, repo, node, rev, **opts)
- finally:
- release(lock, wlock)
def _dobackout(ui, repo, node=None, rev=None, **opts):
opts = pycompat.byteskwargs(opts)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list