This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3989

ui: fix implicit unicode-to-bytes conversion introduced in 9df29b7c62cf
ClosedPublic

Authored by durin42 on Aug 1 2018, 10:29 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGeb2945f0a4a1: ui: fix implicit unicode-to-bytes conversion introduced in 9df29b7c62cf
Summary

This is harmless, unless you try and run hg with HGUNICODEPEDANTRY
enabled. It's technically wrong, so let's go ahead and fix it.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 1 2018, 10:29 AM
Closed by commit rHGeb2945f0a4a1: ui: fix implicit unicode-to-bytes conversion introduced in 9df29b7c62cf (authored by durin42). · Explain WhyAug 1 2018, 11:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (2 lines)

Diff 9680

mercurial/ui.py

if self._reportuntrusted: if self._reportuntrusted:
self.warn(_('not trusting file %s from untrusted ' self.warn(_('not trusting file %s from untrusted '
'user %s, group %s\n') % (f, user, group)) 'user %s, group %s\n') % (f, user, group))
return False return False
def readconfig(self, filename, root=None, trust=False, def readconfig(self, filename, root=None, trust=False,
sections=None, remap=None): sections=None, remap=None):
try: try:
fp = open(filename, u'rb') fp = open(filename, r'rb')
except IOError: except IOError:
if not sections: # ignore unless we were looking for something if not sections: # ignore unless we were looking for something
return return
raise raise
cfg = config.config() cfg = config.config()
trusted = sections or trust or self._trusted(fp, filename) trusted = sections or trust or self._trusted(fp, filename)