##// END OF EJS Templates
hook: fewer parentheses for hook load errors...
hook: fewer parentheses for hook load errors This matches 'hook failed' warnings. We're also going to add hints to some of the hook load errors. Without this change we'd have two pairs of parens for a single error message, which looks really cluttered.

File last commit:

r27988:61f4d59e stable
r28079:0c9e9140 default
Show More
failfilemerge.py
18 lines | 483 B | text/x-python | PythonLexer
# 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)