view tests/failfilemerge.py @ 30299:1e5346313963

statprof: return state from stop() I don't like global variables. Have stop() return the captured state so callers can pass data to the display function.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 04 Nov 2016 20:22:37 -0700
parents a7f8939641aa
children 318a24b52eeb
line wrap: on
line source

# extension to emulate interupting 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)