Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 20702:2764148aa088
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 13 Mar 2014 12:05:08 -0500 |
parents | 870d60294b04 b0153cb8b64e |
children | 535283a7f5dd |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Feb 04 18:33:25 2014 -0500 +++ b/mercurial/commands.py Thu Mar 13 12:05:08 2014 -0500 @@ -1397,6 +1397,7 @@ if opts.get('force_editor'): e = cmdutil.commitforceeditor + # commitfunc is used only for temporary amend commit by cmdutil.amend def commitfunc(ui, repo, message, match, opts): editor = e # message contains text from -m or -l, if it's empty, @@ -1404,18 +1405,12 @@ if not message: message = old.description() editor = cmdutil.commitforceeditor - try: - if opts.get('secret'): - ui.setconfig('phases', 'new-commit', 'secret') - - return repo.commit(message, - opts.get('user') or old.user(), - opts.get('date') or old.date(), - match, - editor=editor, - extra=extra) - finally: - ui.setconfig('phases', 'new-commit', oldcommitphase) + return repo.commit(message, + opts.get('user') or old.user(), + opts.get('date') or old.date(), + match, + editor=editor, + extra=extra) current = repo._bookmarkcurrent marks = old.bookmarks()