Mercurial > public > mercurial-scm > hg

comparison mercurial/ui.py @ 36784:e3732c3ab92d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix type of default username
author Yuya Nishihara <yuya@tcha.org>
date Sun, 04 Mar 2018 18:34:46 -0500
parents 723e87c8c059
children 30742c216abb
comparison
equal deleted inserted replaced
36783:1fbbb8e83392 36784:e3732c3ab92d
798 return user 798 return user
799 if user is None and self.configbool("ui", "askusername"): 799 if user is None and self.configbool("ui", "askusername"):
800 user = self.prompt(_("enter a commit username:"), default=None) 800 user = self.prompt(_("enter a commit username:"), default=None)
801 if user is None and not self.interactive(): 801 if user is None and not self.interactive():
802 try: 802 try:
803 user = '%s@%s' % (util.getuser(), socket.getfqdn()) 803 user = '%s@%s' % (util.getuser(),
804 encoding.strtolocal(socket.getfqdn()))
804 self.warn(_("no username found, using '%s' instead\n") % user) 805 self.warn(_("no username found, using '%s' instead\n") % user)
805 except KeyError: 806 except KeyError:
806 pass 807 pass
807 if not user: 808 if not user:
808 raise error.Abort(_('no username supplied'), 809 raise error.Abort(_('no username supplied'),