Mercurial > hg
view tests/failfilemerge.py @ 35850:079b27b5a869
patch: avoid repeated binary checks if all files in a patch are text
Differential Revision: https://phab.mercurial-scm.org/D1940
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Thu, 25 Jan 2018 22:40:19 +0100 |
parents | c0ce60459d84 |
children | 2372284d9457 |
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("^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)