Mercurial > hg
view tests/failfilemerge.py @ 33561:2893face0af5
run-tests: check if stream is a tty before using color
Previous implementation (e80041832eec) checked only if sys.stderr was a tty
which was less general. Also makes sure that colors is never used if pygments is
not available, irrespective of --color flag value.
author | Matthieu Laneuville <matthieu.laneuville@octobus.net> |
---|---|
date | Tue, 18 Jul 2017 07:19:26 +0900 |
parents | 318a24b52eeb |
children | c0ce60459d84 |
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, 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)