##// END OF EJS Templates
Added signature for changeset dcec16e799dd
Added signature for changeset dcec16e799dd

File last commit:

r49261:f45a4a47 default
r49648:b84ff512 stable
Show More
failfilemerge.py
20 lines | 463 B | text/x-python | PythonLexer
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 # extension to emulate interrupting filemerge._filemerge
timeless
rebase: update working directory when aborting (issue5084)
r27988
from __future__ import absolute_import
from mercurial import (
Yuya Nishihara
tests: sort import lines in failfilemerge.py
r28772 error,
timeless
rebase: update working directory when aborting (issue5084)
r27988 extensions,
Yuya Nishihara
tests: sort import lines in failfilemerge.py
r28772 filemerge,
timeless
rebase: update working directory when aborting (issue5084)
r27988 )
Augie Fackler
formatting: blacken the codebase...
r43346
def failfilemerge(
filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
):
Martin von Zweigbergk
errors: stop passing non-strings to Abort's constructor...
r46273 raise error.Abort(b"^C")
timeless
rebase: update working directory when aborting (issue5084)
r27988 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
Augie Fackler
formatting: blacken the codebase...
r43346
timeless
rebase: update working directory when aborting (issue5084)
r27988 def extsetup(ui):
Augie Fackler
formatting: blacken the codebase...
r43346 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)