| yuja |
| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
Here '%r' % pycompat.bytestr(user) is preferred since repr(user) would
leave b'' prefix in error message.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changelog.py (5 lines) | |||
| M | mercurial/ui.py (4 lines) |
| ) | ) | ||||
| 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: | ||||
| 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 | ||||