This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D11863 filemerge: remove `premerge` argument from `_makebackup()`
Closed	martinvonz	D11860 filemerge: inline `_filemerge()` into `filemerge()`
Closed	martinvonz	D11859 filemerge: make `_filemerge()` do both premerge and merge
Closed	martinvonz	D11858 filemerge: merge `premerge()` into `filemerge()`
Closed	martinvonz	D11857 mergestate: inline `_resolve()` into `resolve()`
Closed	martinvonz	D11856 mergestate: make `_resolve()` do both preresolve and resolve
Closed	martinvonz	D11855 mergestate: merge `preresolve()` into `resolve()`
Closed	martinvonz	D11854 tests: remove unnecessary explicit args from `failfilemerge.py`
Closed	martinvonz	D11853 simplemerge: set `conflicts` earlier for :union tool

Diff 31306

	# extension to emulate interrupting filemerge._filemerge			# extension to emulate interrupting filemerge._filemerge

	from __future__ import absolute_import			from __future__ import absolute_import

	from mercurial import (			from mercurial import (
	error,			error,
	extensions,			extensions,
	filemerge,			filemerge,
	)			)


	def failfilemerge(			def failfilemerge(args, *kwargs):
	filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
	):
	raise error.Abort(b"^C")			raise error.Abort(b"^C")
	return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


	def extsetup(ui):			def extsetup(ui):
	extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)			extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)