##// END OF EJS Templates
py3: use absolute_import in import-checker
py3: use absolute_import in import-checker

File last commit:

r27988:61f4d59e stable
r28702:e44f6710 default
Show More
failfilemerge.py
18 lines | 483 B | text/x-python | PythonLexer
timeless
rebase: update working directory when aborting (issue5084)
r27988 # extension to emulate interupting filemerge._filemerge
from __future__ import absolute_import
from mercurial import (
filemerge,
extensions,
error,
)
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)