Mercurial > hg-stable
view tests/failfilemerge.py @ 48602:62682662346c
filemerge: make `labels` a required arg for `_premerge()`
We always pass labels, and it's always a non-empty list, so we can
simplify a bit.
Differential Revision: https://phab.mercurial-scm.org/D12012
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 09:04:39 -0800 |
parents | f45a4a47f6a8 |
children | 6000f5b25c9b |
line wrap: on
line source
# extension to emulate interrupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge(*args, **kwargs): raise error.Abort(b"^C") def extsetup(ui): extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)