This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Abandoned	spectral	D12577 amend: small refactor of logic for clarity
	Closed	spectral	D12576 amend: move "return None for removed files" into block handling filestoamend

Diff 33235

	files = [			files = [
	f			f
	for f in files			for f in files
	if (f not in filestoamend or not samefile(f, wctx, base))			if (f not in filestoamend or not samefile(f, wctx, base))
	]			]

	def filectxfn(repo, ctx_, path):			def filectxfn(repo, ctx_, path):
	try:			try:
	# Return None for removed files.
	if path in wctx.removed() and path in filestoamend:
	return None

	# If the file being considered is not amongst the files			# If the file being considered is not amongst the files
	# to be amended, we should use the file context from the			# to be amended, we should use the file context from the
	# old changeset. This avoids issues when only some files in			# old changeset. This avoids issues when only some files in
	# the working copy are being amended but there are also			# the working copy are being amended but there are also
	# changes to other files from the old changeset.			# changes to other files from the old changeset.
	if path in filestoamend:			if path in filestoamend:
				# Return None for removed files.
				if path in wctx.removed():
				return None
	fctx = wctx[path]			fctx = wctx[path]
	else:			else:
	fctx = old.filectx(path)			fctx = old.filectx(path)
	flags = fctx.flags()			flags = fctx.flags()
	mctx = context.memfilectx(			mctx = context.memfilectx(
	repo,			repo,
	ctx_,			ctx_,
	fctx.path(),			fctx.path(),