equal
deleted
inserted
replaced
447 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
447 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
448 self.warn(_("no username found, using '%s' instead\n") % user) |
448 self.warn(_("no username found, using '%s' instead\n") % user) |
449 except KeyError: |
449 except KeyError: |
450 pass |
450 pass |
451 if not user: |
451 if not user: |
452 raise util.Abort(_('no username supplied (see "hg help config")')) |
452 raise util.Abort(_('no username supplied'), |
|
453 hint=_('use "hg config --edit" ' |
|
454 ' to set your username')) |
453 if "\n" in user: |
455 if "\n" in user: |
454 raise util.Abort(_("username %s contains a newline\n") % repr(user)) |
456 raise util.Abort(_("username %s contains a newline\n") % repr(user)) |
455 return user |
457 return user |
456 |
458 |
457 def shortuser(self, user): |
459 def shortuser(self, user): |