This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	phillco	D1106 context: add workingfilectx.markcopied
Closed	phillco	D1105 merge: don't use workers in in-memory mode
Closed	phillco	D1060 filemerge: add a missing flushall()
Closed	phillco	D1059 filemerge: store backups in the overlayworkingctx if using imm
Closed	phillco	D1058 context: add overlayfilectx.cmp()
Closed	phillco	D1057 filemerge: use arbitraryfilectx for backups
Closed	phillco	D1056 context: add a fast-comparision path between arbitraryfilectx and workingfilectx

Diff 2699

	same directory as ``a.txt``.			same directory as ``a.txt``.

	This implies permerge. Therefore, files aren't dumped, if premerge			This implies permerge. Therefore, files aren't dumped, if premerge
	runs successfully. Use :forcedump to forcibly write files out.			runs successfully. Use :forcedump to forcibly write files out.
	"""			"""
	a = _workingpath(repo, fcd)			a = _workingpath(repo, fcd)
	fd = fcd.path()			fd = fcd.path()

				# Run ``flushall()`` to make any missing folders the following wwrite
				# calls might be depending on.
				from . import context
				if isinstance(fcd, context.overlayworkingfilectx):
				fcd.ctx().flushall()

	util.writefile(a + ".local", fcd.decodeddata())			util.writefile(a + ".local", fcd.decodeddata())
	repo.wwrite(fd + ".other", fco.data(), fco.flags())			repo.wwrite(fd + ".other", fco.data(), fco.flags())
	repo.wwrite(fd + ".base", fca.data(), fca.flags())			repo.wwrite(fd + ".base", fca.data(), fca.flags())
	return False, 1, False			return False, 1, False

	@internaltool('forcedump', mergeonly)			@internaltool('forcedump', mergeonly)
	def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,			def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
	labels=None):			labels=None):