Mercurial > hg
view tests/failfilemerge.py @ 37419:a84b6eeb2c39
tests: disable test-static-http.t with simple store
It /should/ be possible to support repos statically hosted on HTTP
servers with alternate stores. But it's more trouble than it is worth
right now. Let's just disable the test.
Differential Revision: https://phab.mercurial-scm.org/D3099
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Wed, 04 Apr 2018 14:37:53 -0700 |
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)