D2221: convcmd: pass encoding name as a sysstr
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Tue Feb 13 05:06:55 UTC 2018
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2221
AFFECTED FILES
hgext/convert/convcmd.py
CHANGE DETAILS
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -16,6 +16,7 @@
encoding,
error,
hg,
+ pycompat,
scmutil,
util,
)
@@ -55,9 +56,10 @@
def recode(s):
if isinstance(s, unicode):
- return s.encode(orig_encoding, 'replace')
+ return s.encode(pycompat.sysstr(orig_encoding), 'replace')
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):
'''
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list