view tests/failfilemerge.py @ 38636:25534e0cf0d9

revlog: _segmentspan computes the byte span of a segment Refactor out this code to be used somewhere else in a next changeset
author Paul Morelle <paul.morelle@octobus.net>
date Thu, 17 May 2018 15:10:36 +0200
parents c0ce60459d84
children 2372284d9457
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, wctx, 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)