This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2208

ui: use pycompat.bytestr() to get a bytes-repr of config default
ClosedPublic

Authored by durin42 on Feb 12 2018, 10:29 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG8f5c7f906f9b: ui: use pycompat.bytestr() to get a bytes-repr of config default
Summary

We don't know what type we'll get here, so we need something that'll
behave like a repr without returning a unicode.

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.Feb 12 2018, 10:29 PM
indygreg accepted this revision.Feb 12 2018, 10:43 PM
This revision is now accepted and ready to land.Feb 12 2018, 10:43 PM
Closed by commit rHG8f5c7f906f9b: ui: use pycompat.bytestr() to get a bytes-repr of config default (authored by durin42). · Explain WhyFeb 12 2018, 10:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (2 lines)

Diff 5607

mercurial/ui.py

self.develwarn(msg, 2, 'warn-config-default') self.develwarn(msg, 2, 'warn-config-default')
else: else:
value = itemdefault value = itemdefault
elif (item is not None elif (item is not None
and item.default is not configitems.dynamicdefault and item.default is not configitems.dynamicdefault
and default != itemdefault): and default != itemdefault):
msg = ("specifying a mismatched default value for a registered " msg = ("specifying a mismatched default value for a registered "
"config item: '%s.%s' '%s'") "config item: '%s.%s' '%s'")
msg %= (section, name, default) msg %= (section, name, pycompat.bytestr(default))
self.develwarn(msg, 2, 'warn-config-default') self.develwarn(msg, 2, 'warn-config-default')
for s, n in alternates: for s, n in alternates:
candidate = self._data(untrusted).get(s, n, None) candidate = self._data(untrusted).get(s, n, None)
if candidate is not None: if candidate is not None:
value = candidate value = candidate
section = s section = s
name = n name = n