tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 16 Jun 2017 10:13:44 -0700
changeset 32901 0a41902879d3
parent 30342 318a24b52eeb
child 34137 c0ce60459d84
permissions -rw-r--r--
strip: remove a redundant setting of hookargs bundle2.applybundle() will set both 'source' and 'url'.

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