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.
#!/usr/bin/env python
import os, time, errno, signal
# Kill off any leftover daemon processes
try:
fp = open(os.environ['DAEMON_PIDS'])
for line in fp:
try:
pid = int(line)
except ValueError:
continue
try:
os.kill(pid, 0)
os.kill(pid, signal.SIGTERM)
for i in range(10):
time.sleep(0.05)
os.kill(pid, 0)
os.kill(pid, signal.SIGKILL)
except OSError, err:
if err.errno != errno.ESRCH:
raise
fp.close()
except IOError:
pass