Mercurial > hg-stable

changeset 35573:5574629d5d45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: use context manager for lock in pushmarker() Differential Revision: https://phab.mercurial-scm.org/D1836
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 10 Jan 2018 10:32:16 -0800
parents 8b729856ca03
children 09285733ad71
files mercurial/obsolete.py
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/obsolete.py	Wed Jan 10 10:30:51 2018 -0800
+++ b/mercurial/obsolete.py	Wed Jan 10 10:32:16 2018 -0800
@@ -838,8 +838,7 @@
         repo.ui.warn(_('unexpected old value for %r') % key)
         return False
     data = util.b85decode(new)
-    lock = repo.lock()
-    try:
+    with repo.lock():
         tr = repo.transaction('pushkey: obsolete markers')
         try:
             repo.obsstore.mergemarkers(tr, data)
@@ -848,8 +847,6 @@
             return True
         finally:
             tr.release()
-    finally:
-        lock.release()
 
 # keep compatibility for the 4.3 cycle
 def allprecursors(obsstore, nodes, ignoreflags=0):