Mercurial > hg

view tests/failfilemerge.py @ 33512:1424a769f31b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmark: use 'divergent2delete' when updating a bookmark
author Boris Feld <boris.feld@octobus.net>
date Mon, 10 Jul 2017 19:12:25 +0200
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)