This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D12193 filemerge: make `_maketempfiles()` more reusable
Closed	martinvonz	D12192 filemerge: reduce some duplication in `_maketempfiles()`
Closed	martinvonz	D12191 filemerge: use leverage `util.readfile()` in `_maketempfiles()`
Closed	martinvonz	D12190 filemerge: move removal of `.orig` extension on temp file close to context
Closed	martinvonz	D12189 filemerge: remove `uselocalpath` argument from `_maketempfiles()`
Closed	martinvonz	D12188 filemerge: remove an unnecessary join with absolute path
Closed	martinvonz	D12187 filemerge: when using in-memory merge, always put backup files in temp dir
Closed	martinvonz	D12194 filemerge: remove unused `repo` argument from `_maketempfiles()`

Diff 32244

	_(b'warning: %s cannot merge change/delete conflict for %s\n')			_(b'warning: %s cannot merge change/delete conflict for %s\n')
	% (tool, uipathfn(fcd.path()))			% (tool, uipathfn(fcd.path()))
	)			)
	return False, 1, None			return False, 1, None
	localpath = _workingpath(repo, fcd)			localpath = _workingpath(repo, fcd)
	args = _toolstr(repo.ui, tool, b"args")			args = _toolstr(repo.ui, tool, b"args")

	with _maketempfiles(			with _maketempfiles(
	fco, fca, repo.wvfs.join(backup.path()), b"$output" in args			fco, fca, backup.path(), b"$output" in args
	) as temppaths:			) as temppaths:
	basepath, otherpath, localoutputpath = temppaths			basepath, otherpath, localoutputpath = temppaths
	outpath = b""			outpath = b""

	def format_label(input):			def format_label(input):
	if input.label_detail:			if input.label_detail:
	return b'%s: %s' % (input.label, input.label_detail)			return b'%s: %s' % (input.label, input.label_detail)
	else:			else: