Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 44330:b339faf3f843 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: don't ignore `--secret` when `--bypass` is specified Differential Revision: https://phab.mercurial-scm.org/D8126
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 16 Feb 2020 17:05:18 -0500
parents 19533e4c3450
children f5c006621f07 92b7caf4cb9e
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Feb 18 13:46:10 2020 -0500
+++ b/mercurial/cmdutil.py	Sun Feb 16 17:05:18 2020 -0500
@@ -1898,7 +1898,12 @@
                 branch=branch,
                 editor=editor,
             )
-            n = memctx.commit()
+
+            overrides = {}
+            if opts.get(b'secret'):
+                overrides[(b'phases', b'new-commit')] = b'secret'
+            with repo.ui.configoverride(overrides, b'import'):
+                n = memctx.commit()
         finally:
             store.close()
     if opts.get(b'exact') and nocommit: