Mercurial > hg-stable
view tests/failfilemerge.py @ 45693:64a9423450ef
automation: support running against Python 3.9
We just added CPython 3.9.0 to the automation environment. Let's
support actions targeting it.
One side-effect of this change is that we'll produce Windows wheels
for Python 3.9 by default. This is desirable.
Differential Revision: https://phab.mercurial-scm.org/D9189
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 09 Oct 2020 09:46:03 -0700 |
parents | a736ab681b78 |
children | de8181c5414d |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge( filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None ): raise error.Abort(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)