Mercurial > evolve

changeset 1295:1ac05eef72ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prune: prune fix transaction pattern I forgot to amend.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 29 Apr 2015 14:23:09 -0700
parents d1c29db2e055
children 51ec3610968c
files hgext/evolve.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Tue Apr 07 14:26:03 2015 -0700
+++ b/hgext/evolve.py	Wed Apr 29 14:23:09 2015 -0700
@@ -1797,7 +1797,7 @@
     if not revs:
         raise util.Abort(_('nothing to prune'))
 
-    wlock = lock = None
+    wlock = lock = tr = None
     try:
         wlock = repo.wlock()
         lock = repo.lock()
@@ -1895,9 +1895,7 @@
 
         tr.close()
     finally:
-        if tr:
-            tr.release()
-        lockmod.release(lock, wlock)
+        lockmod.release(tr, lock, wlock)
 
 @command('amend|refresh',
     [('A', 'addremove', None,