Mercurial > hg
view tests/test-nointerrupt.t @ 41163:0101a35deae2
phabricator: warn if unable to amend, instead of aborting after posting
There was a divergence in behavior here between obsolete and strip based
amending. I first noticed the abort when testing outside of the test harness,
but then had trouble recreating it here after reverting the code changes. It
turns out, strip based amend was successfully amending the public commit after
it was posted! It looks like the protection is in the `commit --amend` command,
not in the underlying code that it calls.
I considered doing a preflight check and aborting. But the locks are only
acquired at the end, if amending, and this is too large a section of code to be
wrapped in a maybe-it's-held-or-not context manager for my tastes.
Additionally, some people do post-push reviews, and amending is the default
behavior, so they shouldn't see a misleading error message.
The lack of a 'Differential Revision' entry in the commit message breaks a
{phabreview} test, so it had to be partially conditionalized.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 05 Jan 2019 15:20:33 -0500 |
parents | 8ecb17b7f432 |
children | 0826d684a1b5 |
line wrap: on
line source
#require no-windows Dummy extension simulating unsafe long running command $ cat > sleepext.py <<EOF > import itertools > import time > > from mercurial.i18n import _ > from mercurial import registrar > > cmdtable = {} > command = registrar.command(cmdtable) > > @command(b'sleep', [], _(b'TIME'), norepo=True) > def sleep(ui, sleeptime=b"1", **opts): > with ui.uninterruptible(): > for _i in itertools.repeat(None, int(sleeptime)): > time.sleep(1) > ui.warn(b"end of unsafe operation\n") > ui.warn(b"%s second(s) passed\n" % sleeptime) > EOF Kludge to emulate timeout(1) which is not generally available. $ cat > timeout.py <<EOF > from __future__ import print_function > import argparse > import signal > import subprocess > import sys > import time > > ap = argparse.ArgumentParser() > ap.add_argument('-s', nargs=1, default='SIGTERM') > ap.add_argument('duration', nargs=1, type=int) > ap.add_argument('argv', nargs='*') > opts = ap.parse_args() > try: > sig = int(opts.s[0]) > except ValueError: > sname = opts.s[0] > if not sname.startswith('SIG'): > sname = 'SIG' + sname > sig = getattr(signal, sname) > proc = subprocess.Popen(opts.argv) > time.sleep(opts.duration[0]) > proc.poll() > if proc.returncode is None: > proc.send_signal(sig) > proc.wait() > sys.exit(124) > EOF Set up repository $ hg init repo $ cd repo $ cat >> $HGRCPATH << EOF > [extensions] > sleepext = ../sleepext.py > EOF Test ctrl-c $ python $TESTTMP/timeout.py -s INT 1 hg sleep 2 interrupted! [124] $ cat >> $HGRCPATH << EOF > [experimental] > nointerrupt = yes > EOF $ python $TESTTMP/timeout.py -s INT 1 hg sleep 2 interrupted! [124] $ cat >> $HGRCPATH << EOF > [experimental] > nointerrupt-interactiveonly = False > EOF $ python $TESTTMP/timeout.py -s INT 1 hg sleep 2 shutting down cleanly press ^C again to terminate immediately (dangerous) end of unsafe operation interrupted! [124]