view tests/failfilemerge.py @ 32274:2b017d22fe97

help: clarify that colons are allowed in fingerprints values This was suggested by Lars Rohwedder in issue5559.
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 11 May 2017 00:02:32 -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)