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 32229

	f.close()			f.close()
	return name			return name

	b = tempfromcontext(b"base", fca)			b = tempfromcontext(b"base", fca)
	c = tempfromcontext(b"other", fco)			c = tempfromcontext(b"other", fco)
	d = localpath			d = localpath
	if localpath is not None:			if localpath is not None:
	f, d = maketempfrompath(b"local", d)			f, d = maketempfrompath(b"local", d)
	with open(localpath, b'rb') as src:			data = util.readfile(localpath)
	f.write(src.read())			f.write(data)
	f.close()			f.close()

	try:			try:
	yield b, c, d			yield b, c, d
	finally:			finally:
	shutil.rmtree(tmproot)			shutil.rmtree(tmproot)