( )⚙ D2261 py3: use pycompat.bytestr to convert str to bytes

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2261

py3: use pycompat.bytestr to convert str to bytes
ClosedPublic

Authored by pulkit on Feb 14 2018, 6:25 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGddeb7653b31c: py3: use pycompat.bytestr to convert str to bytes
Summary

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

pulkit created this revision.Feb 14 2018, 6:25 AM
yuja requested changes to this revision.Feb 14 2018, 8:17 AM
yuja added a subscriber: yuja.

Here '%r' % pycompat.bytestr(user) is preferred since repr(user) would
leave b'' prefix in error message.

This revision now requires changes to proceed.Feb 14 2018, 8:17 AM
pulkit updated this revision to Diff 5726.Feb 14 2018, 11:26 AM
yuja accepted this revision.Feb 15 2018, 7:17 AM
This revision is now accepted and ready to land.Feb 15 2018, 7:17 AM
Closed by commit rHGddeb7653b31c: py3: use pycompat.bytestr to convert str to bytes (authored by pulkit). · Explain WhyFeb 15 2018, 7:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (5 lines)
Mmercurial/ui.py (4 lines)

Diff 5757

mercurial/changelog.py

) )
from .thirdparty import ( from .thirdparty import (
attr, attr,
) )
from . import ( from . import (
encoding, encoding,
error, error,
pycompat,
revlog, revlog,
util, util,
) )
_defaultextra = {'branch': 'default'} _defaultextra = {'branch': 'default'}
def _string_escape(text): def _string_escape(text):
""" """
user = user.strip() user = user.strip()
# An empty username or a username with a "\n" will make the # An empty username or a username with a "\n" will make the
# revision text contain two "\n\n" sequences -> corrupt # revision text contain two "\n\n" sequences -> corrupt
# repository since read cannot unpack the revision. # repository since read cannot unpack the revision.
if not user: if not user:
raise error.RevlogError(_("empty username")) raise error.RevlogError(_("empty username"))
if "\n" in user: if "\n" in user:
raise error.RevlogError(_("username %s contains a newline") raise error.RevlogError(_("username %r contains a newline")
% repr(user)) % pycompat.bytestr(user))
desc = stripdesc(desc) desc = stripdesc(desc)
if date: if date:
parseddate = "%d %d" % util.parsedate(date) parseddate = "%d %d" % util.parsedate(date)
else: else:
parseddate = "%d %d" % util.makedate() parseddate = "%d %d" % util.makedate()
if extra: if extra:

mercurial/ui.py

self.warn(_("no username found, using '%s' instead\n") % user) self.warn(_("no username found, using '%s' instead\n") % user)
except KeyError: except KeyError:
pass pass
if not user: if not user:
raise error.Abort(_('no username supplied'), raise error.Abort(_('no username supplied'),
hint=_("use 'hg config --edit' " hint=_("use 'hg config --edit' "
'to set your username')) 'to set your username'))
if "\n" in user: if "\n" in user:
raise error.Abort(_("username %s contains a newline\n") raise error.Abort(_("username %r contains a newline\n")
% repr(user)) % pycompat.bytestr(user))
return user return user
def shortuser(self, user): def shortuser(self, user):
"""Return a short representation of a user name or email address.""" """Return a short representation of a user name or email address."""
if not self.verbose: if not self.verbose:
user = util.shortuser(user) user = util.shortuser(user)
return user return user