This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D2223 py3: whitelist test-convert-clonebranches.t
Closed	durin42	D2222 convert: make hg sha1 regex consistently be a bytes
Closed	durin42	D2221 convcmd: pass encoding name as a sysstr
Closed	durin42	D2220 convert: open all files in binary mode

Diff 5620

	import shlex			import shlex
	import shutil			import shutil

	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
	encoding,			encoding,
	error,			error,
	hg,			hg,
				pycompat,
	scmutil,			scmutil,
	util,			util,
	)			)

	from . import (			from . import (
	bzr,			bzr,
	common,			common,
	cvs,			cvs,
	p4_source = p4.p4_source			p4_source = p4.p4_source
	svn_sink = subversion.svn_sink			svn_sink = subversion.svn_sink
	svn_source = subversion.svn_source			svn_source = subversion.svn_source

	orig_encoding = 'ascii'			orig_encoding = 'ascii'

	def recode(s):			def recode(s):
	if isinstance(s, unicode):			if isinstance(s, unicode):
	return s.encode(orig_encoding, 'replace')			return s.encode(pycompat.sysstr(orig_encoding), 'replace')
	else:			else:
	return s.decode('utf-8').encode(orig_encoding, 'replace')			return s.decode('utf-8').encode(
				pycompat.sysstr(orig_encoding), 'replace')

	def mapbranch(branch, branchmap):			def mapbranch(branch, branchmap):
	'''			'''
	>>> bmap = {b'default': b'branch1'}			>>> bmap = {b'default': b'branch1'}
	>>> for i in [b'', None]:			>>> for i in [b'', None]:
	... mapbranch(i, bmap)			... mapbranch(i, bmap)
	'branch1'			'branch1'
	'branch1'			'branch1'