##// END OF EJS Templates
util: provide a helper function to estimate RAM size...
util: provide a helper function to estimate RAM size For POSIX systems, it uses sysconf. For Windows, it uses the win32 API directly. Differential Revision: https://phab.mercurial-scm.org/D8644

File last commit:

r43346:2372284d default
r45607:cfe0f491 default
Show More
failfilemerge.py
20 lines | 462 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
):
timeless
rebase: update working directory when aborting (issue5084)
r27988 raise error.Abort("^C")
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)