This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D1648 py3: add 32 new tests passing to the whitelist
Closed	pulkit	D1647 py3: handle keyword arguments correctly in wireproto.py
Closed	pulkit	D1646 py3: handle keyword arguments correctly in ui.py
Closed	pulkit	D1645 py3: handle keyword arguments correctly in templater.py
Closed	pulkit	D1644 py3: handle keyword arguments correctly in subrepo.py
Closed	pulkit	D1643 py3: handle keyword arguments correctly in statprof.py
Closed	pulkit	D1642 py3: handle keyword arguments correctly in sslutil.py
Closed	pulkit	D1641 py3: handle keyword arguments correctly in simplemerge.py
Closed	pulkit	D1640 py3: handle keyword arguments correctly in revset.py
Closed	pulkit	D1639 py3: handle keyword arguments correctly in patch.py
Closed	pulkit	D1638 py3: handle keyword arguments correctly in obsolete.py
Closed	pulkit	D1637 py3: handle keyword arguments correctly in keepalive.py

Diff 4320

	result[i] = override			result[i] = override
	return result			return result

	def simplemerge(ui, localctx, basectx, otherctx, **opts):			def simplemerge(ui, localctx, basectx, otherctx, **opts):
	"""Performs the simplemerge algorithm.			"""Performs the simplemerge algorithm.

	The merged result is written into `localctx`.			The merged result is written into `localctx`.
	"""			"""
				opts = pycompat.byteskwargs(opts)

	def readctx(ctx):			def readctx(ctx):
	# Merges were always run in the working copy before, which means			# Merges were always run in the working copy before, which means
	# they used decoded data, if the user defined any repository			# they used decoded data, if the user defined any repository
	# filters.			# filters.
	#			#
	# Maintain that behavior today for BC, though perhaps in the future			# Maintain that behavior today for BC, though perhaps in the future
	# it'd be worth considering whether merging encoded data (what the			# it'd be worth considering whether merging encoded data (what the
	# repository usually sees) might be more useful.			# repository usually sees) might be more useful.