Mercurial > hg
view tests/test-nointerrupt.t @ 42193:14589f1989e9 stable
context: check file exists before getting data from _wrappedctx
overlayworkingctx class is used to do in-memory merging. The data() function of
that class has logic to look for data() in the wrappedctx if the file data in
cache is empty and if the file is dirty. This assumes that if a file is dirty
and cache has empty data for it, it will exists in the _wrappedctx.
However this assumption can be False in case when we are merging a file which is
empty in destination. In these cases, the backup file 'foo.orig' created by our
internal merge algorithms will be empty, however it won't be present in
_wrappedctx. This case will lead us to error like the one this patch is fixing.
Let's only fallback to getting data from wrappedctx if cache has 'None' as data.
Differential Revision: https://phab.mercurial-scm.org/D6308
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Wed, 24 Apr 2019 19:42:43 +0300 |
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]