tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Sun, 17 Jun 2018 13:48:58 -0700
changeset 38380 800f5a2c869e
parent 34137 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
progress: make the progress helper a context manager This lets us simplify the use site in streamclone. Differential Revision: https://phab.mercurial-scm.org/D3775

# 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)