mercurial/filemerge.py
500–503	As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead (~line 677) and we won't need to pass the wctx to all the merge tools (i.e. drop D450).

As mentioned in the previous patch. I think it's cleaner to just call wctx.flushall() if the other wctx class has that method.

This revision was automatically updated to reflect the committed changes.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1608		Sep 4 2017, 9:42 PM	★	★
Diff 2	1668		Sep 7 2017, 12:32 PM	★	★
Diff 3	1671		Sep 7 2017, 12:58 PM	★	★
Diff 4	1700		Sep 10 2017, 11:55 PM	★	★
Diff 5	1769	rHG9c07cff039bc8f81f4c3b560315b11296e3d95b1	Sep 11 2017, 4:03 PM	★	★


	def _xmerge(repo, wctx, mynode, orig, fcd, fco, fca, toolconf, files,			def _xmerge(repo, wctx, mynode, orig, fcd, fco, fca, toolconf, files,
	labels=None):			labels=None):
	tool, toolpath, binary, symlink = toolconf			tool, toolpath, binary, symlink = toolconf
	if fcd.isabsent() or fco.isabsent():			if fcd.isabsent() or fco.isabsent():
	repo.ui.warn(_('warning: %s cannot merge change/delete conflict '			repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
	'for %s\n') % (tool, fcd.path()))			'for %s\n') % (tool, fcd.path()))
	return False, 1, None			return False, 1, None

				# Must flush any deferred contents if running a merge tool.
				from . import context
				if isinstance(wctx, context.overlayworkingctx):
				wctx.flushall()
				martinvonzUnsubmitted Not Done As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead (~line 677) and we won't need to pass the wctx to all the merge tools (i.e. drop D450). martinvonz: As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead…

	unused, unused, unused, back = files			unused, unused, unused, back = files
	a = _workingpath(repo, fcd)			a = _workingpath(repo, fcd)
	b, c = _maketempfiles(repo, fco, fca)			b, c = _maketempfiles(repo, fco, fca)
	try:			try:
	out = ""			out = ""
	env = {'HG_FILE': fcd.path(),			env = {'HG_FILE': fcd.path(),
	'HG_MY_NODE': short(mynode),			'HG_MY_NODE': short(mynode),
	'HG_OTHER_NODE': str(fco.changectx()),			'HG_OTHER_NODE': str(fco.changectx()),

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: flush if using deferred writes when running a merge tool
ClosedPublic