qrefresh: keep changeset phase during refresh

hgext/mq.py

@@ -1511,6 +1511,8 b' class queue(object):'
 
                 user = ph.user or changes[1]
 
+                oldphase = repo[top].phase()
+
                 # assumes strip can roll itself back if interrupted
                 repo.dirstate.setparents(*cparents)
                 self.applied.pop()
@@ -1523,8 +1525,15 b' class queue(object):'
 
             try:
                 # might be nice to attempt to roll back strip after this
-                n = secretcommit(repo, message, user, ph.date, match=match,
-                                 force=True)
+                backup = repo.ui.backupconfig('phases', 'new-commit')
+                try:
+                    # Ensure we create a new changeset in the same phase than
+                    # the old one.
+                    repo.ui.setconfig('phases', 'new-commit', oldphase)
+                    n = repo.commit(message, user, ph.date, match=match,
+                                    force=True)
+                finally:
+                    repo.ui.restoreconfig(backup)
                 # only write patch after a successful commit
                 patchf.close()
                 self.applied.append(statusentry(n, patchfn))

tests/test-mq-qrefresh.t

@@ -523,3 +523,23 b' but only after writing the bad name into'
   diff --git a/a b/a
   new file mode 100644
   $ cd ..
+
+Refresh with phase data:
+
+
+
+  $ cd repo
+  $ echo 'babar' >> a
+  $ hg qnew -m 'update a' p2.diff
+  $ hg phase p2.diff
+  2: draft
+  $ echo 'beber' >> a
+  $ hg qref
+  $ hg phase p2.diff
+  2: draft
+  $ hg phase --force --secret p2.diff
+  $ echo 'bibir' >> a
+  $ hg qref
+  $ hg phase p2.diff
+  2: secret
+