Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 44184:b339faf3f843 stable
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 | 92b7caf4cb9e f5c006621f07 |
comparison
equal
deleted
inserted
replaced
44183:d1177d39012e | 44184:b339faf3f843 |
---|---|
1896 user=user, | 1896 user=user, |
1897 date=date, | 1897 date=date, |
1898 branch=branch, | 1898 branch=branch, |
1899 editor=editor, | 1899 editor=editor, |
1900 ) | 1900 ) |
1901 n = memctx.commit() | 1901 |
1902 overrides = {} | |
1903 if opts.get(b'secret'): | |
1904 overrides[(b'phases', b'new-commit')] = b'secret' | |
1905 with repo.ui.configoverride(overrides, b'import'): | |
1906 n = memctx.commit() | |
1902 finally: | 1907 finally: |
1903 store.close() | 1908 store.close() |
1904 if opts.get(b'exact') and nocommit: | 1909 if opts.get(b'exact') and nocommit: |
1905 # --exact with --no-commit is still useful in that it does merge | 1910 # --exact with --no-commit is still useful in that it does merge |
1906 # and branch bits | 1911 # and branch bits |