diff hgext/evolve.py @ 1140:b7d85cd8ec7b

amend: allow the --logfile argument to work properly

Though documented to work, using --logfile previously set the message option to
that of the parent commit, and cause amend to abort with this message:

    abort: options --message and --logfile are mutually exclusive

It's not clear why the 'edit' option is popped, but this option is only fetched
in order to let the core commit command do the work.

--- a/hgext/evolve.py	Wed Oct 22 15:05:54 2014 -0700
+++ b/hgext/evolve.py	Sat Oct 25 22:25:42 2014 -0400
@@ -1825,8 +1825,9 @@
     """
     opts = opts.copy()
     edit = opts.pop('edit', False)
+    log = opts.get('logfile')
     opts['amend'] = True
-    if not (edit or opts['message']):
+    if not (edit or opts['message'] or log):
         opts['message'] = repo['.'].description()
     _resolveoptions(ui, opts)
     _alias, commitcmd = cmdutil.findcmd('commit', commands.table)