This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D6457 perf: fix some missing b prefixes
Closed	durin42	D6456 testparseutil: fix doctest to use str instead of bytes
Closed	durin42	D6455 testparseutil: stop extracting using std* streams as bytes on py3
Closed	durin42	D6454 tests: sort some imports that were previously missed
Closed	durin42	D6453 contrib: fix import-checker to operate on str instead of bytes

Diff 15292

	fm.end()			fm.end()

	def _getmergerevs(repo, opts):			def _getmergerevs(repo, opts):
	"""parse command argument to return rev involved in merge			"""parse command argument to return rev involved in merge

	input: options dictionnary with `rev`, `from` and `bse`			input: options dictionnary with `rev`, `from` and `bse`
	output: (localctx, otherctx, basectx)			output: (localctx, otherctx, basectx)
	"""			"""
	if opts['from']:			if opts[b'from']:
	fromrev = scmutil.revsingle(repo, opts['from'])			fromrev = scmutil.revsingle(repo, opts[b'from'])
	wctx = repo[fromrev]			wctx = repo[fromrev]
	else:			else:
	wctx = repo[None]			wctx = repo[None]
	# we don't want working dir files to be stat'd in the benchmark, so			# we don't want working dir files to be stat'd in the benchmark, so
	# prime that cache			# prime that cache
	wctx.dirty()			wctx.dirty()
	rctx = scmutil.revsingle(repo, opts['rev'], opts['rev'])			rctx = scmutil.revsingle(repo, opts[b'rev'], opts[b'rev'])
	if opts['base']:			if opts[b'base']:
	fromrev = scmutil.revsingle(repo, opts['base'])			fromrev = scmutil.revsingle(repo, opts[b'base'])
	ancestor = repo[fromrev]			ancestor = repo[fromrev]
	else:			else:
	ancestor = wctx.ancestor(rctx)			ancestor = wctx.ancestor(rctx)
	return (wctx, rctx, ancestor)			return (wctx, rctx, ancestor)

	@command(b'perfmergecalculate',			@command(b'perfmergecalculate',
	[			[
	(b'r', b'rev', b'.', b'rev to merge against'),			(b'r', b'rev', b'.', b'rev to merge against'),