# HG changeset patch # User Martin von Zweigbergk # Date 1529014099 25200 # Node ID 9b1536b02221741135effe9ffdb1a3f3f1cda8fc # Parent eef4668be8a3e727c8c9e5bd08c63437f5cf2040 backout: use context manager for locks Differential Revision: https://phab.mercurial-scm.org/D3744 diff -r eef4668be8a3 -r 9b1536b02221 mercurial/commands.py --- a/mercurial/commands.py Thu Jun 14 15:28:32 2018 -0700 +++ b/mercurial/commands.py Thu Jun 14 15:08:19 2018 -0700 @@ -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)