diff hgext/evolve.py @ 741:892a6d708c8f

amend: drop the deprecated note option We plan to get closer to the commit --amend implementation dropping this deprecated option helps.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 15 Oct 2013 16:20:17 +0200
parents fa049c1d9445
children 760d01a549a6
line wrap: on
line diff
--- a/hgext/evolve.py	Wed Sep 25 02:06:47 2013 +0200
+++ b/hgext/evolve.py	Tue Oct 15 16:20:17 2013 +0200
@@ -1378,7 +1378,6 @@
 @command('amend|refresh',
     [('A', 'addremove', None,
      _('mark new/missing files as added/removed before committing')),
-    ('n', 'note', '', _('use text as commit message for this update (DEPRECATED)')),
     ('e', 'edit', False, _('invoke editor on commit messages')),
     ] + walkopts + commitopts + commitopts2,
     _('[OPTION]... [FILE]...'))
@@ -1420,7 +1419,7 @@
                 ciopts = dict(opts)
                 ciopts.pop('message', None)
                 ciopts.pop('logfile', None)
-                ciopts['message'] = opts.get('note') or ('amends %s' % old.hex())
+                ciopts['message'] = 'amends %s' % old.hex()
                 e = cmdutil.commiteditor
                 def commitfunc(ui, repo, message, match, opts):
                     return repo.commit(message, opts.get('user'), opts.get('date'),