Mercurial > hg
view tests/failfilemerge.py @ 46570:7a29d9002250 stable
pycompat: fix a bytes vs str issue in `unnamedtempfile()`
This seems trivially correct, though the only two uses I found both took this
path. So I'm guessing we're missing test coverage.
Differential Revision: https://phab.mercurial-scm.org/D10129
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 08 Mar 2021 12:28:53 -0500 |
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)