[PATCH 3 of 4 stable] mq: qimport need wlock for --push - do that after releasing lock
Mads Kiilerich
mads at kiilerich.com
Sat May 12 13:37:45 CDT 2012
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1327941465 -3600
# Node ID 4a112c51f224358f5c269b06d6ee82f43b6c9133
# Parent 711ef9c22ba55ef5e160793792b39a74167bb05a
mq: qimport need wlock for --push - do that after releasing lock
qimport locking was introduced for phases in 29ea059be33c.
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -2135,12 +2135,11 @@
rev=opts.get('rev'), git=opts.get('git'))
finally:
q.savedirty()
-
-
- if imported and opts.get('push') and not opts.get('rev'):
- return q.push(repo, imported[-1])
finally:
lock.release()
+
+ if imported and opts.get('push') and not opts.get('rev'):
+ return q.push(repo, imported[-1])
return 0
def qinit(ui, repo, create):
More information about the Mercurial-devel
mailing list