D5542: histedit: use context manager for locks
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jan 9 23:39:20 UTC 2019
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5542
AFFECTED FILES
hgext/histedit.py
CHANGE DETAILS
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -207,7 +207,6 @@
exchange,
extensions,
hg,
- lock,
logcmdutil,
merge as mergemod,
mergeutil,
@@ -225,7 +224,6 @@
)
pickle = util.pickle
-release = lock.release
cmdtable = {}
command = registrar.command(cmdtable)
@@ -1601,12 +1599,10 @@
def _texthistedit(ui, repo, *freeargs, **opts):
state = histeditstate(repo)
- try:
- state.wlock = repo.wlock()
- state.lock = repo.lock()
+ with repo.wlock() as wlock, repo.lock() as lock:
+ state.wlock = wlock
+ state.lock = lock
_histedit(ui, repo, state, *freeargs, **opts)
- finally:
- release(state.lock, state.wlock)
goalcontinue = 'continue'
goalabort = 'abort'
To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list