##// END OF EJS Templates
test-ssh: stabilize for Windows...
test-ssh: stabilize for Windows Previously, this complained: remote: '.' is not recognized as an internal or external command, remote: operable program or batch file. Making this a python script apparently revealed some races[1]. Thanks to Yuya for suggesting this. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-December/109094.html

File last commit:

r34124:c0ce6045 default
r35500:1853c867 @12 default
Show More
failfilemerge.py
19 lines | 518 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 )
def failfilemerge(filemergefn,
Phil Cohen
merge: pass wctx to premerge, filemerge...
r34124 premerge, repo, wctx, mynode, orig, fcd, fco, fca,
labels=None):
timeless
rebase: update working directory when aborting (issue5084)
r27988 raise error.Abort("^C")
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
def extsetup(ui):
extensions.wrapfunction(filemerge, '_filemerge',
failfilemerge)