##// END OF EJS Templates
pyoxidizer: update to PyOxidizer 0.9...
pyoxidizer: update to PyOxidizer 0.9 We were previously using a Git commit from a few days before the 0.8 release. This commit upgrades us to the just-released 0.9 release. This required some Starlark changes due to backwards incompatible changes. Differential Revision: https://phab.mercurial-scm.org/D9228

File last commit:

r46273:a736ab68 default
r46341:f95b1679 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)