tests/failfilemerge.py
author Durham Goode <durham@fb.com>
Fri, 11 Nov 2016 01:15:59 -0800
changeset 30373 31de088945cd
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
manifest: add bundlemanifestlog support As part of deprecating manifest.manifest we need to make bundlerepo support manifestlog.

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