Mercurial > hg

view tests/failfilemerge.py @ 33559:094634292d34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: simplify config in test-rebase-detach.t Differential Revision: https://phab.mercurial-scm.org/D93
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 14 Jul 2017 23:09:17 -0700
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)