Mercurial > public > mercurial-scm > hg

comparison mercurial/ui.py @ 4044:78a0dd93db0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Abort on empty username so specifying a username can be forced. This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551. Added test for this.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 24 Jan 2007 23:04:51 +0100
parents f82b3f915605
children 1bd6868b0b11 76d541c6f3c0
comparison
equal deleted inserted replaced
4043:31047b6f7ec1 4044:78a0dd93db0b
343 user = os.environ.get("HGUSER") 343 user = os.environ.get("HGUSER")
344 if user is None: 344 if user is None:
345 user = self.config("ui", "username") 345 user = self.config("ui", "username")
346 if user is None: 346 if user is None:
347 user = os.environ.get("EMAIL") 347 user = os.environ.get("EMAIL")
348 if not user: 348 if user is None:
349 try: 349 try:
350 user = '%s@%s' % (util.getuser(), socket.getfqdn()) 350 user = '%s@%s' % (util.getuser(), socket.getfqdn())
351 self.warn(_("No username found, using '%s' instead\n") % user)
351 except KeyError: 352 except KeyError:
352 raise util.Abort(_("Please specify a username.")) 353 pass
353 self.warn(_("No username found, using '%s' instead\n") % user) 354 if not user:
355 raise util.Abort(_("Please specify a username."))
354 return user 356 return user
355 357
356 def shortuser(self, user): 358 def shortuser(self, user):
357 """Return a short representation of a user name or email address.""" 359 """Return a short representation of a user name or email address."""
358 if not self.verbose: user = util.shortuser(user) 360 if not self.verbose: user = util.shortuser(user)