--- a/mercurial/repair.py	Fri Jan 15 13:14:49 2016 -0800
+++ b/mercurial/repair.py	Fri Jan 15 13:14:49 2016 -0800
@@ -296,12 +296,8 @@
             fnc.entries = newentries
             fnc._dirty = True
 
-            tr = repo.transaction('fncache')
-            try:
+            with repo.transaction('fncache') as tr:
                 fnc.write(tr)
-                tr.close()
-            finally:
-                tr.release()
         else:
             ui.write(_('fncache already up to date\n'))