qimport: when mq.secret=True set qimported revision as secret

hgext/mq.py

@@ -1832,6 +1832,9 b' class queue(object):'
 
                 self.added.append(patchname)
                 patchname = None
+            if rev and repo.ui.configbool('mq', 'secret', False):
+                # 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
@@ -2006,6 +2009,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'),
@@ -2014,8 +2019,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

@@ -226,3 +226,19 b' set up hgweb'
   $ cd ../repo
   $ hg qimport http://localhost:$HGPORT/raw-rev/0///
   adding 0 to series file
+
+check qimport phase:
+
+  $ hg -q qpush
+  now at: 0
+  $ hg phase qparent
+  1: draft
+  $ hg qimport -r qparent
+  $ hg phase qbase
+  1: draft
+  $ hg qfinish qbase
+  $ echo '[mq]' >> $HGRCPATH
+  $ echo 'secret=true' >> $HGRCPATH
+  $ hg qimport -r qparent
+  $ hg phase qbase
+  1: secret