[PATCH] perf: close transaction in perffncachewrite

Bryan O'Sullivan bos at serpentine.com
Wed Dec 23 06:53:02 UTC 2015


# HG changeset patch
# User Bryan O'Sullivan <bos at serpentine.com>
# Date 1450853576 28800
#      Tue Dec 22 22:52:56 2015 -0800
# Node ID eae73721d41a0242f285a39f61da85eb8b62ac2e
# Parent  b74ccb8db88fb4f333061215d67dba5065bc56ab
perf: close transaction in perffncachewrite

This fixes a bug, and brings CPython behaviour on this test into
line with PyPy.

diff --git a/contrib/perf.py b/contrib/perf.py
--- a/contrib/perf.py
+++ b/contrib/perf.py
@@ -441,6 +441,7 @@ def perffncachewrite(ui, repo, **opts):
         s.fncache.write(tr)
     timer(d)
     lock.release()
+    tr.close()
     fm.end()
 
 @command('perffncacheencode', formatteropts)
diff --git a/tests/test-contrib-perf.t b/tests/test-contrib-perf.t
--- a/tests/test-contrib-perf.t
+++ b/tests/test-contrib-perf.t
@@ -123,8 +123,6 @@ perfstatus
   $ hg perffncacheencode
   $ hg perffncacheload
   $ hg perffncachewrite
-  transaction abort!
-  rollback completed
   $ hg perfheads
   $ hg perfindex
   $ hg perfloadmarkers


More information about the Mercurial-devel mailing list