[PATCH 3 of 3] mq: release lock after transaction in qrefresh

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Oct 3 12:05:36 EDT 2016


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1470920717 -7200
#      Thu Aug 11 15:05:17 2016 +0200
# Node ID 870b39c306bef0889f738d292006a1a322757e22
# Parent  901855444329e0a4ad7ad0e41cf0a1b6fd3ed5bc
# EXP-Topic vfs.ward
mq: release lock after transaction in qrefresh

The transaction should be closed within the lock.

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1840,7 +1840,7 @@ class queue(object):
 
                     self.applied.append(statusentry(n, patchfn))
                 finally:
-                    lockmod.release(lock, tr)
+                    lockmod.release(tr, lock)
             except: # re-raises
                 ctx = repo[cparents[0]]
                 repo.dirstate.rebuild(ctx.node(), ctx.manifest())


More information about the Mercurial-devel mailing list