diff mercurial/cmdutil.py @ 20702:2764148aa088

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 13 Mar 2014 12:05:08 -0500
parents 3a35ba2681ec b0153cb8b64e
children 9c1665f36588
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Feb 04 18:33:25 2014 -0500
+++ b/mercurial/cmdutil.py	Thu Mar 13 12:05:08 2014 -0500
@@ -1969,7 +1969,11 @@
 
             ph = repo.ui.config('phases', 'new-commit', phases.draft)
             try:
-                repo.ui.setconfig('phases', 'new-commit', old.phase())
+                if opts.get('secret'):
+                    commitphase = 'secret'
+                else:
+                    commitphase = old.phase()
+                repo.ui.setconfig('phases', 'new-commit', commitphase)
                 newid = repo.commitctx(new)
             finally:
                 repo.ui.setconfig('phases', 'new-commit', ph)