Mercurial > hg
view tests/failfilemerge.py @ 46865:466236e99eac
tests: update the detailed exit codes in test-phabricator.t
I'm guessing this has slipped through because most people don't have the
necessary `pytest-vcr` package installed.
Differential Revision: https://phab.mercurial-scm.org/D10297
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 03 Apr 2021 15:00:20 -0400 |
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)