Mercurial > hg
view tests/killdaemons.py @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
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