Mercurial > hg
view tests/killdaemons.py @ 13134:ea3c93b53fdb stable
tag: fix uncommitted merge check and error message (issue2542)
This patch corrects the check for tagging on an uncommitted merge. We
should never commit a new tag changeset on an uncommitted merge, whether
or not --rev is specified. It also changes the error message from:
abort: cannot partially commit a merge (do not specify files or patterns)
to the much more accurate (and terse):
abort: uncommitted merge
Local tags are ok.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Tue, 07 Dec 2010 08:02:54 +0100 |
parents | 13a1b2fb7ef2 |
children | eddfb9a550d0 |
line wrap: on
line source
#!/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