Show More
@@ -16,6 +16,7 from mercurial import ( | |||
|
16 | 16 | encoding, |
|
17 | 17 | error, |
|
18 | 18 | hg, |
|
19 | pycompat, | |
|
19 | 20 | scmutil, |
|
20 | 21 | util, |
|
21 | 22 | ) |
@@ -55,9 +56,10 orig_encoding = 'ascii' | |||
|
55 | 56 | |
|
56 | 57 | def recode(s): |
|
57 | 58 | if isinstance(s, unicode): |
|
58 | return s.encode(orig_encoding, 'replace') | |
|
59 | return s.encode(pycompat.sysstr(orig_encoding), 'replace') | |
|
59 | 60 | else: |
|
60 |
return s.decode('utf-8').encode( |
|
|
61 | return s.decode('utf-8').encode( | |
|
62 | pycompat.sysstr(orig_encoding), 'replace') | |
|
61 | 63 | |
|
62 | 64 | def mapbranch(branch, branchmap): |
|
63 | 65 | ''' |
General Comments 0
You need to be logged in to leave comments.
Login now