--- a/mercurial/hbisect.py	Fri Jan 15 13:14:49 2016 -0800
+++ b/mercurial/hbisect.py	Fri Jan 15 13:14:49 2016 -0800
@@ -153,14 +153,11 @@
 
 def save_state(repo, state):
     f = repo.vfs("bisect.state", "w", atomictemp=True)
-    wlock = repo.wlock()
-    try:
+    with repo.wlock():
         for kind in sorted(state):
             for node in state[kind]:
                 f.write("%s %s\n" % (kind, hex(node)))
         f.close()
-    finally:
-        wlock.release()
 
 def get(repo, status):
     """