view tests/failfilemerge.py @ 31275:e2f141045634

hgweb: start enumerate at 1 in webutil.diffs's inner function prettyprintlines
author Denis Laxalde <denis.laxalde@logilab.fr>
date Mon, 06 Mar 2017 09:44:39 +0100
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)