Mercurial > hg-stable
view tests/failfilemerge.py @ 47898:3a95a4e660b9 stable
python: compatibility for python 3.11 (issue6604)
The `unittest._TextTestResult` alias has been removed.
The "new" name has been available since 3.2, and we only support 3.5.3+.
Differential Revision: https://phab.mercurial-scm.org/D11690
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Tue, 19 Oct 2021 16:05:20 +0200 |
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)