equal
deleted
inserted
replaced
342 user = os.environ.get("HGUSER") |
342 user = os.environ.get("HGUSER") |
343 if user is None: |
343 if user is None: |
344 user = self.config("ui", "username") |
344 user = self.config("ui", "username") |
345 if user is None: |
345 if user is None: |
346 user = os.environ.get("EMAIL") |
346 user = os.environ.get("EMAIL") |
347 if not user: |
347 if user is None: |
348 try: |
348 try: |
349 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
349 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
|
350 self.warn(_("No username found, using '%s' instead\n") % user) |
350 except KeyError: |
351 except KeyError: |
351 raise util.Abort(_("Please specify a username.")) |
352 pass |
352 self.warn(_("No username found, using '%s' instead\n") % user) |
353 if not user: |
|
354 raise util.Abort(_("Please specify a username.")) |
353 return user |
355 return user |
354 |
356 |
355 def shortuser(self, user): |
357 def shortuser(self, user): |
356 """Return a short representation of a user name or email address.""" |
358 """Return a short representation of a user name or email address.""" |
357 if not self.verbose: user = util.shortuser(user) |
359 if not self.verbose: user = util.shortuser(user) |