mq: qimporting revision set them to secret

hgext/mq.py

@@ -1814,6 +1814,9 b' class queue(object):'
 
                 self.added.append(patchname)
                 patchname = None
+            if rev:
+                # if we added anything with rev, we must move the secret root
+                phases.retractboundary(repo, phases.secret, [n])
             self.parseseries()
             self.applieddirty = True
             self.seriesdirty = True
@@ -1988,6 +1991,8 b' def qimport(ui, repo, *filename, **opts)'
 
     Returns 0 if import succeeded.
     """
+    lock = repo.lock() # cause this may move phase
+    try:
     q = repo.mq
     try:
         q.qimport(repo, filename, patchname=opts.get('name'),
@@ -1996,8 +2001,11 b' def qimport(ui, repo, *filename, **opts)'
     finally:
         q.savedirty()
 
+
     if opts.get('push') and not opts.get('rev'):
         return q.push(repo, None)
+    finally:
+        lock.release()
     return 0
 
 def qinit(ui, repo, create):

tests/test-mq-qimport.t

@@ -165,6 +165,8 b' try to import --push'
   patch b.diff finalized without changeset message
   patch another.diff finalized without changeset message
   $ hg qimport -rtip -P
+  $ hg phase -r qbase
+  2: secret
   $ hg qpop -a
   popping 2.diff
   patch queue now empty