--- a/mercurial/repair.py	Fri Jan 15 13:14:49 2016 -0800
+++ b/mercurial/repair.py	Fri Jan 15 13:14:49 2016 -0800
@@ -252,8 +252,7 @@
                   'support fncache)\n'))
         return
 
-    lock = repo.lock()
-    try:
+    with repo.lock():
         fnc = repo.store.fncache
         # Trigger load of fncache.
         if 'irrelevant' in fnc:
@@ -305,8 +304,6 @@
                 tr.release()
         else:
             ui.write(_('fncache already up to date\n'))
-    finally:
-        lock.release()
 
 def stripbmrevset(repo, mark):
     """